From 19589f02f18282289845d9d1da53b49597ce8a5c Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 26 Apr 2019 16:51:43 +0200 Subject: [PATCH 001/218] Remove an unused define --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 - Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 - 2 files changed, 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 685d77c6b..9e97a7f2a 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -266,7 +266,6 @@ #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_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 5ee149e75..35342ab2e 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -268,7 +268,6 @@ #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_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 f923427dc1d83602cb52efadabf9694616ba5ed0 Mon Sep 17 00:00:00 2001 From: odaki Date: Sat, 4 Jan 2020 12:51:20 +0900 Subject: [PATCH 002/218] Show the FlashAir IP address Displays the FlashAir IP address in the "Support" menu if the card is available. If no IP address has been assigned yet, "0.0.0.0" will be displayed. --- Firmware/ultralcd.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5d0abeac9..f9260d3e5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2192,11 +2192,14 @@ static void lcd_support_menu() // Menu was entered or SD card status has changed (plugged in or removed). // Initialize its status. _md->status = 1; - _md->is_flash_air = card.ToshibaFlashAir_isEnabled() && card.ToshibaFlashAir_GetIP(_md->ip); - if (_md->is_flash_air) + _md->is_flash_air = card.ToshibaFlashAir_isEnabled(); + if (_md->is_flash_air) { + card.ToshibaFlashAir_GetIP(_md->ip); // ip[4] filled with 0 if it failed + // Prepare IP string from ip[4] sprintf_P(_md->ip_str, PSTR("%d.%d.%d.%d"), _md->ip[0], _md->ip[1], _md->ip[2], _md->ip[3]); + } } else if (_md->is_flash_air && _md->ip[0] == 0 && _md->ip[1] == 0 && _md->ip[2] == 0 && _md->ip[3] == 0 && @@ -2256,7 +2259,11 @@ static void lcd_support_menu() if (_md->is_flash_air) { MENU_ITEM_BACK_P(STR_SEPARATOR); MENU_ITEM_BACK_P(PSTR("FlashAir IP Addr:")); //c=18 r=1 -///! MENU_ITEM(back_RAM, _md->ip_str, 0); + MENU_ITEM_BACK_P(PSTR(" ")); + if (((menu_item - 1) == menu_line) && lcd_draw_update) { + lcd_set_cursor(2, menu_row); + lcd_printf_P(PSTR("%s"), _md->ip_str); + } } #ifndef MK1BP From 2ca1bc0acb43f0ec88ee8f50f1b591380307bf99 Mon Sep 17 00:00:00 2001 From: odaki Date: Sat, 11 Jan 2020 21:47:16 +0900 Subject: [PATCH 003/218] Support W-04 firmware 4.0.0.01+ W-04 needs to use CMD17 instead of CMD48 to retrieve iSDIO register memories. To supporting both W-03 and W-04 card, I changed the readExt() code to use CMD48 first and use CMD17 if it returned some error. This method is from the FlashAir developer sample code. https://flashair-developers.github.io/website/docs/tutorials/arduino/2 --- Firmware/Sd2Card.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Sd2Card.cpp b/Firmware/Sd2Card.cpp index 449590f17..5449fccd9 100644 --- a/Firmware/Sd2Card.cpp +++ b/Firmware/Sd2Card.cpp @@ -774,7 +774,7 @@ uint8_t Sd2Card::readExt(uint32_t arg, uint8_t* dst, uint16_t count) { uint16_t i; // send command and argument. - if (cardCommand(CMD48, arg)) { + if (cardCommand(CMD48, arg) && cardCommand(CMD17, arg)) { // CMD48 for W-03, CMD17 for W-04 error(SD_CARD_ERROR_CMD48); goto fail; } From 99545a006cc1f61f14c78d231142acb1ea3e4bdc Mon Sep 17 00:00:00 2001 From: odaki Date: Sun, 12 Jan 2020 12:45:43 +0900 Subject: [PATCH 004/218] M46 "Show the assigned IP address" activated According to the reprap wiki, M46 has been assigned to display its assigned IP address, but has been disabled. Now that Toshiba FlashAir IP address processing is working, I activate the M46 code so that I can read the IP address information via serial. --- Firmware/Marlin_main.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4970091ea..fb0f1a1bb 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5584,28 +5584,32 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) } break; - /* + //! ### M46 - Show the assigned IP address (Prusa specific) + // -------------------------------------------------------------------- case 46: { // M46: Prusa3D: Show the assigned IP address. - uint8_t ip[4]; - bool hasIP = card.ToshibaFlashAir_GetIP(ip); - if (hasIP) { - SERIAL_ECHOPGM("Toshiba FlashAir current IP: "); - SERIAL_ECHO(int(ip[0])); - SERIAL_ECHOPGM("."); - SERIAL_ECHO(int(ip[1])); - SERIAL_ECHOPGM("."); - SERIAL_ECHO(int(ip[2])); - SERIAL_ECHOPGM("."); - SERIAL_ECHO(int(ip[3])); - SERIAL_ECHOLNPGM(""); + if (card.ToshibaFlashAir_isEnabled()) { + uint8_t ip[4]; + bool hasIP = card.ToshibaFlashAir_GetIP(ip); + if (hasIP) { + // SERIAL_PROTOCOLPGM("Toshiba FlashAir current IP: "); + SERIAL_PROTOCOL(int(ip[0])); + SERIAL_PROTOCOLPGM("."); + SERIAL_PROTOCOL(int(ip[1])); + SERIAL_PROTOCOLPGM("."); + SERIAL_PROTOCOL(int(ip[2])); + SERIAL_PROTOCOLPGM("."); + SERIAL_PROTOCOL(int(ip[3])); + SERIAL_PROTOCOLPGM("\n"); + } else { + SERIAL_PROTOCOLPGM("?Toshiba FlashAir GetIP failed\n"); + } } else { - SERIAL_ECHOLNPGM("Toshiba FlashAir GetIP failed"); + SERIAL_PROTOCOLPGM("n/a\n"); } break; } - */ //! ### M47 - Show end stops dialog on the display (Prusa specific) // ---------------------------------------------------- From b09761ed712a8305ee459c6964b0ad01bf74c5fb Mon Sep 17 00:00:00 2001 From: odaki Date: Thu, 16 Jan 2020 21:38:39 +0900 Subject: [PATCH 005/218] Remove '/*' from M46 source I forgot to remove the unintended comment start mark when merge. It has been deleted. --- Firmware/Marlin_main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8f232fb93..7c4a724f5 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5829,8 +5829,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) /*! ### M46 - Show the assigned IP address M46: Show the assigned IP address. */ - /* - case 46: + case 46: { // M46: Prusa3D: Show the assigned IP address. if (card.ToshibaFlashAir_isEnabled()) { From 684b47e417ee75ce69f0f4e46f2f3c4e5f097468 Mon Sep 17 00:00:00 2001 From: odaki Date: Sun, 15 Mar 2020 19:04:02 +0900 Subject: [PATCH 006/218] Update reference URL There was an official website of Toshiba called "FlashAir Developers '', and there was information necessary for FlashAir development, but since it closed in September 2019. Instead, I will point an archive site for developers. --- Firmware/Sd2Card.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/Sd2Card.cpp b/Firmware/Sd2Card.cpp index 5449fccd9..d1d350563 100644 --- a/Firmware/Sd2Card.cpp +++ b/Firmware/Sd2Card.cpp @@ -767,6 +767,9 @@ uint8_t Sd2Card::waitStartBlock(void) { // Toshiba FlashAir support, copied from // https://flashair-developers.com/en/documents/tutorials/arduino/ +// However, the official website was closed in September 2019. +// There is an archived website (written in Japanese). +// https://flashair-developers.github.io/website/docs/tutorials/arduino/2.html //------------------------------------------------------------------------------ /** Perform Extention Read. */ From f8843b25b04723c8799ea64f07f7c2d266e1a7f7 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 1 Apr 2020 22:09:49 +0300 Subject: [PATCH 007/218] :sparkles: Progress bar for check_file() --- Firmware/ultralcd.cpp | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index daf9f0176..6b1409102 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8760,20 +8760,33 @@ static void lcd_selftest_screen_step(int _row, int _col, int _state, const char static bool check_file(const char* filename) { if (farm_mode) return true; - bool result = false; - uint32_t filesize; card.openFile((char*)filename, true); - filesize = card.getFileSize(); + bool result = false; + const uint32_t filesize = card.getFileSize(); + uint32_t startPos = 0; + const uint16_t bytesToCheck = min(END_FILE_SECTION, filesize); if (filesize > END_FILE_SECTION) { - card.setIndex(filesize - END_FILE_SECTION); - + startPos = filesize - END_FILE_SECTION; + card.setIndex(startPos); } - - while (!card.eof() && !result) { + + lcd_clear(); + lcd_puts_at_P(0, 1, _i("Checking file"));////c=20 r=1 + printf_P(PSTR("startPos=%lu\n"), startPos); + while (!card.eof() && !result) { + lcd_set_cursor(0, 2); + for (int column = 0; column < 20; column++) { + const int8_t percent = ((card.get_sdpos() - startPos) * 100) / bytesToCheck; + if (column < (percent / 5)) + { + lcd_set_cursor(column, 2); + lcd_print('\xFF'); //simple progress bar + } + } + card.sdprinting = true; get_command(); result = check_commands(); - } card.printingHasFinished(); strncpy_P(lcd_status_message, _T(WELCOME_MSG), LCD_WIDTH); From d53c55ce6493475e648cd779310fda83d27586de Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 23 Apr 2019 20:07:22 +0200 Subject: [PATCH 008/218] Disable filament checks inside the Move -> Extruder menu --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 2 +- Firmware/ultralcd.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8dbc0d840..9bb62ba11 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9496,7 +9496,7 @@ static uint16_t nFSCheckCount=0; bInhibitFlag=bInhibitFlag||bMenuFSDetect; // Settings::HWsetup::FSdetect menu active #endif // IR_SENSOR_ANALOG #endif // IR_SENSOR - if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active + if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag) && (menu_menu != lcd_move_e)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active { if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 87266914f..b6c28e607 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2929,7 +2929,7 @@ static void _lcd_move(const char *name, int axis, int min, int max) } -static void lcd_move_e() +void lcd_move_e() { if (degHotend0() > EXTRUDE_MINTEMP) { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 844c7c7d3..884007c3f 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -205,6 +205,7 @@ void lcd_farm_sdcard_menu_w(); void lcd_wait_for_heater(); void lcd_wait_for_cool_down(); +void lcd_move_e(); // NOT static due to usage in Marlin_main void lcd_extr_cal_reset(); void lcd_temp_cal_show_result(bool result); From 6017600714a751a46b879964d186ea97115c5277 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 16 Jun 2019 21:05:13 +0200 Subject: [PATCH 009/218] Reintroduce the ability to disable TMC interpolation per-axis --- Firmware/tmc2130.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 108d00b1d..b87272e2d 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -437,6 +437,9 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ uint8_t tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 if (axis == E_AXIS) { +#if defined(TMC2130_INTPOL_E) && (TMC2130_INTPOL_E == 0) + intpol = 0; +#endif #ifdef TMC2130_CNSTOFF_E // fd = 0 (slow decay only) hstrt = 0; //fd0..2 @@ -447,6 +450,16 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ // toff = TMC2130_TOFF_E; // toff = 3-5 // rndtf = 1; } +#if defined(TMC2130_INTPOL_XY) && (TMC2130_INTPOL_XY == 0) + else if (axis == X_AXIS || axis == Y_AXIS) { + intpol = 0; + } +#endif +#if defined(TMC2130_INTPOL_Z) && (TMC2130_INTPOL_Z == 0) + else if (axis == Z_AXIS) { + intpol = 0; + } +#endif // DBG(_n("tmc2130_setup_chopper(axis=%hhd, mres=%hhd, curh=%hhd, curr=%hhd\n"), axis, mres, current_h, current_r); // DBG(_n(" toff=%hhd, hstr=%hhd, hend=%hhd, tbl=%hhd\n"), toff, hstrt, hend, tbl); if (current_r <= 31) From 6ceca9bf85f93479e677194635e873bbfa831bbb Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 18 Feb 2020 11:52:36 +0100 Subject: [PATCH 010/218] Implement double-edge stepping Introduce new wrapper macros to tick the stepper pins. Default to the original raising-edge stepping mode. When using the TMC double-edge stepping mode (aka half-wave or square-wave mode) the _LO macros become no-ops. --- Firmware/stepper.cpp | 128 +++++++++++++++++++++++++++++-------------- Firmware/tmc2130.cpp | 16 +++++- 2 files changed, 100 insertions(+), 44 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index de250ec97..8f2a4f125 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -48,6 +48,50 @@ int fsensor_counter; //counter for e-steps uint16_t SP_min = 0x21FF; #endif //DEBUG_STACK_MONITOR + +/* + * Stepping macros + */ +#define _STEP_PIN_X_AXIS X_STEP_PIN +#define _STEP_PIN_Y_AXIS Y_STEP_PIN +#define _STEP_PIN_Z_AXIS Z_STEP_PIN +#define _STEP_PIN_E_AXIS E0_STEP_PIN + +#ifdef DEBUG_XSTEP_DUP_PIN +#define _STEP_PIN_X_DUP_AXIS DEBUG_XSTEP_DUP_PIN +#endif +#ifdef DEBUG_YSTEP_DUP_PIN +#define _STEP_PIN_Y_DUP_AXIS DEBUG_YSTEP_DUP_PIN +#endif +#ifdef Y_DUAL_STEPPER_DRIVERS +#error Y_DUAL_STEPPER_DRIVERS not fully implemented +#define _STEP_PIN_Y2_AXIS Y2_STEP_PIN +#endif +#ifdef Z_DUAL_STEPPER_DRIVERS +#error Z_DUAL_STEPPER_DRIVERS not fully implemented +#define _STEP_PIN_Z2_AXIS Z2_STEP_PIN +#endif + +#ifdef TMC2130_DEDGE_STEPPING +#define STEP_NC_HI(axis) TOGGLE(_STEP_PIN_##axis) +#define STEP_NC_LO(axis) //NOP +#else + +#define _STEP_HI_X_AXIS !INVERT_X_STEP_PIN +#define _STEP_LO_X_AXIS INVERT_X_STEP_PIN +#define _STEP_HI_Y_AXIS !INVERT_Y_STEP_PIN +#define _STEP_LO_Y_AXIS INVERT_Y_STEP_PIN +#define _STEP_HI_Z_AXIS !INVERT_Z_STEP_PIN +#define _STEP_LO_Z_AXIS INVERT_Z_STEP_PIN +#define _STEP_HI_E_AXIS !INVERT_E_STEP_PIN +#define _STEP_LO_E_AXIS INVERT_E_STEP_PIN + +#define STEP_NC_HI(axis) WRITE_NC(_STEP_PIN_##axis, _STEP_HI_##axis) +#define STEP_NC_LO(axis) WRITE_NC(_STEP_PIN_##axis, _STEP_LO_##axis) + +#endif //TMC2130_DEDGE_STEPPING + + //=========================================================================== //=============================public variables ============================ //=========================================================================== @@ -300,9 +344,9 @@ FORCE_INLINE void stepper_next_block() _delay_us(100); for (uint8_t i = 0; i < st_backlash_x; i++) { - WRITE_NC(X_STEP_PIN, !INVERT_X_STEP_PIN); + STEP_NC_HI(X_AXIS); _delay_us(100); - WRITE_NC(X_STEP_PIN, INVERT_X_STEP_PIN); + STEP_NC_LO(X_AXIS); _delay_us(900); } } @@ -323,9 +367,9 @@ FORCE_INLINE void stepper_next_block() _delay_us(100); for (uint8_t i = 0; i < st_backlash_y; i++) { - WRITE_NC(Y_STEP_PIN, !INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_AXIS); _delay_us(100); - WRITE_NC(Y_STEP_PIN, INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_AXIS); _delay_us(900); } } @@ -607,44 +651,44 @@ FORCE_INLINE void stepper_tick_lowres() // Step in X axis counter_x.lo += current_block->steps_x.lo; if (counter_x.lo > 0) { - WRITE_NC(X_STEP_PIN, !INVERT_X_STEP_PIN); + STEP_NC_HI(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - WRITE_NC(DEBUG_XSTEP_DUP_PIN,!INVERT_X_STEP_PIN); + STEP_NC_HI(X_DUP_AXIS); #endif //DEBUG_XSTEP_DUP_PIN counter_x.lo -= current_block->step_event_count.lo; count_position[X_AXIS]+=count_direction[X_AXIS]; - WRITE_NC(X_STEP_PIN, INVERT_X_STEP_PIN); + STEP_NC_LO(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - WRITE_NC(DEBUG_XSTEP_DUP_PIN,INVERT_X_STEP_PIN); + STEP_NC_LO(X_DUP_AXIS); #endif //DEBUG_XSTEP_DUP_PIN } // Step in Y axis counter_y.lo += current_block->steps_y.lo; if (counter_y.lo > 0) { - WRITE_NC(Y_STEP_PIN, !INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - WRITE_NC(DEBUG_YSTEP_DUP_PIN,!INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_DUP_AXIS); #endif //DEBUG_YSTEP_DUP_PIN counter_y.lo -= current_block->step_event_count.lo; count_position[Y_AXIS]+=count_direction[Y_AXIS]; - WRITE_NC(Y_STEP_PIN, INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - WRITE_NC(DEBUG_YSTEP_DUP_PIN,INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_DUP_AXIS); #endif //DEBUG_YSTEP_DUP_PIN } // Step in Z axis counter_z.lo += current_block->steps_z.lo; if (counter_z.lo > 0) { - WRITE_NC(Z_STEP_PIN, !INVERT_Z_STEP_PIN); + STEP_NC_HI(Z_AXIS); counter_z.lo -= current_block->step_event_count.lo; count_position[Z_AXIS]+=count_direction[Z_AXIS]; - WRITE_NC(Z_STEP_PIN, INVERT_Z_STEP_PIN); + STEP_NC_LO(Z_AXIS); } // Step in E axis counter_e.lo += current_block->steps_e.lo; if (counter_e.lo > 0) { #ifndef LIN_ADVANCE - WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); + STEP_NC_HI(E_AXIS); #endif /* LIN_ADVANCE */ counter_e.lo -= current_block->step_event_count.lo; count_position[E_AXIS] += count_direction[E_AXIS]; @@ -654,7 +698,7 @@ FORCE_INLINE void stepper_tick_lowres() #ifdef FILAMENT_SENSOR fsensor_counter += count_direction[E_AXIS]; #endif //FILAMENT_SENSOR - WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); + STEP_NC_LO(E_AXIS); #endif } if(++ step_events_completed.lo >= current_block->step_event_count.lo) @@ -669,44 +713,44 @@ FORCE_INLINE void stepper_tick_highres() // Step in X axis counter_x.wide += current_block->steps_x.wide; if (counter_x.wide > 0) { - WRITE_NC(X_STEP_PIN, !INVERT_X_STEP_PIN); + STEP_NC_HI(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - WRITE_NC(DEBUG_XSTEP_DUP_PIN,!INVERT_X_STEP_PIN); + STEP_NC_HI(X_DUP_AXIS); #endif //DEBUG_XSTEP_DUP_PIN counter_x.wide -= current_block->step_event_count.wide; count_position[X_AXIS]+=count_direction[X_AXIS]; - WRITE_NC(X_STEP_PIN, INVERT_X_STEP_PIN); + STEP_NC_LO(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - WRITE_NC(DEBUG_XSTEP_DUP_PIN,INVERT_X_STEP_PIN); + STEP_NC_LO(X_DUP_AXIS); #endif //DEBUG_XSTEP_DUP_PIN } // Step in Y axis counter_y.wide += current_block->steps_y.wide; if (counter_y.wide > 0) { - WRITE_NC(Y_STEP_PIN, !INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - WRITE_NC(DEBUG_YSTEP_DUP_PIN,!INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_DUP_AXIS); #endif //DEBUG_YSTEP_DUP_PIN counter_y.wide -= current_block->step_event_count.wide; count_position[Y_AXIS]+=count_direction[Y_AXIS]; - WRITE_NC(Y_STEP_PIN, INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - WRITE_NC(DEBUG_YSTEP_DUP_PIN,INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_DUP_AXIS); #endif //DEBUG_YSTEP_DUP_PIN } // Step in Z axis counter_z.wide += current_block->steps_z.wide; if (counter_z.wide > 0) { - WRITE_NC(Z_STEP_PIN, !INVERT_Z_STEP_PIN); + STEP_NC_HI(Z_AXIS); counter_z.wide -= current_block->step_event_count.wide; count_position[Z_AXIS]+=count_direction[Z_AXIS]; - WRITE_NC(Z_STEP_PIN, INVERT_Z_STEP_PIN); + STEP_NC_LO(Z_AXIS); } // Step in E axis counter_e.wide += current_block->steps_e.wide; if (counter_e.wide > 0) { #ifndef LIN_ADVANCE - WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); + STEP_NC_HI(E_AXIS); #endif /* LIN_ADVANCE */ counter_e.wide -= current_block->step_event_count.wide; count_position[E_AXIS]+=count_direction[E_AXIS]; @@ -716,7 +760,7 @@ FORCE_INLINE void stepper_tick_highres() #ifdef FILAMENT_SENSOR fsensor_counter += count_direction[E_AXIS]; #endif //FILAMENT_SENSOR - WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); + STEP_NC_LO(E_AXIS); #endif } if(++ step_events_completed.wide >= current_block->step_event_count.wide) @@ -997,9 +1041,9 @@ FORCE_INLINE void advance_isr_scheduler() { bool rev = (e_steps < 0); do { - WRITE_NC(E0_STEP_PIN, !INVERT_E_STEP_PIN); + STEP_NC_HI(E_AXIS); e_steps += (rev? 1: -1); - WRITE_NC(E0_STEP_PIN, INVERT_E_STEP_PIN); + STEP_NC_LO(E_AXIS); #if defined(FILAMENT_SENSOR) && defined(PAT9125) fsensor_counter += (rev? -1: 1); #endif @@ -1385,14 +1429,14 @@ void babystep(const uint8_t axis,const bool direction) WRITE(X_DIR_PIN,(INVERT_X_DIR)^direction); //perform step - WRITE(X_STEP_PIN, !INVERT_X_STEP_PIN); + STEP_NC_HI(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - WRITE(DEBUG_XSTEP_DUP_PIN,!INVERT_X_STEP_PIN); + STEP_NC_HI(X_DUP_AXIS); #endif //DEBUG_XSTEP_DUP_PIN delayMicroseconds(1); - WRITE(X_STEP_PIN, INVERT_X_STEP_PIN); + STEP_NC_LO(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - WRITE(DEBUG_XSTEP_DUP_PIN,INVERT_X_STEP_PIN); + STEP_NC_LO(X_DUP_AXIS); #endif //DEBUG_XSTEP_DUP_PIN //get old pin state back. @@ -1408,14 +1452,14 @@ void babystep(const uint8_t axis,const bool direction) WRITE(Y_DIR_PIN,(INVERT_Y_DIR)^direction); //perform step - WRITE(Y_STEP_PIN, !INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - WRITE(DEBUG_YSTEP_DUP_PIN,!INVERT_Y_STEP_PIN); + STEP_NC_HI(Y_DUP_AXIS); #endif //DEBUG_YSTEP_DUP_PIN delayMicroseconds(1); - WRITE(Y_STEP_PIN, INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - WRITE(DEBUG_YSTEP_DUP_PIN,INVERT_Y_STEP_PIN); + STEP_NC_LO(Y_DUP_AXIS); #endif //DEBUG_YSTEP_DUP_PIN //get old pin state back. @@ -1434,14 +1478,14 @@ void babystep(const uint8_t axis,const bool direction) WRITE(Z2_DIR_PIN,(INVERT_Z_DIR)^direction^BABYSTEP_INVERT_Z); #endif //perform step - WRITE(Z_STEP_PIN, !INVERT_Z_STEP_PIN); + STEP_NC_HI(Z_AXIS); #ifdef Z_DUAL_STEPPER_DRIVERS - WRITE(Z2_STEP_PIN, !INVERT_Z_STEP_PIN); + STEP_NC_HI(Z2_AXIS); #endif delayMicroseconds(1); - WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN); + STEP_NC_LO(Z_AXIS); #ifdef Z_DUAL_STEPPER_DRIVERS - WRITE(Z2_STEP_PIN, INVERT_Z_STEP_PIN); + STEP_NC_LO(Z2_AXIS); #endif //get old pin state back. diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index b87272e2d..20c23704f 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -428,6 +428,11 @@ 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 = (mres != 0); // intpol to 256 only if microsteps aren't 256 +#ifdef TMC2130_DEDGE_STEPPING + uint8_t dedge = 1; +#else + uint8_t dedge = 0; +#endif 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 @@ -464,12 +469,12 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ // DBG(_n(" toff=%hhd, hstr=%hhd, hend=%hhd, tbl=%hhd\n"), toff, hstrt, hend, tbl); if (current_r <= 31) { - tmc2130_wr_CHOPCONF(axis, toff, hstrt, hend, fd3, 0, rndtf, chm, tbl, 1, 0, 0, 0, mres, intpol, 0, 0); + tmc2130_wr_CHOPCONF(axis, toff, hstrt, hend, fd3, 0, rndtf, chm, tbl, 1, 0, 0, 0, mres, intpol, dedge, 0); tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | ((current_r & 0x1f) << 8) | (current_h & 0x1f)); } else { - tmc2130_wr_CHOPCONF(axis, toff, hstrt, hend, fd3, 0, rndtf, chm, tbl, 0, 0, 0, 0, mres, intpol, 0, 0); + tmc2130_wr_CHOPCONF(axis, toff, hstrt, hend, fd3, 0, rndtf, chm, tbl, 0, 0, 0, 0, mres, intpol, dedge, 0); tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | (((current_r >> 1) & 0x1f) << 8) | ((current_h >> 1) & 0x1f)); } } @@ -706,10 +711,17 @@ static uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval) #define _SET_DIR_Z(dir) { WRITE(Z_DIR_PIN, dir?INVERT_Z_DIR:!INVERT_Z_DIR); asm("nop"); } #define _SET_DIR_E(dir) { WRITE(E0_DIR_PIN, dir?INVERT_E0_DIR:!INVERT_E0_DIR); asm("nop"); } +#ifdef TMC2130_DEDGE_STEPPING +#define _DO_STEP_X { TOGGLE(X_STEP_PIN); asm("nop"); } +#define _DO_STEP_Y { TOGGLE(Y_STEP_PIN); asm("nop"); } +#define _DO_STEP_Z { TOGGLE(Z_STEP_PIN); asm("nop"); } +#define _DO_STEP_E { TOGGLE(E0_STEP_PIN); asm("nop"); } +#else #define _DO_STEP_X { WRITE(X_STEP_PIN, !INVERT_X_STEP_PIN); asm("nop"); WRITE(X_STEP_PIN, INVERT_X_STEP_PIN); asm("nop"); } #define _DO_STEP_Y { WRITE(Y_STEP_PIN, !INVERT_Y_STEP_PIN); asm("nop"); WRITE(Y_STEP_PIN, INVERT_Y_STEP_PIN); asm("nop"); } #define _DO_STEP_Z { WRITE(Z_STEP_PIN, !INVERT_Z_STEP_PIN); asm("nop"); WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN); asm("nop"); } #define _DO_STEP_E { WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); asm("nop"); WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); asm("nop"); } +#endif uint16_t tmc2130_get_res(uint8_t axis) From 1181beffb1c47828a1d40303348b53f2c06345e7 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 17 Jun 2019 21:10:18 +0200 Subject: [PATCH 011/218] Enable DEDGE stepping on supported variants --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 + Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index b135d8d13..e1eb2ef1f 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -269,6 +269,7 @@ // #define TMC2130_UNLOAD_CURRENT_R 12 // lower current for M600 to protect filament sensor - Unused #define TMC2130_STEALTH_Z +#define TMC2130_DEDGE_STEPPING //#define TMC2130_SERVICE_CODES_M910_M918 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index e618c54ef..d4c52281c 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -271,6 +271,7 @@ // #define TMC2130_UNLOAD_CURRENT_R 12 // lower current for M600 to protect filament sensor - Unused #define TMC2130_STEALTH_Z +#define TMC2130_DEDGE_STEPPING //#define TMC2130_SERVICE_CODES_M910_M918 From e6b182aa9fc3a8f812a8580a0c25152418f3c2bc Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 18 Jun 2019 17:11:01 +0200 Subject: [PATCH 012/218] Implement proper step/delay pauses in tmc2130 functions Add constants for the various required delays in tmc2130.h, which will come in handy for stepper.cpp as well. Move the delays in the _set functions and remove the pauses from the various calling points and macros. Note that the hard-coded pause wouldn't cut it for the stepper ISR, but it's fine for other use cases. --- Firmware/tmc2130.cpp | 39 ++++++++++++++++++++------------------- Firmware/tmc2130.h | 4 ++++ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 20c23704f..15646b925 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -696,31 +696,31 @@ static uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval) #define _GET_PWR_Z (READ(Z_ENABLE_PIN) == Z_ENABLE_ON) #define _GET_PWR_E (READ(E0_ENABLE_PIN) == E_ENABLE_ON) -#define _SET_PWR_X(ena) { WRITE(X_ENABLE_PIN, ena?X_ENABLE_ON:!X_ENABLE_ON); asm("nop"); } -#define _SET_PWR_Y(ena) { WRITE(Y_ENABLE_PIN, ena?Y_ENABLE_ON:!Y_ENABLE_ON); asm("nop"); } -#define _SET_PWR_Z(ena) { WRITE(Z_ENABLE_PIN, ena?Z_ENABLE_ON:!Z_ENABLE_ON); asm("nop"); } -#define _SET_PWR_E(ena) { WRITE(E0_ENABLE_PIN, ena?E_ENABLE_ON:!E_ENABLE_ON); asm("nop"); } +#define _SET_PWR_X(ena) WRITE(X_ENABLE_PIN, ena?X_ENABLE_ON:!X_ENABLE_ON) +#define _SET_PWR_Y(ena) WRITE(Y_ENABLE_PIN, ena?Y_ENABLE_ON:!Y_ENABLE_ON) +#define _SET_PWR_Z(ena) WRITE(Z_ENABLE_PIN, ena?Z_ENABLE_ON:!Z_ENABLE_ON) +#define _SET_PWR_E(ena) WRITE(E0_ENABLE_PIN, ena?E_ENABLE_ON:!E_ENABLE_ON) #define _GET_DIR_X (READ(X_DIR_PIN) == INVERT_X_DIR) #define _GET_DIR_Y (READ(Y_DIR_PIN) == INVERT_Y_DIR) #define _GET_DIR_Z (READ(Z_DIR_PIN) == INVERT_Z_DIR) #define _GET_DIR_E (READ(E0_DIR_PIN) == INVERT_E0_DIR) -#define _SET_DIR_X(dir) { WRITE(X_DIR_PIN, dir?INVERT_X_DIR:!INVERT_X_DIR); asm("nop"); } -#define _SET_DIR_Y(dir) { WRITE(Y_DIR_PIN, dir?INVERT_Y_DIR:!INVERT_Y_DIR); asm("nop"); } -#define _SET_DIR_Z(dir) { WRITE(Z_DIR_PIN, dir?INVERT_Z_DIR:!INVERT_Z_DIR); asm("nop"); } -#define _SET_DIR_E(dir) { WRITE(E0_DIR_PIN, dir?INVERT_E0_DIR:!INVERT_E0_DIR); asm("nop"); } +#define _SET_DIR_X(dir) WRITE(X_DIR_PIN, dir?INVERT_X_DIR:!INVERT_X_DIR) +#define _SET_DIR_Y(dir) WRITE(Y_DIR_PIN, dir?INVERT_Y_DIR:!INVERT_Y_DIR) +#define _SET_DIR_Z(dir) WRITE(Z_DIR_PIN, dir?INVERT_Z_DIR:!INVERT_Z_DIR) +#define _SET_DIR_E(dir) WRITE(E0_DIR_PIN, dir?INVERT_E0_DIR:!INVERT_E0_DIR) #ifdef TMC2130_DEDGE_STEPPING -#define _DO_STEP_X { TOGGLE(X_STEP_PIN); asm("nop"); } -#define _DO_STEP_Y { TOGGLE(Y_STEP_PIN); asm("nop"); } -#define _DO_STEP_Z { TOGGLE(Z_STEP_PIN); asm("nop"); } -#define _DO_STEP_E { TOGGLE(E0_STEP_PIN); asm("nop"); } +#define _DO_STEP_X TOGGLE(X_STEP_PIN) +#define _DO_STEP_Y TOGGLE(Y_STEP_PIN) +#define _DO_STEP_Z TOGGLE(Z_STEP_PIN) +#define _DO_STEP_E TOGGLE(E0_STEP_PIN) #else -#define _DO_STEP_X { WRITE(X_STEP_PIN, !INVERT_X_STEP_PIN); asm("nop"); WRITE(X_STEP_PIN, INVERT_X_STEP_PIN); asm("nop"); } -#define _DO_STEP_Y { WRITE(Y_STEP_PIN, !INVERT_Y_STEP_PIN); asm("nop"); WRITE(Y_STEP_PIN, INVERT_Y_STEP_PIN); asm("nop"); } -#define _DO_STEP_Z { WRITE(Z_STEP_PIN, !INVERT_Z_STEP_PIN); asm("nop"); WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN); asm("nop"); } -#define _DO_STEP_E { WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); asm("nop"); WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); asm("nop"); } +#define _DO_STEP_X { WRITE(X_STEP_PIN, !INVERT_X_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(X_STEP_PIN, INVERT_X_STEP_PIN); } +#define _DO_STEP_Y { WRITE(Y_STEP_PIN, !INVERT_Y_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(Y_STEP_PIN, INVERT_Y_STEP_PIN); } +#define _DO_STEP_Z { WRITE(Z_STEP_PIN, !INVERT_Z_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN); } +#define _DO_STEP_E { WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); } #endif @@ -762,6 +762,7 @@ void tmc2130_set_pwr(uint8_t axis, uint8_t pwr) case Z_AXIS: _SET_PWR_Z(pwr); break; case E_AXIS: _SET_PWR_E(pwr); break; } + delayMicroseconds(TMC2130_SET_PWR_DELAY); } uint8_t tmc2130_get_inv(uint8_t axis) @@ -798,6 +799,7 @@ void tmc2130_set_dir(uint8_t axis, uint8_t dir) case Z_AXIS: _SET_DIR_Z(dir); break; case E_AXIS: _SET_DIR_E(dir); break; } + delayMicroseconds(TMC2130_SET_DIR_DELAY); } void tmc2130_do_step(uint8_t axis) @@ -813,8 +815,8 @@ void tmc2130_do_step(uint8_t axis) void tmc2130_do_steps(uint8_t axis, uint16_t steps, uint8_t dir, uint16_t delay_us) { - tmc2130_set_dir(axis, dir); - delayMicroseconds(100); + if (tmc2130_get_dir(axis) != dir) + tmc2130_set_dir(axis, dir); while (steps--) { tmc2130_do_step(axis); @@ -845,7 +847,6 @@ void tmc2130_goto_step(uint8_t axis, uint8_t step, uint8_t dir, uint16_t delay_u cnt = steps; } tmc2130_set_dir(axis, dir); - delayMicroseconds(100); mscnt = tmc2130_rd_MSCNT(axis); while ((cnt--) && ((mscnt >> shift) != step)) { diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index ed4c0d7c0..4b5b764ce 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -29,6 +29,10 @@ extern uint8_t tmc2130_sg_homing_axes_mask; #define TMC2130_WAVE_FAC1000_MAX 200 #define TMC2130_WAVE_FAC1000_STP 1 +#define TMC2130_MINIMUM_PULSE 0 // minimum pulse width in uS +#define TMC2130_SET_DIR_DELAY 20 // minimum delay after setting direction in uS +#define TMC2130_SET_PWR_DELAY 0 // minimum delay after changing pwr mode in uS + extern uint8_t tmc2130_home_enabled; extern uint8_t tmc2130_home_origin[2]; extern uint8_t tmc2130_home_bsteps[2]; From 6ea198a866efcc6ecc55d2c7c29a4535ee9bee14 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 14 Jul 2019 17:39:06 +0200 Subject: [PATCH 013/218] Fix DEDGE in sm4.c (fixes xyz calibration) --- Firmware/sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/sm4.c b/Firmware/sm4.c index 34cf8a3c9..b68e02762 100644 --- a/Firmware/sm4.c +++ b/Firmware/sm4.c @@ -129,11 +129,15 @@ void sm4_set_dir_bits(uint8_t dir_bits) void sm4_do_step(uint8_t axes_mask) { #if ((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3) || (MOTHERBOARD == BOARD_EINSY_1_0a)) +#ifdef TMC2130_DEDGE_STEPPING + PORTC ^= (axes_mask & 0x0f); //set step signals by mask +#else register uint8_t portC = PORTC & 0xf0; PORTC = portC | (axes_mask & 0x0f); //set step signals by mask asm("nop"); PORTC = portC; //set step signals to zero asm("nop"); +#endif #endif //((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3) || (MOTHERBOARD == BOARD_EINSY_1_0a)) } From 78bbfc62379719a127cd5edcc48b3eb21aa2594f Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 14 Jul 2019 18:53:37 +0200 Subject: [PATCH 014/218] Fix delay calculations inside babystep() - Avoid all delays when using DEDGE stepping - Correctly account for direction change delays --- Firmware/stepper.cpp | 179 +++++++++++++++++++++++++------------------ 1 file changed, 105 insertions(+), 74 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 8f2a4f125..b3cc5a577 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -72,6 +72,14 @@ uint16_t SP_min = 0x21FF; #define _STEP_PIN_Z2_AXIS Z2_STEP_PIN #endif +#ifdef TMC2130 +#define STEPPER_MINIMUM_PULSE TMC2130_MINIMUM_PULSE +#define STEPPER_SET_DIR_DELAY TMC2130_SET_DIR_DELAY +#else +#define STEPPER_MINIMUM_PULSE 2 +#define STEPPER_SET_DIR_DELAY 100 +#endif + #ifdef TMC2130_DEDGE_STEPPING #define STEP_NC_HI(axis) TOGGLE(_STEP_PIN_##axis) #define STEP_NC_LO(axis) //NOP @@ -1416,89 +1424,112 @@ void quickStop() #ifdef BABYSTEPPING void babystep(const uint8_t axis,const bool direction) { - //MUST ONLY BE CALLED BY A ISR, it depends on that no other ISR interrupts this - //store initial pin states - switch(axis) - { - case X_AXIS: - { - enable_x(); - uint8_t old_x_dir_pin= READ(X_DIR_PIN); //if dualzstepper, both point to same direction. - - //setup new step - WRITE(X_DIR_PIN,(INVERT_X_DIR)^direction); - - //perform step - STEP_NC_HI(X_AXIS); + // MUST ONLY BE CALLED BY A ISR as stepper pins are manipulated directly. + // note: when switching direction no delay is inserted at the end when the + // original is restored. We assume enough time passes as the function + // returns and the stepper is manipulated again (to avoid dead times) + switch(axis) + { + case X_AXIS: + { + enable_x(); + uint8_t old_x_dir_pin = READ(X_DIR_PIN); //if dualzstepper, both point to same direction. + uint8_t new_x_dir_pin = (INVERT_X_DIR)^direction; + + //setup new step + if (new_x_dir_pin != old_x_dir_pin) { + WRITE_NC(X_DIR_PIN, new_x_dir_pin); + delayMicroseconds(STEPPER_SET_DIR_DELAY); + } + + //perform step + STEP_NC_HI(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - STEP_NC_HI(X_DUP_AXIS); -#endif //DEBUG_XSTEP_DUP_PIN - delayMicroseconds(1); - STEP_NC_LO(X_AXIS); + STEP_NC_HI(X_DUP_AXIS); +#endif +#ifndef TMC2130_DEDGE_STEPPING + delayMicroseconds(STEPPER_MINIMUM_PULSE); + STEP_NC_LO(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN - STEP_NC_LO(X_DUP_AXIS); -#endif //DEBUG_XSTEP_DUP_PIN + STEP_NC_LO(X_DUP_AXIS); +#endif +#endif - //get old pin state back. - WRITE(X_DIR_PIN,old_x_dir_pin); - } - break; - case Y_AXIS: - { - enable_y(); - uint8_t old_y_dir_pin= READ(Y_DIR_PIN); //if dualzstepper, both point to same direction. - - //setup new step - WRITE(Y_DIR_PIN,(INVERT_Y_DIR)^direction); - - //perform step - STEP_NC_HI(Y_AXIS); + //get old pin state back. + WRITE_NC(X_DIR_PIN, old_x_dir_pin); + } + break; + + case Y_AXIS: + { + enable_y(); + uint8_t old_y_dir_pin = READ(Y_DIR_PIN); //if dualzstepper, both point to same direction. + uint8_t new_y_dir_pin = (INVERT_Y_DIR)^direction; + + //setup new step + if (new_y_dir_pin != old_y_dir_pin) { + WRITE_NC(Y_DIR_PIN, new_y_dir_pin); + delayMicroseconds(STEPPER_SET_DIR_DELAY); + } + + //perform step + STEP_NC_HI(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - STEP_NC_HI(Y_DUP_AXIS); -#endif //DEBUG_YSTEP_DUP_PIN - delayMicroseconds(1); - STEP_NC_LO(Y_AXIS); + STEP_NC_HI(Y_DUP_AXIS); +#endif +#ifndef TMC2130_DEDGE_STEPPING + delayMicroseconds(STEPPER_MINIMUM_PULSE); + STEP_NC_LO(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN - STEP_NC_LO(Y_DUP_AXIS); -#endif //DEBUG_YSTEP_DUP_PIN + STEP_NC_LO(Y_DUP_AXIS); +#endif +#endif - //get old pin state back. - WRITE(Y_DIR_PIN,old_y_dir_pin); + //get old pin state back. + WRITE_NC(Y_DIR_PIN, old_y_dir_pin); + } + break; - } - break; - - case Z_AXIS: - { - enable_z(); - uint8_t old_z_dir_pin= READ(Z_DIR_PIN); //if dualzstepper, both point to same direction. - //setup new step - WRITE(Z_DIR_PIN,(INVERT_Z_DIR)^direction^BABYSTEP_INVERT_Z); - #ifdef Z_DUAL_STEPPER_DRIVERS - WRITE(Z2_DIR_PIN,(INVERT_Z_DIR)^direction^BABYSTEP_INVERT_Z); - #endif - //perform step - STEP_NC_HI(Z_AXIS); - #ifdef Z_DUAL_STEPPER_DRIVERS - STEP_NC_HI(Z2_AXIS); - #endif - delayMicroseconds(1); - STEP_NC_LO(Z_AXIS); - #ifdef Z_DUAL_STEPPER_DRIVERS - STEP_NC_LO(Z2_AXIS); - #endif + case Z_AXIS: + { + enable_z(); + uint8_t old_z_dir_pin = READ(Z_DIR_PIN); //if dualzstepper, both point to same direction. + uint8_t new_z_dir_pin = (INVERT_Z_DIR)^direction^BABYSTEP_INVERT_Z; - //get old pin state back. - WRITE(Z_DIR_PIN,old_z_dir_pin); - #ifdef Z_DUAL_STEPPER_DRIVERS - WRITE(Z2_DIR_PIN,old_z_dir_pin); - #endif + //setup new step + if (new_z_dir_pin != old_z_dir_pin) { + WRITE_NC(Z_DIR_PIN, new_z_dir_pin); +#ifdef Z_DUAL_STEPPER_DRIVERS + WRITE_NC(Z2_DIR_PIN, new_z_dir_pin); +#endif + delayMicroseconds(STEPPER_SET_DIR_DELAY); + } - } - break; - - default: break; - } + //perform step + STEP_NC_HI(Z_AXIS); +#ifdef Z_DUAL_STEPPER_DRIVERS + STEP_NC_HI(Z2_AXIS); +#endif +#ifndef TMC2130_DEDGE_STEPPING + delayMicroseconds(STEPPER_MINIMUM_PULSE); + STEP_NC_LO(Z_AXIS); +#ifdef Z_DUAL_STEPPER_DRIVERS + STEP_NC_LO(Z2_AXIS); +#endif +#endif + + //get old pin state back. + if (new_z_dir_pin != old_z_dir_pin) { + WRITE_NC(Z_DIR_PIN, old_z_dir_pin); +#ifdef Z_DUAL_STEPPER_DRIVERS + WRITE_NC(Z2_DIR_PIN, old_z_dir_pin); +#endif + } + } + break; + + default: break; + } } #endif //BABYSTEPPING From d8fbd46cd28910f17e5c7c3947394a61c2c7ff50 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 23 Jul 2020 17:28:25 +0300 Subject: [PATCH 015/218] M155 --- Firmware/Configuration_adv.h | 5 + Firmware/Marlin_main.cpp | 214 +++++++++++++++++++++-------------- 2 files changed, 133 insertions(+), 86 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 5386c2815..18e7a11b9 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -62,6 +62,11 @@ // before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) #define FAN_KICKSTART_TIME 800 +/** + * Auto-report temperatures with M155 S + */ +#define AUTO_REPORT_TEMPERATURES + diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8dbc0d840..53b04eee4 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -393,6 +393,11 @@ static int saved_fanSpeed = 0; //!< Print fan speed static int saved_feedmultiply_mm = 100; +#ifdef AUTO_REPORT_TEMPERATURES +static LongTimer auto_report_temp_timer; +static uint8_t auto_report_temp_period = 0; +#endif //AUTO_REPORT_TEMPERATURES + //=========================================================================== //=============================Routines====================================== //=========================================================================== @@ -402,6 +407,7 @@ static bool setTargetedHotend(int code, uint8_t &extruder); static void print_time_remaining_init(); static void wait_for_heater(long codenum, uint8_t extruder); static void gcode_G28(bool home_x_axis, bool home_y_axis, bool home_z_axis); +static void gcode_M115(uint8_t extruder); static void temp_compensation_start(); static void temp_compensation_apply(); @@ -1720,6 +1726,18 @@ void host_keepalive() { #endif //HOST_KEEPALIVE_FEATURE if (farm_mode) return; long ms = _millis(); + +#ifdef AUTO_REPORT_TEMPERATURES + if (auto_report_temp_timer.running()) + { + if (auto_report_temp_timer.expired(auto_report_temp_period * 1000ul)) + { + gcode_M115(active_extruder); + auto_report_temp_timer.start(); + } + } +#endif //AUTO_REPORT_TEMPERATURES + if (host_keepalive_interval && busy_state != NOT_BUSY) { if ((ms - prev_busy_signal_ms) < (long)(1000L * host_keepalive_interval)) return; switch (busy_state) { @@ -2523,6 +2541,96 @@ void force_high_power_mode(bool start_high_power_section) { } #endif //TMC2130 +void gcode_M115(uint8_t extruder) +{ +#if defined(TEMP_0_PIN) && TEMP_0_PIN > -1 + SERIAL_PROTOCOLPGM("T:"); + SERIAL_PROTOCOL_F(degHotend(extruder),1); + SERIAL_PROTOCOLPGM(" /"); + SERIAL_PROTOCOL_F(degTargetHotend(extruder),1); +#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 + SERIAL_PROTOCOLPGM(" B:"); + SERIAL_PROTOCOL_F(degBed(),1); + SERIAL_PROTOCOLPGM(" /"); + SERIAL_PROTOCOL_F(degTargetBed(),1); +#endif //TEMP_BED_PIN + for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) { + SERIAL_PROTOCOLPGM(" T"); + SERIAL_PROTOCOL(cur_extruder); + SERIAL_PROTOCOL(':'); + SERIAL_PROTOCOL_F(degHotend(cur_extruder),1); + SERIAL_PROTOCOLPGM(" /"); + SERIAL_PROTOCOL_F(degTargetHotend(cur_extruder),1); + } +#else + SERIAL_ERROR_START; + SERIAL_ERRORLNRPGM(_i("No thermistors - no temperature"));////MSG_ERR_NO_THERMISTORS +#endif + + SERIAL_PROTOCOLPGM(" @:"); +#ifdef EXTRUDER_WATTS + SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(tmp_extruder))/127); + SERIAL_PROTOCOLPGM("W"); +#else + SERIAL_PROTOCOL(getHeaterPower(extruder)); +#endif + + SERIAL_PROTOCOLPGM(" B@:"); +#ifdef BED_WATTS + SERIAL_PROTOCOL((BED_WATTS * getHeaterPower(-1))/127); + SERIAL_PROTOCOLPGM("W"); +#else + SERIAL_PROTOCOL(getHeaterPower(-1)); +#endif + +#ifdef PINDA_THERMISTOR + SERIAL_PROTOCOLPGM(" P:"); + SERIAL_PROTOCOL_F(current_temperature_pinda,1); +#endif //PINDA_THERMISTOR + +#ifdef AMBIENT_THERMISTOR + SERIAL_PROTOCOLPGM(" A:"); + SERIAL_PROTOCOL_F(current_temperature_ambient,1); +#endif //AMBIENT_THERMISTOR + + +#ifdef SHOW_TEMP_ADC_VALUES + { + float raw = 0.0; +#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 + SERIAL_PROTOCOLPGM(" ADC B:"); + SERIAL_PROTOCOL_F(degBed(),1); + SERIAL_PROTOCOLPGM("C->"); + raw = rawBedTemp(); + SERIAL_PROTOCOL_F(raw/OVERSAMPLENR,5); + SERIAL_PROTOCOLPGM(" Rb->"); + SERIAL_PROTOCOL_F(100 * (1 + (PtA * (raw/OVERSAMPLENR)) + (PtB * sq((raw/OVERSAMPLENR)))), 5); + SERIAL_PROTOCOLPGM(" Rxb->"); + SERIAL_PROTOCOL_F(raw, 5); +#endif + for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) { + SERIAL_PROTOCOLPGM(" T"); + SERIAL_PROTOCOL(cur_extruder); + SERIAL_PROTOCOLPGM(":"); + SERIAL_PROTOCOL_F(degHotend(cur_extruder),1); + SERIAL_PROTOCOLPGM("C->"); + raw = rawHotendTemp(cur_extruder); + SERIAL_PROTOCOL_F(raw/OVERSAMPLENR,5); + SERIAL_PROTOCOLPGM(" Rt"); + SERIAL_PROTOCOL(cur_extruder); + SERIAL_PROTOCOLPGM("->"); + SERIAL_PROTOCOL_F(100 * (1 + (PtA * (raw/OVERSAMPLENR)) + (PtB * sq((raw/OVERSAMPLENR)))), 5); + SERIAL_PROTOCOLPGM(" Rx"); + SERIAL_PROTOCOL(cur_extruder); + SERIAL_PROTOCOLPGM("->"); + SERIAL_PROTOCOL_F(raw, 5); + } + } +#endif + SERIAL_PROTOCOLLN(""); + KEEPALIVE_STATE(NOT_BUSY); +} + #ifdef TMC2130 static void gcode_G28(bool home_x_axis, long home_x_value, bool home_y_axis, long home_y_value, bool home_z_axis, long home_z_value, bool calib, bool without_mbl) #else @@ -6280,96 +6388,30 @@ Sigma_Exit: uint8_t extruder; if(setTargetedHotend(105, extruder)){ break; - } - #if defined(TEMP_0_PIN) && TEMP_0_PIN > -1 - SERIAL_PROTOCOLPGM("ok T:"); - SERIAL_PROTOCOL_F(degHotend(extruder),1); - SERIAL_PROTOCOLPGM(" /"); - SERIAL_PROTOCOL_F(degTargetHotend(extruder),1); - #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 - SERIAL_PROTOCOLPGM(" B:"); - SERIAL_PROTOCOL_F(degBed(),1); - SERIAL_PROTOCOLPGM(" /"); - SERIAL_PROTOCOL_F(degTargetBed(),1); - #endif //TEMP_BED_PIN - for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) { - SERIAL_PROTOCOLPGM(" T"); - SERIAL_PROTOCOL(cur_extruder); - SERIAL_PROTOCOL(':'); - SERIAL_PROTOCOL_F(degHotend(cur_extruder),1); - SERIAL_PROTOCOLPGM(" /"); - SERIAL_PROTOCOL_F(degTargetHotend(cur_extruder),1); - } - #else - SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_i("No thermistors - no temperature"));////MSG_ERR_NO_THERMISTORS - #endif - - SERIAL_PROTOCOLPGM(" @:"); - #ifdef EXTRUDER_WATTS - SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(tmp_extruder))/127); - SERIAL_PROTOCOLPGM("W"); - #else - SERIAL_PROTOCOL(getHeaterPower(extruder)); - #endif - - SERIAL_PROTOCOLPGM(" B@:"); - #ifdef BED_WATTS - SERIAL_PROTOCOL((BED_WATTS * getHeaterPower(-1))/127); - SERIAL_PROTOCOLPGM("W"); - #else - SERIAL_PROTOCOL(getHeaterPower(-1)); - #endif - -#ifdef PINDA_THERMISTOR - SERIAL_PROTOCOLPGM(" P:"); - SERIAL_PROTOCOL_F(current_temperature_pinda,1); -#endif //PINDA_THERMISTOR - -#ifdef AMBIENT_THERMISTOR - SERIAL_PROTOCOLPGM(" A:"); - SERIAL_PROTOCOL_F(current_temperature_ambient,1); -#endif //AMBIENT_THERMISTOR - - - #ifdef SHOW_TEMP_ADC_VALUES - {float raw = 0.0; - - #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 - SERIAL_PROTOCOLPGM(" ADC B:"); - SERIAL_PROTOCOL_F(degBed(),1); - SERIAL_PROTOCOLPGM("C->"); - raw = rawBedTemp(); - SERIAL_PROTOCOL_F(raw/OVERSAMPLENR,5); - SERIAL_PROTOCOLPGM(" Rb->"); - SERIAL_PROTOCOL_F(100 * (1 + (PtA * (raw/OVERSAMPLENR)) + (PtB * sq((raw/OVERSAMPLENR)))), 5); - SERIAL_PROTOCOLPGM(" Rxb->"); - SERIAL_PROTOCOL_F(raw, 5); - #endif - for (int8_t cur_extruder = 0; cur_extruder < EXTRUDERS; ++cur_extruder) { - SERIAL_PROTOCOLPGM(" T"); - SERIAL_PROTOCOL(cur_extruder); - SERIAL_PROTOCOLPGM(":"); - SERIAL_PROTOCOL_F(degHotend(cur_extruder),1); - SERIAL_PROTOCOLPGM("C->"); - raw = rawHotendTemp(cur_extruder); - SERIAL_PROTOCOL_F(raw/OVERSAMPLENR,5); - SERIAL_PROTOCOLPGM(" Rt"); - SERIAL_PROTOCOL(cur_extruder); - SERIAL_PROTOCOLPGM("->"); - SERIAL_PROTOCOL_F(100 * (1 + (PtA * (raw/OVERSAMPLENR)) + (PtB * sq((raw/OVERSAMPLENR)))), 5); - SERIAL_PROTOCOLPGM(" Rx"); - SERIAL_PROTOCOL(cur_extruder); - SERIAL_PROTOCOLPGM("->"); - SERIAL_PROTOCOL_F(raw, 5); - }} - #endif - SERIAL_PROTOCOLLN(""); - KEEPALIVE_STATE(NOT_BUSY); + } + + SERIAL_PROTOCOLPGM("ok "); + gcode_M115(extruder); + return; break; } +#ifdef AUTO_REPORT_TEMPERATURES + case 155: + { + if (code_seen('S')) + { + auto_report_temp_period = code_value_uint8(); + if (auto_report_temp_period != 0) + auto_report_temp_timer.start(); + else + auto_report_temp_timer.stop(); + } + } + break; +#endif //AUTO_REPORT_TEMPERATURES + /*! ### M109 - Wait for extruder temperature M109: Set Extruder Temperature and Wait #### Usage From 502bc8c72ddcb92828a4016546439674b2a74d5d Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 20 Aug 2020 12:33:52 +0200 Subject: [PATCH 016/218] Isolate more pat9125 code Remove probing from Marlin_main and move it into pat9125_probe so that it can support the various variants. --- Firmware/Marlin_main.cpp | 15 ++++----------- Firmware/config.h | 4 +++- Firmware/pat9125.c | 39 +++++++++++++++++++++++++++++---------- Firmware/pat9125.h | 1 + 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2a261db2a..e3be3dfbd 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -88,18 +88,13 @@ #include "la10compat.h" #endif -#ifdef SWSPI -#include "swspi.h" -#endif //SWSPI - #include "spi.h" -#ifdef SWI2C -#include "swi2c.h" -#endif //SWI2C - #ifdef FILAMENT_SENSOR #include "fsensor.h" +#ifdef IR_SENSOR +#include "pat9125.h" // for pat9125_probe +#endif #endif //FILAMENT_SENSOR #ifdef TMC2130 @@ -864,9 +859,7 @@ static void check_if_fw_is_on_right_printer(){ #ifdef FILAMENT_SENSOR if((PRINTER_TYPE == PRINTER_MK3) || (PRINTER_TYPE == PRINTER_MK3S)){ #ifdef IR_SENSOR - swi2c_init(); - const uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); - if (pat9125_detected){ + if (pat9125_probe()){ lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));}////c=20 r=3 #endif //IR_SENSOR diff --git a/Firmware/config.h b/Firmware/config.h index 1a0a97008..b7705584a 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -23,7 +23,6 @@ #define ADC_CALLBACK adc_ready //callback function () //SWI2C configuration -#define SWI2C //#define SWI2C_SDA 20 //SDA on P3 //#define SWI2C_SCL 21 //SCL on P3 #define SWI2C_A8 @@ -31,7 +30,10 @@ #define SWI2C_TMO 2048 //2048 cycles timeout //PAT9125 configuration +//#define PAT9125_SWSPI #define PAT9125_SWI2C +//#define PAT9125_I2C + #define PAT9125_I2C_ADDR 0x75 //ID=LO //#define PAT9125_I2C_ADDR 0x79 //ID=HI //#define PAT9125_I2C_ADDR 0x73 //ID=NC diff --git a/Firmware/pat9125.c b/Firmware/pat9125.c index de4693d29..10b06b3ea 100644 --- a/Firmware/pat9125.c +++ b/Firmware/pat9125.c @@ -26,12 +26,15 @@ #define PAT9125_BANK_SELECTION 0x7f -#ifdef PAT9125_SWSPI +#if defined(PAT9125_SWSPI) #include "swspi.h" -#endif //PAT9125_SWSPI -#ifdef PAT9125_SWI2C +#elif defined(PAT9125_SWI2C) #include "swi2c.h" -#endif //PAT9125_SWI2C +#elif defined(PAT9125_I2C) +#error not implemented +#else +#error unknown PAT9125 communication method +#endif uint8_t pat9125_PID1 = 0; @@ -103,14 +106,30 @@ extern FILE _uartout; #define uartout (&_uartout) +uint8_t pat9125_probe() +{ +#if defined(PAT9125_SWSPI) + swspi_init(); + //#error not implemented +#elif defined(PAT9125_SWI2C) + swi2c_init(); + return swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); +#elif defined(PAT9125_I2C) + twi_init(); + #ifdef IR_SENSOR + // NOTE: this is called from the MK3S variant, so it should be kept minimal + #error not implemented + #else + return pat9125_rd_reg(PAT9125_PID1) != 0; + #endif +#endif +} + uint8_t pat9125_init(void) { -#ifdef PAT9125_SWSPI - swspi_init(); -#endif //PAT9125_SWSPI -#ifdef PAT9125_SWI2C - swi2c_init(); -#endif //PAT9125_SWI2C + if (!pat9125_probe()) + return 0; + // Verify that the sensor responds with its correct product ID. pat9125_PID1 = pat9125_rd_reg(PAT9125_PID1); pat9125_PID2 = pat9125_rd_reg(PAT9125_PID2); diff --git a/Firmware/pat9125.h b/Firmware/pat9125.h index 12f7fe949..1fb2539f4 100755 --- a/Firmware/pat9125.h +++ b/Firmware/pat9125.h @@ -18,6 +18,7 @@ extern int16_t pat9125_y; extern uint8_t pat9125_b; extern uint8_t pat9125_s; +extern uint8_t pat9125_probe(void); // Return non-zero if PAT9125 can be trivially detected extern uint8_t pat9125_init(void); extern uint8_t pat9125_update(void); // update all sensor data extern uint8_t pat9125_update_y(void); // update _y only From 240dc1132ee90fe3680e787dcde665306cc3bcf2 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 20 Aug 2020 12:36:01 +0200 Subject: [PATCH 017/218] Include initial implementation based on Arduino's twi --- Firmware/config.h | 4 +- Firmware/pat9125.c | 47 ++-- Firmware/twi.c | 561 +++++++++++++++++++++++++++++++++++++++++++++ Firmware/twi.h | 55 +++++ 4 files changed, 646 insertions(+), 21 deletions(-) create mode 100644 Firmware/twi.c create mode 100644 Firmware/twi.h diff --git a/Firmware/config.h b/Firmware/config.h index b7705584a..b107d0ec5 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -31,8 +31,8 @@ //PAT9125 configuration //#define PAT9125_SWSPI -#define PAT9125_SWI2C -//#define PAT9125_I2C +//#define PAT9125_SWI2C +#define PAT9125_I2C #define PAT9125_I2C_ADDR 0x75 //ID=LO //#define PAT9125_I2C_ADDR 0x79 //ID=HI diff --git a/Firmware/pat9125.c b/Firmware/pat9125.c index 10b06b3ea..bf2c0d958 100644 --- a/Firmware/pat9125.c +++ b/Firmware/pat9125.c @@ -31,7 +31,7 @@ #elif defined(PAT9125_SWI2C) #include "swi2c.h" #elif defined(PAT9125_I2C) -#error not implemented +#include "twi.h" #else #error unknown PAT9125 communication method #endif @@ -253,39 +253,48 @@ uint8_t pat9125_update_bs(void) uint8_t pat9125_rd_reg(uint8_t addr) { uint8_t data = 0; -#ifdef PAT9125_SWSPI +#if defined(PAT9125_SWSPI) swspi_start(); swspi_tx(addr & 0x7f); data = swspi_rx(); swspi_stop(); -#endif //PAT9125_SWSPI -#ifdef PAT9125_SWI2C +#elif defined(PAT9125_SWI2C) if (!swi2c_readByte_A8(PAT9125_I2C_ADDR, addr, &data)) //NO ACK error - { - pat9125_PID1 = 0xff; - pat9125_PID2 = 0xff; - return 0; - } -#endif //PAT9125_SWI2C + goto error; +#elif defined(PAT9125_I2C) + if (twi_writeTo(PAT9125_I2C_ADDR,&addr,1,1,0) != 0 || + twi_readFrom(PAT9125_I2C_ADDR,&data,1,1) != 1) + goto error; +#endif return data; + + error: + pat9125_PID1 = 0xff; + pat9125_PID2 = 0xff; + return 0; } void pat9125_wr_reg(uint8_t addr, uint8_t data) { -#ifdef PAT9125_SWSPI +#if defined(PAT9125_SWSPI) swspi_start(); swspi_tx(addr | 0x80); swspi_tx(data); swspi_stop(); -#endif //PAT9125_SWSPI -#ifdef PAT9125_SWI2C +#elif defined(PAT9125_SWI2C) if (!swi2c_writeByte_A8(PAT9125_I2C_ADDR, addr, &data)) //NO ACK error - { - pat9125_PID1 = 0xff; - pat9125_PID2 = 0xff; - return; - } -#endif //PAT9125_SWI2C + goto error; +#elif defined(PAT9125_I2C) + if (twi_writeTo(PAT9125_I2C_ADDR,&addr,1,1,0) != 0 || + twi_writeTo(PAT9125_I2C_ADDR,&data,1,1,1) != 0) + goto error; +#endif + return; + + error: + pat9125_PID1 = 0xff; + pat9125_PID2 = 0xff; + return; } uint8_t pat9125_wr_reg_verify(uint8_t addr, uint8_t data) diff --git a/Firmware/twi.c b/Firmware/twi.c new file mode 100644 index 000000000..171af7303 --- /dev/null +++ b/Firmware/twi.c @@ -0,0 +1,561 @@ +/* + twi.c - TWI/I2C library for Wiring & Arduino + Copyright (c) 2006 Nicholas Zambetti. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts +*/ + +#include +#include +#include +#include +#include +#include +#include "Arduino.h" // for digitalWrite + +#ifndef cbi +#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) +#endif + +#ifndef sbi +#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) +#endif + +#include "pins_arduino.h" +#include "twi.h" + +static volatile uint8_t twi_state; +static volatile uint8_t twi_slarw; +static volatile uint8_t twi_sendStop; // should the transaction end with a stop +static volatile uint8_t twi_inRepStart; // in the middle of a repeated start + +static void (*twi_onSlaveTransmit)(void); +static void (*twi_onSlaveReceive)(uint8_t*, int); + +static uint8_t twi_masterBuffer[TWI_BUFFER_LENGTH]; +static volatile uint8_t twi_masterBufferIndex; +static volatile uint8_t twi_masterBufferLength; + +static uint8_t twi_txBuffer[TWI_BUFFER_LENGTH]; +static volatile uint8_t twi_txBufferIndex; +static volatile uint8_t twi_txBufferLength; + +static uint8_t twi_rxBuffer[TWI_BUFFER_LENGTH]; +static volatile uint8_t twi_rxBufferIndex; + +static volatile uint8_t twi_error; + +/* + * Function twi_init + * Desc readys twi pins and sets twi bitrate + * Input none + * Output none + */ +void twi_init(void) +{ + // initialize state + twi_state = TWI_READY; + twi_sendStop = true; // default value + twi_inRepStart = false; + + // activate internal pullups for twi. + digitalWrite(SDA, 1); + digitalWrite(SCL, 1); + + // initialize twi prescaler and bit rate + cbi(TWSR, TWPS0); + cbi(TWSR, TWPS1); + TWBR = ((F_CPU / TWI_FREQ) - 16) / 2; + + /* twi bit rate formula from atmega128 manual pg 204 + SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR)) + note: TWBR should be 10 or higher for master mode + It is 72 for a 16mhz Wiring board with 100kHz TWI */ + + // enable twi module, acks, and twi interrupt + TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA); +} + +/* + * Function twi_disable + * Desc disables twi pins + * Input none + * Output none + */ +void twi_disable(void) +{ + // disable twi module, acks, and twi interrupt + TWCR &= ~(_BV(TWEN) | _BV(TWIE) | _BV(TWEA)); + + // deactivate internal pullups for twi. + digitalWrite(SDA, 0); + digitalWrite(SCL, 0); +} + +/* + * Function twi_slaveInit + * Desc sets slave address and enables interrupt + * Input none + * Output none + */ +void twi_setAddress(uint8_t address) +{ + // set twi slave address (skip over TWGCE bit) + TWAR = address << 1; +} + +/* + * Function twi_setClock + * Desc sets twi bit rate + * Input Clock Frequency + * Output none + */ +void twi_setFrequency(uint32_t frequency) +{ + TWBR = ((F_CPU / frequency) - 16) / 2; + + /* twi bit rate formula from atmega128 manual pg 204 + SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR)) + note: TWBR should be 10 or higher for master mode + It is 72 for a 16mhz Wiring board with 100kHz TWI */ +} + +/* + * Function twi_readFrom + * Desc attempts to become twi bus master and read a + * series of bytes from a device on the bus + * Input address: 7bit i2c device address + * data: pointer to byte array + * length: number of bytes to read into array + * sendStop: Boolean indicating whether to send a stop at the end + * Output number of bytes read + */ +uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sendStop) +{ + uint8_t i; + + // ensure data will fit into buffer + if(TWI_BUFFER_LENGTH < length){ + return 0; + } + + // wait until twi is ready, become master receiver + while(TWI_READY != twi_state){ + continue; + } + twi_state = TWI_MRX; + twi_sendStop = sendStop; + // reset error state (0xFF.. no error occured) + twi_error = 0xFF; + + // initialize buffer iteration vars + twi_masterBufferIndex = 0; + twi_masterBufferLength = length-1; // This is not intuitive, read on... + // On receive, the previously configured ACK/NACK setting is transmitted in + // response to the received byte before the interrupt is signalled. + // Therefor we must actually set NACK when the _next_ to last byte is + // received, causing that NACK to be sent in response to receiving the last + // expected byte of data. + + // build sla+w, slave device address + w bit + twi_slarw = TW_READ; + twi_slarw |= address << 1; + + if (true == twi_inRepStart) { + // if we're in the repeated start state, then we've already sent the start, + // (@@@ we hope), and the TWI statemachine is just waiting for the address byte. + // We need to remove ourselves from the repeated start state before we enable interrupts, + // since the ISR is ASYNC, and we could get confused if we hit the ISR before cleaning + // up. Also, don't enable the START interrupt. There may be one pending from the + // repeated start that we sent ourselves, and that would really confuse things. + twi_inRepStart = false; // remember, we're dealing with an ASYNC ISR + do { + TWDR = twi_slarw; + } while(TWCR & _BV(TWWC)); + TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE); // enable INTs, but not START + } + else + // send start condition + TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTA); + + // wait for read operation to complete + while(TWI_MRX == twi_state){ + continue; + } + + if (twi_masterBufferIndex < length) + length = twi_masterBufferIndex; + + // copy twi buffer to data + for(i = 0; i < length; ++i){ + data[i] = twi_masterBuffer[i]; + } + + return length; +} + +/* + * Function twi_writeTo + * Desc attempts to become twi bus master and write a + * series of bytes to a device on the bus + * Input address: 7bit i2c device address + * data: pointer to byte array + * length: number of bytes in array + * wait: boolean indicating to wait for write or not + * sendStop: boolean indicating whether or not to send a stop at the end + * Output 0 .. success + * 1 .. length to long for buffer + * 2 .. address send, NACK received + * 3 .. data send, NACK received + * 4 .. other twi error (lost bus arbitration, bus error, ..) + */ +uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait, uint8_t sendStop) +{ + uint8_t i; + + // ensure data will fit into buffer + if(TWI_BUFFER_LENGTH < length){ + return 1; + } + + // wait until twi is ready, become master transmitter + while(TWI_READY != twi_state){ + continue; + } + twi_state = TWI_MTX; + twi_sendStop = sendStop; + // reset error state (0xFF.. no error occured) + twi_error = 0xFF; + + // initialize buffer iteration vars + twi_masterBufferIndex = 0; + twi_masterBufferLength = length; + + // copy data to twi buffer + for(i = 0; i < length; ++i){ + twi_masterBuffer[i] = data[i]; + } + + // build sla+w, slave device address + w bit + twi_slarw = TW_WRITE; + twi_slarw |= address << 1; + + // if we're in a repeated start, then we've already sent the START + // in the ISR. Don't do it again. + // + if (true == twi_inRepStart) { + // if we're in the repeated start state, then we've already sent the start, + // (@@@ we hope), and the TWI statemachine is just waiting for the address byte. + // We need to remove ourselves from the repeated start state before we enable interrupts, + // since the ISR is ASYNC, and we could get confused if we hit the ISR before cleaning + // up. Also, don't enable the START interrupt. There may be one pending from the + // repeated start that we sent outselves, and that would really confuse things. + twi_inRepStart = false; // remember, we're dealing with an ASYNC ISR + do { + TWDR = twi_slarw; + } while(TWCR & _BV(TWWC)); + TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE); // enable INTs, but not START + } + else + // send start condition + TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE) | _BV(TWSTA); // enable INTs + + // wait for write operation to complete + while(wait && (TWI_MTX == twi_state)){ + continue; + } + + if (twi_error == 0xFF) + return 0; // success + else if (twi_error == TW_MT_SLA_NACK) + return 2; // error: address send, nack received + else if (twi_error == TW_MT_DATA_NACK) + return 3; // error: data send, nack received + else + return 4; // other twi error +} + +/* + * Function twi_transmit + * Desc fills slave tx buffer with data + * must be called in slave tx event callback + * Input data: pointer to byte array + * length: number of bytes in array + * Output 1 length too long for buffer + * 2 not slave transmitter + * 0 ok + */ +uint8_t twi_transmit(const uint8_t* data, uint8_t length) +{ + uint8_t i; + + // ensure data will fit into buffer + if(TWI_BUFFER_LENGTH < (twi_txBufferLength+length)){ + return 1; + } + + // ensure we are currently a slave transmitter + if(TWI_STX != twi_state){ + return 2; + } + + // set length and copy data into tx buffer + for(i = 0; i < length; ++i){ + twi_txBuffer[twi_txBufferLength+i] = data[i]; + } + twi_txBufferLength += length; + + return 0; +} + +/* + * Function twi_attachSlaveRxEvent + * Desc sets function called before a slave read operation + * Input function: callback function to use + * Output none + */ +void twi_attachSlaveRxEvent( void (*function)(uint8_t*, int) ) +{ + twi_onSlaveReceive = function; +} + +/* + * Function twi_attachSlaveTxEvent + * Desc sets function called before a slave write operation + * Input function: callback function to use + * Output none + */ +void twi_attachSlaveTxEvent( void (*function)(void) ) +{ + twi_onSlaveTransmit = function; +} + +/* + * Function twi_reply + * Desc sends byte or readys receive line + * Input ack: byte indicating to ack or to nack + * Output none + */ +void twi_reply(uint8_t ack) +{ + // transmit master read ready signal, with or without ack + if(ack){ + TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT) | _BV(TWEA); + }else{ + TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT); + } +} + +/* + * Function twi_stop + * Desc relinquishes bus master status + * Input none + * Output none + */ +void twi_stop(void) +{ + // send stop condition + TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTO); + + // wait for stop condition to be exectued on bus + // TWINT is not set after a stop condition! + while(TWCR & _BV(TWSTO)){ + continue; + } + + // update twi state + twi_state = TWI_READY; +} + +/* + * Function twi_releaseBus + * Desc releases bus control + * Input none + * Output none + */ +void twi_releaseBus(void) +{ + // release bus + TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT); + + // update twi state + twi_state = TWI_READY; +} + +ISR(TWI_vect) +{ + switch(TW_STATUS){ + // All Master + case TW_START: // sent start condition + case TW_REP_START: // sent repeated start condition + // copy device address and r/w bit to output register and ack + TWDR = twi_slarw; + twi_reply(1); + break; + + // Master Transmitter + case TW_MT_SLA_ACK: // slave receiver acked address + case TW_MT_DATA_ACK: // slave receiver acked data + // if there is data to send, send it, otherwise stop + if(twi_masterBufferIndex < twi_masterBufferLength){ + // copy data to output register and ack + TWDR = twi_masterBuffer[twi_masterBufferIndex++]; + twi_reply(1); + }else{ + if (twi_sendStop) + twi_stop(); + else { + twi_inRepStart = true; // we're gonna send the START + // don't enable the interrupt. We'll generate the start, but we + // avoid handling the interrupt until we're in the next transaction, + // at the point where we would normally issue the start. + TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ; + twi_state = TWI_READY; + } + } + break; + case TW_MT_SLA_NACK: // address sent, nack received + twi_error = TW_MT_SLA_NACK; + twi_stop(); + break; + case TW_MT_DATA_NACK: // data sent, nack received + twi_error = TW_MT_DATA_NACK; + twi_stop(); + break; + case TW_MT_ARB_LOST: // lost bus arbitration + twi_error = TW_MT_ARB_LOST; + twi_releaseBus(); + break; + + // Master Receiver + case TW_MR_DATA_ACK: // data received, ack sent + // put byte into buffer + twi_masterBuffer[twi_masterBufferIndex++] = TWDR; + case TW_MR_SLA_ACK: // address sent, ack received + // ack if more bytes are expected, otherwise nack + if(twi_masterBufferIndex < twi_masterBufferLength){ + twi_reply(1); + }else{ + twi_reply(0); + } + break; + case TW_MR_DATA_NACK: // data received, nack sent + // put final byte into buffer + twi_masterBuffer[twi_masterBufferIndex++] = TWDR; + if (twi_sendStop) + twi_stop(); + else { + twi_inRepStart = true; // we're gonna send the START + // don't enable the interrupt. We'll generate the start, but we + // avoid handling the interrupt until we're in the next transaction, + // at the point where we would normally issue the start. + TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ; + twi_state = TWI_READY; + } + break; + case TW_MR_SLA_NACK: // address sent, nack received + twi_stop(); + break; + // TW_MR_ARB_LOST handled by TW_MT_ARB_LOST case + + // Slave Receiver + case TW_SR_SLA_ACK: // addressed, returned ack + case TW_SR_GCALL_ACK: // addressed generally, returned ack + case TW_SR_ARB_LOST_SLA_ACK: // lost arbitration, returned ack + case TW_SR_ARB_LOST_GCALL_ACK: // lost arbitration, returned ack + // enter slave receiver mode + twi_state = TWI_SRX; + // indicate that rx buffer can be overwritten and ack + twi_rxBufferIndex = 0; + twi_reply(1); + break; + case TW_SR_DATA_ACK: // data received, returned ack + case TW_SR_GCALL_DATA_ACK: // data received generally, returned ack + // if there is still room in the rx buffer + if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){ + // put byte in buffer and ack + twi_rxBuffer[twi_rxBufferIndex++] = TWDR; + twi_reply(1); + }else{ + // otherwise nack + twi_reply(0); + } + break; + case TW_SR_STOP: // stop or repeated start condition received + // ack future responses and leave slave receiver state + twi_releaseBus(); + // put a null char after data if there's room + if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){ + twi_rxBuffer[twi_rxBufferIndex] = '\0'; + } + // callback to user defined callback + twi_onSlaveReceive(twi_rxBuffer, twi_rxBufferIndex); + // since we submit rx buffer to "wire" library, we can reset it + twi_rxBufferIndex = 0; + break; + case TW_SR_DATA_NACK: // data received, returned nack + case TW_SR_GCALL_DATA_NACK: // data received generally, returned nack + // nack back at master + twi_reply(0); + break; + + // Slave Transmitter + case TW_ST_SLA_ACK: // addressed, returned ack + case TW_ST_ARB_LOST_SLA_ACK: // arbitration lost, returned ack + // enter slave transmitter mode + twi_state = TWI_STX; + // ready the tx buffer index for iteration + twi_txBufferIndex = 0; + // set tx buffer length to be zero, to verify if user changes it + twi_txBufferLength = 0; + // request for txBuffer to be filled and length to be set + // note: user must call twi_transmit(bytes, length) to do this + twi_onSlaveTransmit(); + // if they didn't change buffer & length, initialize it + if(0 == twi_txBufferLength){ + twi_txBufferLength = 1; + twi_txBuffer[0] = 0x00; + } + // transmit first byte from buffer, fall + case TW_ST_DATA_ACK: // byte sent, ack returned + // copy data to output register + TWDR = twi_txBuffer[twi_txBufferIndex++]; + // if there is more to send, ack, otherwise nack + if(twi_txBufferIndex < twi_txBufferLength){ + twi_reply(1); + }else{ + twi_reply(0); + } + break; + case TW_ST_DATA_NACK: // received nack, we are done + case TW_ST_LAST_DATA: // received ack, but we are done already! + // ack future responses + twi_reply(1); + // leave slave receiver state + twi_state = TWI_READY; + break; + + // All + case TW_NO_INFO: // no state information + break; + case TW_BUS_ERROR: // bus error, illegal stop/start + twi_error = TW_BUS_ERROR; + twi_stop(); + break; + } +} + diff --git a/Firmware/twi.h b/Firmware/twi.h new file mode 100644 index 000000000..cb48708c4 --- /dev/null +++ b/Firmware/twi.h @@ -0,0 +1,55 @@ +/* + twi.h - TWI/I2C library for Wiring & Arduino + Copyright (c) 2006 Nicholas Zambetti. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#ifndef twi_h +#define twi_h + + #include + + //#define ATMEGA8 + + #ifndef TWI_FREQ + #define TWI_FREQ 400000L + #endif + + #ifndef TWI_BUFFER_LENGTH + #define TWI_BUFFER_LENGTH 32 + #endif + + #define TWI_READY 0 + #define TWI_MRX 1 + #define TWI_MTX 2 + #define TWI_SRX 3 + #define TWI_STX 4 + + void twi_init(void); + void twi_disable(void); + void twi_setAddress(uint8_t); + void twi_setFrequency(uint32_t); + uint8_t twi_readFrom(uint8_t, uint8_t*, uint8_t, uint8_t); + uint8_t twi_writeTo(uint8_t, uint8_t*, uint8_t, uint8_t, uint8_t); + uint8_t twi_transmit(const uint8_t*, uint8_t); + void twi_attachSlaveRxEvent( void (*)(uint8_t*, int) ); + void twi_attachSlaveTxEvent( void (*)(void) ); + void twi_reply(uint8_t); + void twi_stop(void); + void twi_releaseBus(void); + +#endif + From 7f425120f09dc33b7bd1b75af4d42cdad5ad1441 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 20 Aug 2020 15:29:57 +0200 Subject: [PATCH 018/218] Strip down the TWI code - Only implement a single syncronous read/write function to read a byte, since that's all we need currently - Implement a compact IR_SENSOR probe for PAT9125 - Saves 242 bytes compared to PAT9125_SWI2C --- Firmware/pat9125.c | 13 +- Firmware/twi.c | 518 +++------------------------------------------ Firmware/twi.h | 64 +++--- 3 files changed, 63 insertions(+), 532 deletions(-) diff --git a/Firmware/pat9125.c b/Firmware/pat9125.c index bf2c0d958..ab6342aaa 100644 --- a/Firmware/pat9125.c +++ b/Firmware/pat9125.c @@ -118,9 +118,10 @@ uint8_t pat9125_probe() twi_init(); #ifdef IR_SENSOR // NOTE: this is called from the MK3S variant, so it should be kept minimal - #error not implemented + uint8_t addr = PAT9125_PID1; + return (twi_rw8(PAT9125_I2C_ADDR,TW_READ,&addr) == 0); #else - return pat9125_rd_reg(PAT9125_PID1) != 0; + return (pat9125_rd_reg(PAT9125_PID1) != 0); #endif #endif } @@ -262,8 +263,8 @@ uint8_t pat9125_rd_reg(uint8_t addr) if (!swi2c_readByte_A8(PAT9125_I2C_ADDR, addr, &data)) //NO ACK error goto error; #elif defined(PAT9125_I2C) - if (twi_writeTo(PAT9125_I2C_ADDR,&addr,1,1,0) != 0 || - twi_readFrom(PAT9125_I2C_ADDR,&data,1,1) != 1) + if (twi_rw8(PAT9125_I2C_ADDR,TW_WRITE,&addr) || + twi_rw8(PAT9125_I2C_ADDR,TW_READ,&data)) goto error; #endif return data; @@ -285,8 +286,8 @@ void pat9125_wr_reg(uint8_t addr, uint8_t data) if (!swi2c_writeByte_A8(PAT9125_I2C_ADDR, addr, &data)) //NO ACK error goto error; #elif defined(PAT9125_I2C) - if (twi_writeTo(PAT9125_I2C_ADDR,&addr,1,1,0) != 0 || - twi_writeTo(PAT9125_I2C_ADDR,&data,1,1,1) != 0) + if (twi_rw8(PAT9125_I2C_ADDR,TW_WRITE,&addr) || + twi_rw8(PAT9125_I2C_ADDR,TW_READ,&data)) goto error; #endif return; diff --git a/Firmware/twi.c b/Firmware/twi.c index 171af7303..161db52ac 100644 --- a/Firmware/twi.c +++ b/Firmware/twi.c @@ -1,5 +1,5 @@ /* - twi.c - TWI/I2C library for Wiring & Arduino + twi.c - Stripped-down TWI/I2C library Copyright (c) 2006 Nicholas Zambetti. All right reserved. This library is free software; you can redistribute it and/or @@ -20,11 +20,6 @@ */ #include -#include -#include -#include -#include -#include #include "Arduino.h" // for digitalWrite #ifndef cbi @@ -35,43 +30,11 @@ #define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) #endif -#include "pins_arduino.h" #include "twi.h" -static volatile uint8_t twi_state; -static volatile uint8_t twi_slarw; -static volatile uint8_t twi_sendStop; // should the transaction end with a stop -static volatile uint8_t twi_inRepStart; // in the middle of a repeated start -static void (*twi_onSlaveTransmit)(void); -static void (*twi_onSlaveReceive)(uint8_t*, int); - -static uint8_t twi_masterBuffer[TWI_BUFFER_LENGTH]; -static volatile uint8_t twi_masterBufferIndex; -static volatile uint8_t twi_masterBufferLength; - -static uint8_t twi_txBuffer[TWI_BUFFER_LENGTH]; -static volatile uint8_t twi_txBufferIndex; -static volatile uint8_t twi_txBufferLength; - -static uint8_t twi_rxBuffer[TWI_BUFFER_LENGTH]; -static volatile uint8_t twi_rxBufferIndex; - -static volatile uint8_t twi_error; - -/* - * Function twi_init - * Desc readys twi pins and sets twi bitrate - * Input none - * Output none - */ void twi_init(void) { - // initialize state - twi_state = TWI_READY; - twi_sendStop = true; // default value - twi_inRepStart = false; - // activate internal pullups for twi. digitalWrite(SDA, 1); digitalWrite(SCL, 1); @@ -85,477 +48,46 @@ void twi_init(void) SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR)) note: TWBR should be 10 or higher for master mode It is 72 for a 16mhz Wiring board with 100kHz TWI */ - - // enable twi module, acks, and twi interrupt - TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA); } -/* - * Function twi_disable - * Desc disables twi pins - * Input none - * Output none - */ void twi_disable(void) { - // disable twi module, acks, and twi interrupt - TWCR &= ~(_BV(TWEN) | _BV(TWIE) | _BV(TWEA)); - // deactivate internal pullups for twi. digitalWrite(SDA, 0); digitalWrite(SCL, 0); } -/* - * Function twi_slaveInit - * Desc sets slave address and enables interrupt - * Input none - * Output none - */ -void twi_setAddress(uint8_t address) +uint8_t twi_waitfor(uint8_t status) { - // set twi slave address (skip over TWGCE bit) - TWAR = address << 1; + while(!(TWCR & _BV(TWINT))); + return (TW_STATUS != status); } -/* - * Function twi_setClock - * Desc sets twi bit rate - * Input Clock Frequency - * Output none - */ -void twi_setFrequency(uint32_t frequency) +uint8_t twi_rw8(uint8_t address, uint8_t mode, uint8_t* data) { - TWBR = ((F_CPU / frequency) - 16) / 2; - - /* twi bit rate formula from atmega128 manual pg 204 - SCL Frequency = CPU Clock Frequency / (16 + (2 * TWBR)) - note: TWBR should be 10 or higher for master mode - It is 72 for a 16mhz Wiring board with 100kHz TWI */ -} + // send start condition + TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTA); + if(twi_waitfor(TW_START)) + return 1; -/* - * Function twi_readFrom - * Desc attempts to become twi bus master and read a - * series of bytes from a device on the bus - * Input address: 7bit i2c device address - * data: pointer to byte array - * length: number of bytes to read into array - * sendStop: Boolean indicating whether to send a stop at the end - * Output number of bytes read - */ -uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sendStop) -{ - uint8_t i; + // send address + TWDR = mode; + TWDR |= (address << 1); + TWCR = _BV(TWEN) | _BV(TWINT); + if(twi_waitfor(mode == TW_READ? TW_MR_SLA_ACK: TW_MT_SLA_ACK)) + return 2; - // ensure data will fit into buffer - if(TWI_BUFFER_LENGTH < length){ - return 0; - } + // send or receive data + if(mode == TW_WRITE) + TWDR = *data; + TWCR = _BV(TWEN) | _BV(TWINT); + if(twi_waitfor(mode == TW_READ? TW_MR_DATA_NACK: TW_MT_DATA_ACK)) + return 3; + if(mode == TW_READ) + *data = TWDR; - // wait until twi is ready, become master receiver - while(TWI_READY != twi_state){ - continue; - } - twi_state = TWI_MRX; - twi_sendStop = sendStop; - // reset error state (0xFF.. no error occured) - twi_error = 0xFF; + // send stop + TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTO); - // initialize buffer iteration vars - twi_masterBufferIndex = 0; - twi_masterBufferLength = length-1; // This is not intuitive, read on... - // On receive, the previously configured ACK/NACK setting is transmitted in - // response to the received byte before the interrupt is signalled. - // Therefor we must actually set NACK when the _next_ to last byte is - // received, causing that NACK to be sent in response to receiving the last - // expected byte of data. - - // build sla+w, slave device address + w bit - twi_slarw = TW_READ; - twi_slarw |= address << 1; - - if (true == twi_inRepStart) { - // if we're in the repeated start state, then we've already sent the start, - // (@@@ we hope), and the TWI statemachine is just waiting for the address byte. - // We need to remove ourselves from the repeated start state before we enable interrupts, - // since the ISR is ASYNC, and we could get confused if we hit the ISR before cleaning - // up. Also, don't enable the START interrupt. There may be one pending from the - // repeated start that we sent ourselves, and that would really confuse things. - twi_inRepStart = false; // remember, we're dealing with an ASYNC ISR - do { - TWDR = twi_slarw; - } while(TWCR & _BV(TWWC)); - TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE); // enable INTs, but not START - } - else - // send start condition - TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTA); - - // wait for read operation to complete - while(TWI_MRX == twi_state){ - continue; - } - - if (twi_masterBufferIndex < length) - length = twi_masterBufferIndex; - - // copy twi buffer to data - for(i = 0; i < length; ++i){ - data[i] = twi_masterBuffer[i]; - } - - return length; -} - -/* - * Function twi_writeTo - * Desc attempts to become twi bus master and write a - * series of bytes to a device on the bus - * Input address: 7bit i2c device address - * data: pointer to byte array - * length: number of bytes in array - * wait: boolean indicating to wait for write or not - * sendStop: boolean indicating whether or not to send a stop at the end - * Output 0 .. success - * 1 .. length to long for buffer - * 2 .. address send, NACK received - * 3 .. data send, NACK received - * 4 .. other twi error (lost bus arbitration, bus error, ..) - */ -uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait, uint8_t sendStop) -{ - uint8_t i; - - // ensure data will fit into buffer - if(TWI_BUFFER_LENGTH < length){ - return 1; - } - - // wait until twi is ready, become master transmitter - while(TWI_READY != twi_state){ - continue; - } - twi_state = TWI_MTX; - twi_sendStop = sendStop; - // reset error state (0xFF.. no error occured) - twi_error = 0xFF; - - // initialize buffer iteration vars - twi_masterBufferIndex = 0; - twi_masterBufferLength = length; - - // copy data to twi buffer - for(i = 0; i < length; ++i){ - twi_masterBuffer[i] = data[i]; - } - - // build sla+w, slave device address + w bit - twi_slarw = TW_WRITE; - twi_slarw |= address << 1; - - // if we're in a repeated start, then we've already sent the START - // in the ISR. Don't do it again. - // - if (true == twi_inRepStart) { - // if we're in the repeated start state, then we've already sent the start, - // (@@@ we hope), and the TWI statemachine is just waiting for the address byte. - // We need to remove ourselves from the repeated start state before we enable interrupts, - // since the ISR is ASYNC, and we could get confused if we hit the ISR before cleaning - // up. Also, don't enable the START interrupt. There may be one pending from the - // repeated start that we sent outselves, and that would really confuse things. - twi_inRepStart = false; // remember, we're dealing with an ASYNC ISR - do { - TWDR = twi_slarw; - } while(TWCR & _BV(TWWC)); - TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE); // enable INTs, but not START - } - else - // send start condition - TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE) | _BV(TWSTA); // enable INTs - - // wait for write operation to complete - while(wait && (TWI_MTX == twi_state)){ - continue; - } - - if (twi_error == 0xFF) - return 0; // success - else if (twi_error == TW_MT_SLA_NACK) - return 2; // error: address send, nack received - else if (twi_error == TW_MT_DATA_NACK) - return 3; // error: data send, nack received - else - return 4; // other twi error -} - -/* - * Function twi_transmit - * Desc fills slave tx buffer with data - * must be called in slave tx event callback - * Input data: pointer to byte array - * length: number of bytes in array - * Output 1 length too long for buffer - * 2 not slave transmitter - * 0 ok - */ -uint8_t twi_transmit(const uint8_t* data, uint8_t length) -{ - uint8_t i; - - // ensure data will fit into buffer - if(TWI_BUFFER_LENGTH < (twi_txBufferLength+length)){ - return 1; - } - - // ensure we are currently a slave transmitter - if(TWI_STX != twi_state){ - return 2; - } - - // set length and copy data into tx buffer - for(i = 0; i < length; ++i){ - twi_txBuffer[twi_txBufferLength+i] = data[i]; - } - twi_txBufferLength += length; - return 0; } - -/* - * Function twi_attachSlaveRxEvent - * Desc sets function called before a slave read operation - * Input function: callback function to use - * Output none - */ -void twi_attachSlaveRxEvent( void (*function)(uint8_t*, int) ) -{ - twi_onSlaveReceive = function; -} - -/* - * Function twi_attachSlaveTxEvent - * Desc sets function called before a slave write operation - * Input function: callback function to use - * Output none - */ -void twi_attachSlaveTxEvent( void (*function)(void) ) -{ - twi_onSlaveTransmit = function; -} - -/* - * Function twi_reply - * Desc sends byte or readys receive line - * Input ack: byte indicating to ack or to nack - * Output none - */ -void twi_reply(uint8_t ack) -{ - // transmit master read ready signal, with or without ack - if(ack){ - TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT) | _BV(TWEA); - }else{ - TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT); - } -} - -/* - * Function twi_stop - * Desc relinquishes bus master status - * Input none - * Output none - */ -void twi_stop(void) -{ - // send stop condition - TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTO); - - // wait for stop condition to be exectued on bus - // TWINT is not set after a stop condition! - while(TWCR & _BV(TWSTO)){ - continue; - } - - // update twi state - twi_state = TWI_READY; -} - -/* - * Function twi_releaseBus - * Desc releases bus control - * Input none - * Output none - */ -void twi_releaseBus(void) -{ - // release bus - TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT); - - // update twi state - twi_state = TWI_READY; -} - -ISR(TWI_vect) -{ - switch(TW_STATUS){ - // All Master - case TW_START: // sent start condition - case TW_REP_START: // sent repeated start condition - // copy device address and r/w bit to output register and ack - TWDR = twi_slarw; - twi_reply(1); - break; - - // Master Transmitter - case TW_MT_SLA_ACK: // slave receiver acked address - case TW_MT_DATA_ACK: // slave receiver acked data - // if there is data to send, send it, otherwise stop - if(twi_masterBufferIndex < twi_masterBufferLength){ - // copy data to output register and ack - TWDR = twi_masterBuffer[twi_masterBufferIndex++]; - twi_reply(1); - }else{ - if (twi_sendStop) - twi_stop(); - else { - twi_inRepStart = true; // we're gonna send the START - // don't enable the interrupt. We'll generate the start, but we - // avoid handling the interrupt until we're in the next transaction, - // at the point where we would normally issue the start. - TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ; - twi_state = TWI_READY; - } - } - break; - case TW_MT_SLA_NACK: // address sent, nack received - twi_error = TW_MT_SLA_NACK; - twi_stop(); - break; - case TW_MT_DATA_NACK: // data sent, nack received - twi_error = TW_MT_DATA_NACK; - twi_stop(); - break; - case TW_MT_ARB_LOST: // lost bus arbitration - twi_error = TW_MT_ARB_LOST; - twi_releaseBus(); - break; - - // Master Receiver - case TW_MR_DATA_ACK: // data received, ack sent - // put byte into buffer - twi_masterBuffer[twi_masterBufferIndex++] = TWDR; - case TW_MR_SLA_ACK: // address sent, ack received - // ack if more bytes are expected, otherwise nack - if(twi_masterBufferIndex < twi_masterBufferLength){ - twi_reply(1); - }else{ - twi_reply(0); - } - break; - case TW_MR_DATA_NACK: // data received, nack sent - // put final byte into buffer - twi_masterBuffer[twi_masterBufferIndex++] = TWDR; - if (twi_sendStop) - twi_stop(); - else { - twi_inRepStart = true; // we're gonna send the START - // don't enable the interrupt. We'll generate the start, but we - // avoid handling the interrupt until we're in the next transaction, - // at the point where we would normally issue the start. - TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ; - twi_state = TWI_READY; - } - break; - case TW_MR_SLA_NACK: // address sent, nack received - twi_stop(); - break; - // TW_MR_ARB_LOST handled by TW_MT_ARB_LOST case - - // Slave Receiver - case TW_SR_SLA_ACK: // addressed, returned ack - case TW_SR_GCALL_ACK: // addressed generally, returned ack - case TW_SR_ARB_LOST_SLA_ACK: // lost arbitration, returned ack - case TW_SR_ARB_LOST_GCALL_ACK: // lost arbitration, returned ack - // enter slave receiver mode - twi_state = TWI_SRX; - // indicate that rx buffer can be overwritten and ack - twi_rxBufferIndex = 0; - twi_reply(1); - break; - case TW_SR_DATA_ACK: // data received, returned ack - case TW_SR_GCALL_DATA_ACK: // data received generally, returned ack - // if there is still room in the rx buffer - if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){ - // put byte in buffer and ack - twi_rxBuffer[twi_rxBufferIndex++] = TWDR; - twi_reply(1); - }else{ - // otherwise nack - twi_reply(0); - } - break; - case TW_SR_STOP: // stop or repeated start condition received - // ack future responses and leave slave receiver state - twi_releaseBus(); - // put a null char after data if there's room - if(twi_rxBufferIndex < TWI_BUFFER_LENGTH){ - twi_rxBuffer[twi_rxBufferIndex] = '\0'; - } - // callback to user defined callback - twi_onSlaveReceive(twi_rxBuffer, twi_rxBufferIndex); - // since we submit rx buffer to "wire" library, we can reset it - twi_rxBufferIndex = 0; - break; - case TW_SR_DATA_NACK: // data received, returned nack - case TW_SR_GCALL_DATA_NACK: // data received generally, returned nack - // nack back at master - twi_reply(0); - break; - - // Slave Transmitter - case TW_ST_SLA_ACK: // addressed, returned ack - case TW_ST_ARB_LOST_SLA_ACK: // arbitration lost, returned ack - // enter slave transmitter mode - twi_state = TWI_STX; - // ready the tx buffer index for iteration - twi_txBufferIndex = 0; - // set tx buffer length to be zero, to verify if user changes it - twi_txBufferLength = 0; - // request for txBuffer to be filled and length to be set - // note: user must call twi_transmit(bytes, length) to do this - twi_onSlaveTransmit(); - // if they didn't change buffer & length, initialize it - if(0 == twi_txBufferLength){ - twi_txBufferLength = 1; - twi_txBuffer[0] = 0x00; - } - // transmit first byte from buffer, fall - case TW_ST_DATA_ACK: // byte sent, ack returned - // copy data to output register - TWDR = twi_txBuffer[twi_txBufferIndex++]; - // if there is more to send, ack, otherwise nack - if(twi_txBufferIndex < twi_txBufferLength){ - twi_reply(1); - }else{ - twi_reply(0); - } - break; - case TW_ST_DATA_NACK: // received nack, we are done - case TW_ST_LAST_DATA: // received ack, but we are done already! - // ack future responses - twi_reply(1); - // leave slave receiver state - twi_state = TWI_READY; - break; - - // All - case TW_NO_INFO: // no state information - break; - case TW_BUS_ERROR: // bus error, illegal stop/start - twi_error = TW_BUS_ERROR; - twi_stop(); - break; - } -} - diff --git a/Firmware/twi.h b/Firmware/twi.h index cb48708c4..abcb8e975 100644 --- a/Firmware/twi.h +++ b/Firmware/twi.h @@ -1,5 +1,5 @@ /* - twi.h - TWI/I2C library for Wiring & Arduino + twi.h - Stripped-down TWI/I2C library Copyright (c) 2006 Nicholas Zambetti. All right reserved. This library is free software; you can redistribute it and/or @@ -17,39 +17,37 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef twi_h -#define twi_h +#pragma once - #include - - //#define ATMEGA8 - - #ifndef TWI_FREQ - #define TWI_FREQ 400000L - #endif - - #ifndef TWI_BUFFER_LENGTH - #define TWI_BUFFER_LENGTH 32 - #endif - - #define TWI_READY 0 - #define TWI_MRX 1 - #define TWI_MTX 2 - #define TWI_SRX 3 - #define TWI_STX 4 - - void twi_init(void); - void twi_disable(void); - void twi_setAddress(uint8_t); - void twi_setFrequency(uint32_t); - uint8_t twi_readFrom(uint8_t, uint8_t*, uint8_t, uint8_t); - uint8_t twi_writeTo(uint8_t, uint8_t*, uint8_t, uint8_t, uint8_t); - uint8_t twi_transmit(const uint8_t*, uint8_t); - void twi_attachSlaveRxEvent( void (*)(uint8_t*, int) ); - void twi_attachSlaveTxEvent( void (*)(void) ); - void twi_reply(uint8_t); - void twi_stop(void); - void twi_releaseBus(void); +#include +#include +#ifndef TWI_FREQ +#define TWI_FREQ 400000L #endif +/* + * Function twi_init + * Desc readys twi pins and sets twi bitrate + * Input none + * Output none + */ +void twi_init(void); + +/* + * Function twi_disable + * Desc disables twi pins + * Input none + * Output none + */ +void twi_disable(void); + +/* + * Function twi_rw8 + * Desc read/write a single byte from a device + * Input address: 7bit i2c device address + * mode: TW_READ or TW_WRITE + * data: pointer to byte + * Output 0 on success + */ +uint8_t twi_rw8(uint8_t address, uint8_t mode, uint8_t* data); From 30e7b777e03054417f23d161b9a30df3b96e89ee Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 20 Aug 2020 22:13:13 +0200 Subject: [PATCH 019/218] Error-out with PAT9125_SWSPI (not fully implemented) .. and likely will never was/be. --- Firmware/pat9125.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/pat9125.c b/Firmware/pat9125.c index ab6342aaa..f47d676bb 100644 --- a/Firmware/pat9125.c +++ b/Firmware/pat9125.c @@ -110,7 +110,7 @@ uint8_t pat9125_probe() { #if defined(PAT9125_SWSPI) swspi_init(); - //#error not implemented + #error not implemented #elif defined(PAT9125_SWI2C) swi2c_init(); return swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); From d8a88379385504241747aca0877076049992e3dc Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 25 Aug 2020 11:31:35 +0200 Subject: [PATCH 020/218] Document the 3 possible modes --- Firmware/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/config.h b/Firmware/config.h index b107d0ec5..c64bd441e 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -30,9 +30,9 @@ #define SWI2C_TMO 2048 //2048 cycles timeout //PAT9125 configuration -//#define PAT9125_SWSPI -//#define PAT9125_SWI2C -#define PAT9125_I2C +//#define PAT9125_SWSPI // software SPI mode (incomplete) +//#define PAT9125_SWI2C // software I2C mode +#define PAT9125_I2C // hardware I2C mode #define PAT9125_I2C_ADDR 0x75 //ID=LO //#define PAT9125_I2C_ADDR 0x79 //ID=HI From e37cdab38fd0a8df2bcad4eca3e410e7b9de148f Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 25 Aug 2020 11:58:48 +0200 Subject: [PATCH 021/218] PAT9125_I2C: accept either NACK or ACK in receive Both would be technically correct. --- Firmware/twi.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/Firmware/twi.c b/Firmware/twi.c index 161db52ac..11c708aa7 100644 --- a/Firmware/twi.c +++ b/Firmware/twi.c @@ -57,34 +57,52 @@ void twi_disable(void) digitalWrite(SCL, 0); } -uint8_t twi_waitfor(uint8_t status) +static void twi_wait() { while(!(TWCR & _BV(TWINT))); - return (TW_STATUS != status); } uint8_t twi_rw8(uint8_t address, uint8_t mode, uint8_t* data) { // send start condition TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTA); - if(twi_waitfor(TW_START)) + twi_wait(); + if(TW_STATUS != TW_START) return 1; // send address TWDR = mode; TWDR |= (address << 1); TWCR = _BV(TWEN) | _BV(TWINT); - if(twi_waitfor(mode == TW_READ? TW_MR_SLA_ACK: TW_MT_SLA_ACK)) - return 2; + twi_wait(); - // send or receive data if(mode == TW_WRITE) + { + if(TW_STATUS != TW_MT_SLA_ACK) + return 2; + + // send data TWDR = *data; - TWCR = _BV(TWEN) | _BV(TWINT); - if(twi_waitfor(mode == TW_READ? TW_MR_DATA_NACK: TW_MT_DATA_ACK)) - return 3; - if(mode == TW_READ) + TWCR = _BV(TWEN) | _BV(TWINT); + twi_wait(); + if(TW_STATUS != TW_MT_DATA_ACK) + return 3; + } + else + { + if(TW_STATUS != TW_MR_SLA_ACK) + return 2; + + // receive data + TWCR = _BV(TWEN) | _BV(TWINT); + twi_wait(); + + // accept ACK or NACK (since only 1 byte is read) + if(!(TW_STATUS & TW_MR_DATA_ACK)) + return 3; + *data = TWDR; + } // send stop TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTO); From 3e7bba54e0c4caffc8d39e47af9f4659d8589aac Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 28 Aug 2020 17:32:07 +0300 Subject: [PATCH 022/218] SD card released message --- Firmware/cardreader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index a49cd6d68..fdef1cd43 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -243,6 +243,8 @@ void CardReader::release() { sdprinting = false; cardOK = false; + SERIAL_ECHO_START; + SERIAL_ECHOLNRPGM(_n("SD card released"));////MSG_SD_CARD_RELEASED } void CardReader::startFileprint() From 02891f6bb8c05a310a5861902fb9f8576012d6bc Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Wed, 2 Sep 2020 11:56:53 +0200 Subject: [PATCH 023/218] Version changed (3.9.1-RC1 build 3512) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index a4d797746..d94d846bf 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.9.0" -#define FW_COMMIT_NR 3421 +#define FW_VERSION "3.9.1-RC1" +#define FW_COMMIT_NR 3512 // 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 From 26e900896a1d662236a6edc733bb247080d99e09 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 7 Sep 2020 21:34:41 +0200 Subject: [PATCH 024/218] Re-adjust LA10->15 conversion After fixing some LA15 issues, the strenght of LA15 increased. As such, re-adjust the conversion factor so that: Start K10 => 0.01 (previous minimum was K15) PLA K30 => 0.05 (was 0.07, optimal 0.045-0.06) PETG K45 => 0.08 (was 0.13, optimal 0.07-0.11 depending on material/temp) --- Firmware/la10compat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/la10compat.cpp b/Firmware/la10compat.cpp index 98522f645..d729186fe 100644 --- a/Firmware/la10compat.cpp +++ b/Firmware/la10compat.cpp @@ -38,7 +38,7 @@ void la10c_mode_change(LA10C_MODE mode) // Approximate a LA10 value to a LA15 equivalent. static float la10c_convert(float k) { - float new_K = k * 0.004 - 0.05; + float new_K = k * 0.002 - 0.01; return new_K < 0? 0: new_K > (LA_K_MAX - FLT_EPSILON)? (LA_K_MAX - FLT_EPSILON): new_K; From 160af0a62482c27d57f152a2e5c8bdcb84214166 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 11 Sep 2020 16:11:28 +0300 Subject: [PATCH 025/218] Printer capabilities --- Firmware/Configuration_adv.h | 5 +++++ Firmware/Marlin_main.cpp | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 7ab7a2ee8..29f7e951e 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -376,6 +376,11 @@ const unsigned int dropsegments=5; //everything with less than this number of st #endif #endif +/** + * Include capabilities in M115 output + */ +// #define EXTENDED_CAPABILITIES_REPORT + //=========================================================================== //============================= Define Defines ============================ //=========================================================================== diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f1908f213..85d54d3b5 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3404,6 +3404,17 @@ static void gcode_G92() } } +#ifdef EXTENDED_CAPABILITIES_REPORT + +static void cap_line(const char* name, bool ena = false) { + printf_P(PSTR("Cap:%S:%c\n"), name, (char)ena + '0'); +} + +static void extended_capabilities_report() +{ + //@todo +} +#endif //EXTENDED_CAPABILITIES_REPORT #ifdef BACKLASH_X extern uint8_t st_backlash_x; @@ -6803,6 +6814,11 @@ Sigma_Exit: SERIAL_ECHOPGM(" UUID:"); SERIAL_ECHOLNPGM(MACHINE_UUID); } + +#ifdef EXTENDED_CAPABILITIES_REPORT + extended_capabilities_report(); +#endif //EXTENDED_CAPABILITIES_REPORT + break; /*! From eb007c35d27f94eb880653a39ba21930cae497bd Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 11 Sep 2020 16:12:49 +0300 Subject: [PATCH 026/218] Macros initial --- Firmware/Marlin.h | 7 +------ Firmware/Marlin_main.cpp | 9 +++------ Firmware/backlight.cpp | 6 +++--- Firmware/language.c | 6 +++--- Firmware/language.h | 4 +--- Firmware/macros.h | 18 ++++++++++++++++++ Firmware/tone04.c | 12 +++--------- Firmware/uart2.c | 5 +++-- 8 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 Firmware/macros.h diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index a1736e9c2..6e4b24206 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -4,7 +4,7 @@ #ifndef MARLIN_H #define MARLIN_H -#define FORCE_INLINE __attribute__((always_inline)) inline +#include "macros.h" #include #include @@ -287,11 +287,6 @@ FORCE_INLINE unsigned long millis_nc() { void setPwmFrequency(uint8_t pin, int val); #endif -#ifndef CRITICAL_SECTION_START - #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); - #define CRITICAL_SECTION_END SREG = _sreg; -#endif //CRITICAL_SECTION_START - extern bool fans_check_enabled; extern float homing_feedrate[]; extern uint8_t axis_relative_modes; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 85d54d3b5..4ea488946 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -47,7 +47,9 @@ #include "Configuration.h" #include "Marlin.h" #include "config.h" - + +#include "macros.h" + #ifdef ENABLE_AUTO_BED_LEVELING #include "vector_3.h" #ifdef AUTO_BED_LEVELING_GRID @@ -139,11 +141,6 @@ #include "cmdqueue.h" #include "io_atmega2560.h" -// Macros for bit masks -#define BIT(b) (1<<(b)) -#define TEST(n,b) (((n)&BIT(b))!=0) -#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (BIT(b)) - //Macro for print fan speed #define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 6500837e5..b59a65ef4 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -1,10 +1,10 @@ //backlight.cpp #include "backlight.h" +#include "macros.h" #include #include #include "eeprom.h" -#include "Marlin.h" #include "pins.h" #include "fastio.h" #include "Timer.h" @@ -111,10 +111,10 @@ void backlight_init() #else //LCD_BL_PIN -void force_bl_on(__attribute__((unused)) bool section_start) {} +void force_bl_on(_UNUSED bool section_start) {} void backlight_update() {} void backlight_init() {} void backlight_save() {} -void backlight_wake(__attribute__((unused)) const uint8_t flashNo) {} +void backlight_wake(_UNUSED const uint8_t flashNo) {} #endif //LCD_BL_PIN \ No newline at end of file diff --git a/Firmware/language.c b/Firmware/language.c index e43760967..f7d02b22a 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(__attribute__((unused)) uint8_t lang) { return 0; } +uint8_t lang_select(_UNUSED uint8_t lang) { return 0; } uint8_t lang_get_count() { return 1; } -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"); } +uint16_t lang_get_code(_UNUSED uint8_t lang) { return LANG_CODE_EN; } +const char* lang_get_name_by_code(_UNUSED uint16_t code) { return _n("English"); } void lang_reset(void) { } uint8_t lang_is_selected(void) { return 1; } diff --git a/Firmware/language.h b/Firmware/language.h index 1e4137bf3..4f89b9f25 100644 --- a/Firmware/language.h +++ b/Firmware/language.h @@ -5,6 +5,7 @@ #include "config.h" +#include "macros.h" #include #ifdef DEBUG_SEC_LANG #include @@ -22,9 +23,6 @@ #define MSG_FW_VERSION "Firmware" -#define STRINGIFY_(n) #n -#define STRINGIFY(n) STRINGIFY_(n) - #if (LANG_MODE == 0) //primary language only #define PROGMEM_I2 __attribute__((section(".progmem0"))) #define PROGMEM_I1 __attribute__((section(".progmem1"))) diff --git a/Firmware/macros.h b/Firmware/macros.h new file mode 100644 index 000000000..c27dbde77 --- /dev/null +++ b/Firmware/macros.h @@ -0,0 +1,18 @@ +#ifndef MACROS_H +#define MACROS_H + + +#define FORCE_INLINE __attribute__((always_inline)) inline +#define _UNUSED __attribute__((unused)) + +#ifndef CRITICAL_SECTION_START + #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); + #define CRITICAL_SECTION_END SREG = _sreg; +#endif //CRITICAL_SECTION_START + +// Macros to make a string from a macro +#define STRINGIFY_(M) #M +#define STRINGIFY(M) STRINGIFY_(M) + + +#endif //MACROS_H diff --git a/Firmware/tone04.c b/Firmware/tone04.c index 41f904a91..42b19682f 100644 --- a/Firmware/tone04.c +++ b/Firmware/tone04.c @@ -10,14 +10,8 @@ #include #include #include "pins.h" - -#ifndef CRITICAL_SECTION_START - #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); - #define CRITICAL_SECTION_END SREG = _sreg; -#endif //CRITICAL_SECTION_START - - #include "fastio.h" +#include "macros.h" void timer4_init(void) { @@ -79,7 +73,7 @@ ISR(TIMER4_OVF_vect) WRITE(BEEPER, 0); } -void tone4(__attribute__((unused)) uint8_t _pin, uint16_t frequency) +void tone4(_UNUSED uint8_t _pin, uint16_t frequency) { //this ocr and prescalarbits calculation is taken from the Arduino core and simplified for one type of timer only uint8_t prescalarbits = 0b001; @@ -105,7 +99,7 @@ void tone4(__attribute__((unused)) uint8_t _pin, uint16_t frequency) CRITICAL_SECTION_END; } -void noTone4(__attribute__((unused)) uint8_t _pin) +void noTone4(_UNUSED uint8_t _pin) { CRITICAL_SECTION_START; // Revert prescaler to CLK/1024 diff --git a/Firmware/uart2.c b/Firmware/uart2.c index 472389994..9a2a724e1 100644 --- a/Firmware/uart2.c +++ b/Firmware/uart2.c @@ -4,6 +4,7 @@ #include #include #include "rbuf.h" +#include "macros.h" #define UART2_BAUD 115200 #define UART_BAUD_SELECT(baudRate,xtalCpu) (((float)(xtalCpu))/(((float)(baudRate))*8.0)-1.0+0.5) @@ -16,7 +17,7 @@ uint8_t uart2_ibuf[14] = {0, 0}; FILE _uart2io = {0}; -int uart2_putchar(char c, FILE *stream __attribute__((unused))) +int uart2_putchar(char c, _UNUSED FILE *stream) { while (!uart2_txready); UDR2 = c; // transmit byte @@ -25,7 +26,7 @@ int uart2_putchar(char c, FILE *stream __attribute__((unused))) return 0; } -int uart2_getchar(FILE *stream __attribute__((unused))) +int uart2_getchar(_UNUSED FILE *stream) { if (rbuf_empty(uart2_ibuf)) return -1; return rbuf_get(uart2_ibuf); From c3abd4ffe670faaa1d9b44bf4c52bfcd58ba500c Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 11 Sep 2020 17:43:38 +0300 Subject: [PATCH 027/218] Remove io_atmega2560.h and some more macros --- Firmware/Marlin_main.cpp | 3 +- Firmware/fastio.h | 28 +-- Firmware/fsensor.cpp | 6 +- Firmware/heatbed_pwm.cpp | 1 - Firmware/io_atmega2560.h | 374 -------------------------------------- Firmware/macros.h | 17 ++ Firmware/mmu.cpp | 26 ++- Firmware/pins_Einsy_1_0.h | 2 + Firmware/swi2c.c | 58 +++--- Firmware/timer02.c | 3 - Firmware/ultralcd.cpp | 5 +- Firmware/w25x20cl.c | 8 +- 12 files changed, 79 insertions(+), 452 deletions(-) delete mode 100644 Firmware/io_atmega2560.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4ea488946..7f61c0a8c 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -139,7 +139,6 @@ #include "sound.h" #include "cmdqueue.h" -#include "io_atmega2560.h" //Macro for print fan speed #define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms @@ -876,7 +875,7 @@ static void check_if_fw_is_on_right_printer(){ #ifdef PAT9125 //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor - const uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); + const uint8_t ir_detected = !READ(IR_SENSOR_PIN); if (ir_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}////c=20 r=3 #endif //PAT9125 diff --git a/Firmware/fastio.h b/Firmware/fastio.h index acded8cb6..19c278d4a 100644 --- a/Firmware/fastio.h +++ b/Firmware/fastio.h @@ -7,15 +7,7 @@ #define _FASTIO_ARDUINO_H #include - -/* - utility functions -*/ - -#ifndef MASK -/// MASKING- returns \f$2^PIN\f$ -#define MASK(PIN) (1 << PIN) -#endif +#include "macros.h" /* magic I/O routines @@ -23,20 +15,20 @@ */ /// Read a pin -#define _READ(IO) ((bool)(DIO ## IO ## _RPORT & MASK(DIO ## IO ## _PIN))) +#define _READ(IO) ((bool)(DIO ## IO ## _RPORT & _BV(DIO ## IO ## _PIN))) /// write to a pin // On some boards pins > 0x100 are used. These are not converted to atomic actions. An critical section is needed. -#define _WRITE_NC(IO, v) do { if (v) {DIO ## IO ## _WPORT |= MASK(DIO ## IO ## _PIN); } else {DIO ## IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); }; } while (0) +#define _WRITE_NC(IO, v) do { if (v) {DIO ## IO ## _WPORT |= _BV(DIO ## IO ## _PIN); } else {DIO ## IO ## _WPORT &= ~_BV(DIO ## IO ## _PIN); }; } while (0) #define _WRITE_C(IO, v) do { if (v) { \ CRITICAL_SECTION_START; \ - {DIO ## IO ## _WPORT |= MASK(DIO ## IO ## _PIN); }\ + {DIO ## IO ## _WPORT |= _BV(DIO ## IO ## _PIN); }\ CRITICAL_SECTION_END; \ }\ else {\ CRITICAL_SECTION_START; \ - {DIO ## IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); }\ + {DIO ## IO ## _WPORT &= ~_BV(DIO ## IO ## _PIN); }\ CRITICAL_SECTION_END; \ }\ }\ @@ -45,17 +37,17 @@ #define _WRITE(IO, v) do { if (&(DIO ## IO ## _RPORT) >= (uint8_t *)0x100) {_WRITE_C(IO, v); } else {_WRITE_NC(IO, v); }; } while (0) /// toggle a pin -#define _TOGGLE(IO) do {DIO ## IO ## _RPORT = MASK(DIO ## IO ## _PIN); } while (0) +#define _TOGGLE(IO) do {DIO ## IO ## _RPORT = _BV(DIO ## IO ## _PIN); } while (0) /// set pin as input -#define _SET_INPUT(IO) do {DIO ## IO ## _DDR &= ~MASK(DIO ## IO ## _PIN); } while (0) +#define _SET_INPUT(IO) do {DIO ## IO ## _DDR &= ~_BV(DIO ## IO ## _PIN); } while (0) /// set pin as output -#define _SET_OUTPUT(IO) do {DIO ## IO ## _DDR |= MASK(DIO ## IO ## _PIN); } while (0) +#define _SET_OUTPUT(IO) do {DIO ## IO ## _DDR |= _BV(DIO ## IO ## _PIN); } while (0) /// check if pin is an input -#define _GET_INPUT(IO) ((DIO ## IO ## _DDR & MASK(DIO ## IO ## _PIN)) == 0) +#define _GET_INPUT(IO) ((DIO ## IO ## _DDR & _BV(DIO ## IO ## _PIN)) == 0) /// check if pin is an output -#define _GET_OUTPUT(IO) ((DIO ## IO ## _DDR & MASK(DIO ## IO ## _PIN)) != 0) +#define _GET_OUTPUT(IO) ((DIO ## IO ## _DDR & _BV(DIO ## IO ## _PIN)) != 0) /// check if pin is an timer #define _GET_TIMER(IO) (DIO ## IO ## _PWM) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 7908c5dbc..c81a5ac6f 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -6,7 +6,6 @@ #include #include "pat9125.h" #include "stepper.h" -#include "io_atmega2560.h" #include "cmdqueue.h" #include "ultralcd.h" #include "mmu.h" @@ -608,9 +607,8 @@ void fsensor_st_block_chunk(int cnt) if (!fsensor_enabled) return; fsensor_st_cnt += cnt; - // !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins - if (PIN_GET(FSENSOR_INT_PIN)) {PIN_VAL(FSENSOR_INT_PIN, LOW);} - else {PIN_VAL(FSENSOR_INT_PIN, HIGH);} + // !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins + WRITE(FSENSOR_INT_PIN, !READ(FSENSOR_INT_PIN)); } #endif //PAT9125 diff --git a/Firmware/heatbed_pwm.cpp b/Firmware/heatbed_pwm.cpp index 8121df3ee..b97da52c5 100755 --- a/Firmware/heatbed_pwm.cpp +++ b/Firmware/heatbed_pwm.cpp @@ -1,6 +1,5 @@ #include #include -#include "io_atmega2560.h" // All this is about silencing the heat bed, as it behaves like a loudspeaker. // Basically, we want the PWM heating switched at 30Hz (or so) which is a well ballanced diff --git a/Firmware/io_atmega2560.h b/Firmware/io_atmega2560.h deleted file mode 100644 index e353eb05e..000000000 --- a/Firmware/io_atmega2560.h +++ /dev/null @@ -1,374 +0,0 @@ -//io_atmega2560.h -#ifndef _IO_ATMEGA2560 -#define _IO_ATMEGA2560 - - -#define __PIN_P0 PINE -#define __PIN_P1 PINE -#define __PIN_P2 PINE -#define __PIN_P3 PINE -#define __PIN_P4 PING -#define __PIN_P5 PINE -#define __PIN_P6 PINH -#define __PIN_P7 PINH -#define __PIN_P8 PINH -#define __PIN_P9 PINH -#define __PIN_P10 PINB -#define __PIN_P11 PINB -#define __PIN_P12 PINB -#define __PIN_P13 PINB -#define __PIN_P14 PINJ -#define __PIN_P15 PINJ -#define __PIN_P16 PINH -#define __PIN_P17 PINH -#define __PIN_P18 PIND -#define __PIN_P19 PIND -#define __PIN_P20 PIND -#define __PIN_P21 PIND -#define __PIN_P22 PINA -#define __PIN_P23 PINA -#define __PIN_P24 PINA -#define __PIN_P25 PINA -#define __PIN_P26 PINA -#define __PIN_P27 PINA -#define __PIN_P28 PINA -#define __PIN_P29 PINA -#define __PIN_P30 PINC -#define __PIN_P31 PINC -#define __PIN_P32 PINC -#define __PIN_P33 PINC -#define __PIN_P34 PINC -#define __PIN_P35 PINC -#define __PIN_P36 PINC -#define __PIN_P37 PINC -#define __PIN_P38 PIND -#define __PIN_P39 PING -#define __PIN_P40 PING -#define __PIN_P41 PING -#define __PIN_P42 PINL -#define __PIN_P43 PINL -#define __PIN_P44 PINL -#define __PIN_P45 PINL -#define __PIN_P46 PINL -#define __PIN_P47 PINL -#define __PIN_P48 PINL -#define __PIN_P49 PINL -#define __PIN_P50 PINB -#define __PIN_P51 PINB -#define __PIN_P52 PINB -#define __PIN_P53 PINB -#define __PIN_P54 PINF -#define __PIN_P55 PINF -#define __PIN_P56 PINF -#define __PIN_P57 PINF -#define __PIN_P58 PINF -#define __PIN_P59 PINF -#define __PIN_P60 PINF -#define __PIN_P61 PINF -#define __PIN_P62 PINK -#define __PIN_P63 PINK -#define __PIN_P64 PINK -#define __PIN_P65 PINK -#define __PIN_P66 PINK -#define __PIN_P67 PINK -#define __PIN_P68 PINK -#define __PIN_P69 PINK -#define __PIN_P70 PING -#define __PIN_P71 PING -#define __PIN_P72 PINJ -#define __PIN_P73 PINJ -#define __PIN_P74 PINJ -#define __PIN_P75 PINJ -#define __PIN_P76 PINJ -#define __PIN_P77 PINJ -#define __PIN_P78 PINE -#define __PIN_P79 PINE -#define __PIN_P80 PINE -#define __PIN_P81 PIND -#define __PIN_P82 PIND -#define __PIN_P83 PIND -#define __PIN_P84 PINH -#define __PIN_P85 PINH - -#define __PORT_P0 PORTE -#define __PORT_P1 PORTE -#define __PORT_P2 PORTE -#define __PORT_P3 PORTE -#define __PORT_P4 PORTG -#define __PORT_P5 PORTE -#define __PORT_P6 PORTH -#define __PORT_P7 PORTH -#define __PORT_P8 PORTH -#define __PORT_P9 PORTH -#define __PORT_P10 PORTB -#define __PORT_P11 PORTB -#define __PORT_P12 PORTB -#define __PORT_P13 PORTB -#define __PORT_P14 PORTJ -#define __PORT_P15 PORTJ -#define __PORT_P16 PORTH -#define __PORT_P17 PORTH -#define __PORT_P18 PORTD -#define __PORT_P19 PORTD -#define __PORT_P20 PORTD -#define __PORT_P21 PORTD -#define __PORT_P22 PORTA -#define __PORT_P23 PORTA -#define __PORT_P24 PORTA -#define __PORT_P25 PORTA -#define __PORT_P26 PORTA -#define __PORT_P27 PORTA -#define __PORT_P28 PORTA -#define __PORT_P29 PORTA -#define __PORT_P30 PORTC -#define __PORT_P31 PORTC -#define __PORT_P32 PORTC -#define __PORT_P33 PORTC -#define __PORT_P34 PORTC -#define __PORT_P35 PORTC -#define __PORT_P36 PORTC -#define __PORT_P37 PORTC -#define __PORT_P38 PORTD -#define __PORT_P39 PORTG -#define __PORT_P40 PORTG -#define __PORT_P41 PORTG -#define __PORT_P42 PORTL -#define __PORT_P43 PORTL -#define __PORT_P44 PORTL -#define __PORT_P45 PORTL -#define __PORT_P46 PORTL -#define __PORT_P47 PORTL -#define __PORT_P48 PORTL -#define __PORT_P49 PORTL -#define __PORT_P50 PORTB -#define __PORT_P51 PORTB -#define __PORT_P52 PORTB -#define __PORT_P53 PORTB -#define __PORT_P54 PORTF -#define __PORT_P55 PORTF -#define __PORT_P56 PORTF -#define __PORT_P57 PORTF -#define __PORT_P58 PORTF -#define __PORT_P59 PORTF -#define __PORT_P60 PORTF -#define __PORT_P61 PORTF -#define __PORT_P62 PORTK -#define __PORT_P63 PORTK -#define __PORT_P64 PORTK -#define __PORT_P65 PORTK -#define __PORT_P66 PORTK -#define __PORT_P67 PORTK -#define __PORT_P68 PORTK -#define __PORT_P69 PORTK -#define __PORT_P70 PORTG -#define __PORT_P71 PORTG -#define __PORT_P72 PORTJ -#define __PORT_P73 PORTJ -#define __PORT_P74 PORTJ -#define __PORT_P75 PORTJ -#define __PORT_P76 PORTJ -#define __PORT_P77 PORTJ -#define __PORT_P78 PORTE -#define __PORT_P79 PORTE -#define __PORT_P80 PORTE -#define __PORT_P81 PORTD -#define __PORT_P82 PORTD -#define __PORT_P83 PORTD -#define __PORT_P84 PORTH -#define __PORT_P85 PORTH - -#define __DDR_P0 DDRE -#define __DDR_P1 DDRE -#define __DDR_P2 DDRE -#define __DDR_P3 DDRE -#define __DDR_P4 DDRG -#define __DDR_P5 DDRE -#define __DDR_P6 DDRH -#define __DDR_P7 DDRH -#define __DDR_P8 DDRH -#define __DDR_P9 DDRH -#define __DDR_P10 DDRB -#define __DDR_P11 DDRB -#define __DDR_P12 DDRB -#define __DDR_P13 DDRB -#define __DDR_P14 DDRJ -#define __DDR_P15 DDRJ -#define __DDR_P16 DDRH -#define __DDR_P17 DDRH -#define __DDR_P18 DDRD -#define __DDR_P19 DDRD -#define __DDR_P20 DDRD -#define __DDR_P21 DDRD -#define __DDR_P22 DDRA -#define __DDR_P23 DDRA -#define __DDR_P24 DDRA -#define __DDR_P25 DDRA -#define __DDR_P26 DDRA -#define __DDR_P27 DDRA -#define __DDR_P28 DDRA -#define __DDR_P29 DDRA -#define __DDR_P30 DDRC -#define __DDR_P31 DDRC -#define __DDR_P32 DDRC -#define __DDR_P33 DDRC -#define __DDR_P34 DDRC -#define __DDR_P35 DDRC -#define __DDR_P36 DDRC -#define __DDR_P37 DDRC -#define __DDR_P38 DDRD -#define __DDR_P39 DDRG -#define __DDR_P40 DDRG -#define __DDR_P41 DDRG -#define __DDR_P42 DDRL -#define __DDR_P43 DDRL -#define __DDR_P44 DDRL -#define __DDR_P45 DDRL -#define __DDR_P46 DDRL -#define __DDR_P47 DDRL -#define __DDR_P48 DDRL -#define __DDR_P49 DDRL -#define __DDR_P50 DDRB -#define __DDR_P51 DDRB -#define __DDR_P52 DDRB -#define __DDR_P53 DDRB -#define __DDR_P54 DDRF -#define __DDR_P55 DDRF -#define __DDR_P56 DDRF -#define __DDR_P57 DDRF -#define __DDR_P58 DDRF -#define __DDR_P59 DDRF -#define __DDR_P60 DDRF -#define __DDR_P61 DDRF -#define __DDR_P62 DDRK -#define __DDR_P63 DDRK -#define __DDR_P64 DDRK -#define __DDR_P65 DDRK -#define __DDR_P66 DDRK -#define __DDR_P67 DDRK -#define __DDR_P68 DDRK -#define __DDR_P69 DDRK -#define __DDR_P70 DDRG -#define __DDR_P71 DDRG -#define __DDR_P72 DDRJ -#define __DDR_P73 DDRJ -#define __DDR_P74 DDRJ -#define __DDR_P75 DDRJ -#define __DDR_P76 DDRJ -#define __DDR_P77 DDRJ -#define __DDR_P78 DDRE -#define __DDR_P79 DDRE -#define __DDR_P80 DDRE -#define __DDR_P81 DDRD -#define __DDR_P82 DDRD -#define __DDR_P83 DDRD -#define __DDR_P84 DDRH -#define __DDR_P85 DDRH - -#define __BIT_P0 0 -#define __BIT_P1 1 -#define __BIT_P2 4 -#define __BIT_P3 5 -#define __BIT_P4 5 -#define __BIT_P5 3 -#define __BIT_P6 3 -#define __BIT_P7 4 -#define __BIT_P8 5 -#define __BIT_P9 6 -#define __BIT_P10 4 -#define __BIT_P11 5 -#define __BIT_P12 6 -#define __BIT_P13 7 -#define __BIT_P14 1 -#define __BIT_P15 0 -#define __BIT_P16 0 -#define __BIT_P17 1 -#define __BIT_P18 3 -#define __BIT_P19 2 -#define __BIT_P20 1 -#define __BIT_P21 0 -#define __BIT_P22 0 -#define __BIT_P23 1 -#define __BIT_P24 2 -#define __BIT_P25 3 -#define __BIT_P26 4 -#define __BIT_P27 5 -#define __BIT_P28 6 -#define __BIT_P29 7 -#define __BIT_P30 7 -#define __BIT_P31 6 -#define __BIT_P32 5 -#define __BIT_P33 4 -#define __BIT_P34 3 -#define __BIT_P35 2 -#define __BIT_P36 1 -#define __BIT_P37 0 -#define __BIT_P38 7 -#define __BIT_P39 2 -#define __BIT_P40 1 -#define __BIT_P41 0 -#define __BIT_P42 7 -#define __BIT_P43 6 -#define __BIT_P44 5 -#define __BIT_P45 4 -#define __BIT_P46 3 -#define __BIT_P47 2 -#define __BIT_P48 1 -#define __BIT_P49 0 -#define __BIT_P50 3 -#define __BIT_P51 2 -#define __BIT_P52 1 -#define __BIT_P53 0 -#define __BIT_P54 0 -#define __BIT_P55 1 -#define __BIT_P56 2 -#define __BIT_P57 3 -#define __BIT_P58 4 -#define __BIT_P59 5 -#define __BIT_P60 6 -#define __BIT_P61 7 -#define __BIT_P62 0 -#define __BIT_P63 1 -#define __BIT_P64 2 -#define __BIT_P65 3 -#define __BIT_P66 4 -#define __BIT_P67 5 -#define __BIT_P68 6 -#define __BIT_P69 7 -#define __BIT_P70 4 -#define __BIT_P71 3 -#define __BIT_P72 2 -#define __BIT_P73 3 -#define __BIT_P74 7 -#define __BIT_P75 4 -#define __BIT_P76 5 -#define __BIT_P77 6 -#define __BIT_P78 2 -#define __BIT_P79 6 -#define __BIT_P80 7 -#define __BIT_P81 4 -#define __BIT_P82 5 -#define __BIT_P83 6 -#define __BIT_P84 2 -#define __BIT_P85 7 - -#define __BIT(pin) __BIT_P##pin -#define __MSK(pin) (1 << __BIT(pin)) - -#define __PIN(pin) __PIN_P##pin -#define __PORT(pin) __PORT_P##pin -#define __DDR(pin) __DDR_P##pin - -#define PIN(pin) __PIN(pin) -#define PORT(pin) __PORT(pin) -#define DDR(pin) __DDR(pin) - -#define PIN_INP(pin) DDR(pin) &= ~__MSK(pin) -#define PIN_OUT(pin) DDR(pin) |= __MSK(pin) -#define PIN_CLR(pin) PORT(pin) &= ~__MSK(pin) -#define PIN_SET(pin) PORT(pin) |= __MSK(pin) -#define PIN_VAL(pin, val) if (val) PIN_SET(pin); else PIN_CLR(pin); -#define PIN_GET(pin) (PIN(pin) & __MSK(pin)) -#define PIN_INQ(pin) (PORT(pin) & __MSK(pin)) - - -#endif //_IO_ATMEGA2560 diff --git a/Firmware/macros.h b/Firmware/macros.h index c27dbde77..4d421a273 100644 --- a/Firmware/macros.h +++ b/Firmware/macros.h @@ -1,6 +1,7 @@ #ifndef MACROS_H #define MACROS_H +#include //for cli() and sei() #define FORCE_INLINE __attribute__((always_inline)) inline #define _UNUSED __attribute__((unused)) @@ -14,5 +15,21 @@ #define STRINGIFY_(M) #M #define STRINGIFY(M) STRINGIFY_(M) +// Macros for bit masks +#undef _BV +#define _BV(n) (1<<(n)) +#define TEST(n,b) (!!((n)&_BV(b))) +#define SET_BIT_TO(N,B,TF) do{ if (TF) SBI(N,B); else CBI(N,B); }while(0) + +#ifndef SBI + #define SBI(A,B) (A |= (1 << (B))) +#endif + +#ifndef CBI + #define CBI(A,B) (A &= ~(1 << (B))) +#endif + +#define TBI(N,B) (N ^= _BV(B)) + #endif //MACROS_H diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index c5981894c..ab4af5e29 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -13,8 +13,9 @@ #include "sound.h" #include "printers.h" #include -#include "io_atmega2560.h" #include "AutoDeplete.h" +#include "fastio.h" +#include "pins.h" //-// #include "util.h" @@ -28,9 +29,6 @@ #define MMU_P0_TIMEOUT 3000ul //timeout for P0 command: 3seconds #define MMU_MAX_RESEND_ATTEMPTS 2 -#ifdef MMU_HWRESET -#define MMU_RST_PIN 76 -#endif //MMU_HWRESET namespace { @@ -156,8 +154,8 @@ void mmu_init(void) _delay_ms(10); //wait 10ms for sure mmu_reset(); //reset mmu (HW or SW), do not wait for response mmu_state = S::Init; - PIN_INP(IR_SENSOR_PIN); //input mode - PIN_SET(IR_SENSOR_PIN); //pullup + SET_INPUT(IR_SENSOR_PIN); //input mode + WRITE(IR_SENSOR_PIN, 1); //pullup } //if IR_SENSOR defined, always returns true @@ -170,7 +168,7 @@ bool check_for_ir_sensor() bool detected = false; //if IR_SENSOR_PIN input is low and pat9125sensor is not present we detected idler sensor - if ((PIN_GET(IR_SENSOR_PIN) == 0) + if ((READ(IR_SENSOR_PIN) == 0) #ifdef PAT9125 && fsensor_not_responding #endif //PAT9125 @@ -363,7 +361,7 @@ void mmu_loop(void) case S::GetFinda: //response to command P0 if (mmu_idl_sens) { - if (PIN_GET(IR_SENSOR_PIN) == 0 && mmu_loading_flag) + if (READ(IR_SENSOR_PIN) == 0 && mmu_loading_flag) { #ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'A'\n")); @@ -406,7 +404,7 @@ void mmu_loop(void) case S::WaitCmd: //response to mmu commands if (mmu_idl_sens) { - if (PIN_GET(IR_SENSOR_PIN) == 0 && mmu_loading_flag) + if (READ(IR_SENSOR_PIN) == 0 && mmu_loading_flag) { DEBUG_PRINTF_P(PSTR("MMU <= 'A'\n")); mmu_puts_P(PSTR("A\n")); //send 'abort' request @@ -596,10 +594,10 @@ bool mmu_get_response(uint8_t move) mmu_loading_flag = true; if (can_extrude()) mmu_load_step(); //don't rely on "ok" signal from mmu unit; if filament detected by idler sensor during loading stop loading movements to prevent infinite loading - if (PIN_GET(IR_SENSOR_PIN) == 0) move = MMU_NO_MOVE; + if (READ(IR_SENSOR_PIN) == 0) move = MMU_NO_MOVE; break; case MMU_UNLOAD_MOVE: - if (PIN_GET(IR_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading + if (READ(IR_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading { if (can_extrude()) { @@ -617,7 +615,7 @@ bool mmu_get_response(uint8_t move) } break; case MMU_TCODE_MOVE: //first do unload and then continue with infinite loading movements - if (PIN_GET(IR_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first + if (READ(IR_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first { if (can_extrude()) { @@ -1460,7 +1458,7 @@ static bool can_load() current_position[E_AXIS] -= e_increment; plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE); st_synchronize(); - if(0 == PIN_GET(IR_SENSOR_PIN)) + if(0 == READ(IR_SENSOR_PIN)) { ++filament_detected_count; DEBUG_PUTCHAR('O'); @@ -1491,7 +1489,7 @@ static bool load_more() { for (uint8_t i = 0; i < MMU_IDLER_SENSOR_ATTEMPTS_NR; i++) { - if (PIN_GET(IR_SENSOR_PIN) == 0) return true; + if (READ(IR_SENSOR_PIN) == 0) return true; DEBUG_PRINTF_P(PSTR("Additional load attempt nr. %d\n"), i); mmu_command(MmuCmd::C0); manage_response(true, true, MMU_LOAD_MOVE); diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 14b562337..88713e6ac 100755 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -121,6 +121,8 @@ #define IR_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) +#define MMU_RST_PIN 76 + // Support for an 8 bit logic analyzer, for example the Saleae. // Channels 0-2 are fast, they could generate 2.667Mhz waveform with a software loop. #define LOGIC_ANALYZER_CH0 X_MIN_PIN // PB6 diff --git a/Firmware/swi2c.c b/Firmware/swi2c.c index 49fbc5efc..02cca2208 100644 --- a/Firmware/swi2c.c +++ b/Firmware/swi2c.c @@ -3,9 +3,10 @@ #include #include #include +#include "stdbool.h" #include "Configuration_prusa.h" #include "pins.h" -#include "io_atmega2560.h" +#include "fastio.h" #define SWI2C_RMSK 0x01 //read mask (bit0 = 1) @@ -21,75 +22,75 @@ void __delay(void) void swi2c_init(void) { - PIN_OUT(SWI2C_SDA); - PIN_OUT(SWI2C_SCL); - PIN_SET(SWI2C_SDA); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SDA, 1); + WRITE(SWI2C_SCL, 1); + SET_OUTPUT(SWI2C_SDA); + SET_OUTPUT(SWI2C_SCL); uint8_t i; for (i = 0; i < 100; i++) __delay(); } void swi2c_start(void) { - PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, 0); __delay(); - PIN_CLR(SWI2C_SCL); + WRITE(SWI2C_SCL, 0); __delay(); } void swi2c_stop(void) { - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - PIN_SET(SWI2C_SDA); + WRITE(SWI2C_SDA, 1); __delay(); } void swi2c_ack(void) { - PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, 0); __delay(); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - PIN_CLR(SWI2C_SCL); + WRITE(SWI2C_SCL, 0); __delay(); } uint8_t swi2c_wait_ack() { - PIN_INP(SWI2C_SDA); + SET_INPUT(SWI2C_SDA); __delay(); -// PIN_SET(SWI2C_SDA); +// WRITE(SWI2C_SDA, 1); __delay(); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); // __delay(); uint8_t ack = 0; uint16_t ackto = SWI2C_TMO; - while (!(ack = (PIN_GET(SWI2C_SDA)?0:1)) && ackto--) __delay(); - PIN_CLR(SWI2C_SCL); + while (!(ack = (!READ(SWI2C_SDA))) && ackto--) __delay(); + WRITE(SWI2C_SCL, 0); __delay(); - PIN_OUT(SWI2C_SDA); + SET_OUTPUT(SWI2C_SDA); __delay(); - PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, 0); __delay(); return ack; } uint8_t swi2c_read(void) { - PIN_SET(SWI2C_SDA); + WRITE(SWI2C_SDA, 1); __delay(); - PIN_INP(SWI2C_SDA); + SET_INPUT(SWI2C_SDA); uint8_t data = 0; int8_t bit; for (bit = 7; bit >= 0; bit--) { - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - data |= (PIN_GET(SWI2C_SDA)?1:0) << bit; - PIN_CLR(SWI2C_SCL); + data |= (READ(SWI2C_SDA)) << bit; + WRITE(SWI2C_SCL, 0); __delay(); } - PIN_OUT(SWI2C_SDA); + SET_OUTPUT(SWI2C_SDA); return data; } @@ -97,12 +98,11 @@ void swi2c_write(uint8_t data) { int8_t bit; for (bit = 7; bit >= 0; bit--) { - if (data & (1 << bit)) PIN_SET(SWI2C_SDA); - else PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, data & _BV(bit)); __delay(); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - PIN_CLR(SWI2C_SCL); + WRITE(SWI2C_SCL, 0); __delay(); } } diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 7c6b4ef0f..a866fa259 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -9,9 +9,6 @@ #include #include -#include "io_atmega2560.h" - -#define BEEPER 84 void timer0_init(void) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6f82db04c..e8031ea56 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -44,7 +44,6 @@ #include "mmu.h" #include "static_assert.h" -#include "io_atmega2560.h" #include "first_lay_cal.h" #include "fsensor.h" @@ -3999,7 +3998,7 @@ static void lcd_show_sensors_state() finda_state = mmu_finda; } if (ir_sensor_detected) { - idler_state = !PIN_GET(IR_SENSOR_PIN); + idler_state = !READ(IR_SENSOR_PIN); } lcd_puts_at_P(0, 0, _i("Sensor state")); lcd_puts_at_P(1, 1, _i("PINDA:")); @@ -8474,7 +8473,7 @@ static bool selftest_irsensor() mmu_load_step(false); while (blocks_queued()) { - if (PIN_GET(IR_SENSOR_PIN) == 0) + if (READ(IR_SENSOR_PIN) == 0) { lcd_selftest_error(TestError::TriggeringFsensor, "", ""); return false; diff --git a/Firmware/w25x20cl.c b/Firmware/w25x20cl.c index 79467cb6d..40d183f13 100644 --- a/Firmware/w25x20cl.c +++ b/Firmware/w25x20cl.c @@ -3,8 +3,8 @@ #include "w25x20cl.h" #include #include -#include "io_atmega2560.h" #include "spi.h" +#include "fastio.h" #define _MFRID 0xEF #define _DEVID 0x11 @@ -31,8 +31,8 @@ #define _CMD_JEDEC_ID 0x9f #define _CMD_RD_UID 0x4b -#define _CS_LOW() PORT(W25X20CL_PIN_CS) &= ~__MSK(W25X20CL_PIN_CS) -#define _CS_HIGH() PORT(W25X20CL_PIN_CS) |= __MSK(W25X20CL_PIN_CS) +#define _CS_LOW() WRITE(W25X20CL_PIN_CS, 0) +#define _CS_HIGH() WRITE(W25X20CL_PIN_CS, 1) //#define _SPI_TX swspi_tx //#define _SPI_RX swspi_rx @@ -45,8 +45,8 @@ int w25x20cl_mfrid_devid(void); int8_t w25x20cl_init(void) { - PIN_OUT(W25X20CL_PIN_CS); _CS_HIGH(); + SET_OUTPUT(W25X20CL_PIN_CS); W25X20CL_SPI_ENTER(); if (!w25x20cl_mfrid_devid()) return 0; return 1; From 44b1b1c2194a7f4cdd335515024812546186b258 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 11 Sep 2020 18:48:44 +0300 Subject: [PATCH 028/218] More macros --- Firmware/Configuration_adv.h | 2 +- Firmware/macros.h | 55 ++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 29f7e951e..b5ea3d229 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -379,7 +379,7 @@ const unsigned int dropsegments=5; //everything with less than this number of st /** * Include capabilities in M115 output */ -// #define EXTENDED_CAPABILITIES_REPORT +#define EXTENDED_CAPABILITIES_REPORT //=========================================================================== //============================= Define Defines ============================ diff --git a/Firmware/macros.h b/Firmware/macros.h index 4d421a273..95a737e1e 100644 --- a/Firmware/macros.h +++ b/Firmware/macros.h @@ -32,4 +32,59 @@ #define TBI(N,B) (N ^= _BV(B)) +// Macros to chain up to 12 conditions +#define _DO_1(W,C,A) (_##W##_1(A)) +#define _DO_2(W,C,A,B) (_##W##_1(A) C _##W##_1(B)) +#define _DO_3(W,C,A,V...) (_##W##_1(A) C _DO_2(W,C,V)) +#define _DO_4(W,C,A,V...) (_##W##_1(A) C _DO_3(W,C,V)) +#define _DO_5(W,C,A,V...) (_##W##_1(A) C _DO_4(W,C,V)) +#define _DO_6(W,C,A,V...) (_##W##_1(A) C _DO_5(W,C,V)) +#define _DO_7(W,C,A,V...) (_##W##_1(A) C _DO_6(W,C,V)) +#define _DO_8(W,C,A,V...) (_##W##_1(A) C _DO_7(W,C,V)) +#define _DO_9(W,C,A,V...) (_##W##_1(A) C _DO_8(W,C,V)) +#define _DO_10(W,C,A,V...) (_##W##_1(A) C _DO_9(W,C,V)) +#define _DO_11(W,C,A,V...) (_##W##_1(A) C _DO_10(W,C,V)) +#define _DO_12(W,C,A,V...) (_##W##_1(A) C _DO_11(W,C,V)) +#define __DO_N(W,C,N,V...) _DO_##N(W,C,V) +#define _DO_N(W,C,N,V...) __DO_N(W,C,N,V) +#define DO(W,C,V...) _DO_N(W,C,NUM_ARGS(V),V) + +// Macros to support option testing +#define _CAT(a,V...) a##V +#define CAT(a,V...) _CAT(a,V) + +#define _ISENA_ ~,1 +#define _ISENA_1 ~,1 +#define _ISENA_0x1 ~,1 +#define _ISENA_true ~,1 +#define _ISENA(V...) IS_PROBE(V) + +#define _ENA_1(O) _ISENA(CAT(_IS,CAT(ENA_, O))) +#define _DIS_1(O) NOT(_ENA_1(O)) +#define ENABLED(V...) DO(ENA,&&,V) +#define DISABLED(V...) DO(DIS,&&,V) + +#define TERN(O,A,B) _TERN(_ENA_1(O),B,A) // OPTION converted to '0' or '1' +#define TERN0(O,A) _TERN(_ENA_1(O),0,A) // OPTION converted to A or '0' +#define TERN1(O,A) _TERN(_ENA_1(O),1,A) // OPTION converted to A or '1' +#define TERN_(O,A) _TERN(_ENA_1(O),,A) // OPTION converted to A or '' +#define _TERN(E,V...) __TERN(_CAT(T_,E),V) // Prepend 'T_' to get 'T_0' or 'T_1' +#define __TERN(T,V...) ___TERN(_CAT(_NO,T),V) // Prepend '_NO' to get '_NOT_0' or '_NOT_1' +#define ___TERN(P,V...) THIRD(P,V) // If first argument has a comma, A. Else B. + + +// Use NUM_ARGS(__VA_ARGS__) to get the number of variadic arguments +#define _NUM_ARGS(_,Z,Y,X,W,V,U,T,S,R,Q,P,O,N,M,L,K,J,I,H,G,F,E,D,C,B,A,OUT,...) OUT +#define NUM_ARGS(V...) _NUM_ARGS(0,V,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0) + +// +// Primitives supporting precompiler REPEAT +// +#define FIRST(a,...) a +#define SECOND(a,b,...) b +#define THIRD(a,b,c,...) c + +#define IS_PROBE(V...) SECOND(V, 0) // Get the second item passed, or 0 +#define NOT(x) IS_PROBE(_CAT(_NOT_, x)) // NOT('0') gets '1'. Anything else gets '0'. + #endif //MACROS_H From c1582599707552bc6d2959354e84096561136411 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 11 Sep 2020 20:04:06 +0300 Subject: [PATCH 029/218] Remove unused where C++ alternative can be used --- Firmware/backlight.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index b59a65ef4..04128be8a 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -111,10 +111,10 @@ void backlight_init() #else //LCD_BL_PIN -void force_bl_on(_UNUSED bool section_start) {} +void force_bl_on(bool) {} void backlight_update() {} void backlight_init() {} void backlight_save() {} -void backlight_wake(_UNUSED const uint8_t flashNo) {} +void backlight_wake(const uint8_t) {} #endif //LCD_BL_PIN \ No newline at end of file From e2ef5af40e6e7f73ddb750f672282d13d085d416 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 15 Sep 2020 14:21:09 +0300 Subject: [PATCH 030/218] Add capability line --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f304c18b3..812cc3839 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3516,6 +3516,7 @@ static void cap_line(const char* name, bool ena = false) { static void extended_capabilities_report() { + cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES)); //@todo } #endif //EXTENDED_CAPABILITIES_REPORT From c0fced2f3cb7457fae78e1920d2ab373c5f16f4f Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 15 Sep 2020 14:21:21 +0300 Subject: [PATCH 031/218] Fix typo --- Firmware/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 812cc3839..f030f6897 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -403,7 +403,7 @@ static bool setTargetedHotend(int code, uint8_t &extruder); static void print_time_remaining_init(); static void wait_for_heater(long codenum, uint8_t extruder); static void gcode_G28(bool home_x_axis, bool home_y_axis, bool home_z_axis); -static void gcode_M115(uint8_t extruder); +static void gcode_M105(uint8_t extruder); static void temp_compensation_start(); static void temp_compensation_apply(); @@ -1735,7 +1735,7 @@ void host_keepalive() { { if (auto_report_temp_timer.expired(auto_report_temp_period * 1000ul)) { - gcode_M115(active_extruder); + gcode_M105(active_extruder); auto_report_temp_timer.start(); } } @@ -2544,7 +2544,7 @@ void force_high_power_mode(bool start_high_power_section) { } #endif //TMC2130 -void gcode_M115(uint8_t extruder) +void gcode_M105(uint8_t extruder) { #if defined(TEMP_0_PIN) && TEMP_0_PIN > -1 SERIAL_PROTOCOLPGM("T:"); @@ -6399,7 +6399,7 @@ Sigma_Exit: } SERIAL_PROTOCOLPGM("ok "); - gcode_M115(extruder); + gcode_M105(extruder); return; break; From 9fb6efc4355c618b91b2d22ce5c3f9259c26ff75 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 15 Sep 2020 14:56:41 +0200 Subject: [PATCH 032/218] Add newline at the end of file --- Firmware/backlight.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index 04128be8a..bc63d8e61 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -117,4 +117,4 @@ void backlight_init() {} void backlight_save() {} void backlight_wake(const uint8_t) {} -#endif //LCD_BL_PIN \ No newline at end of file +#endif //LCD_BL_PIN From 2f5083daa7cc1fb16de371e8d4214cda6711c8e1 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Sun, 13 Sep 2020 13:58:58 +0300 Subject: [PATCH 033/218] quickfix to mistake made in the experimental menu visibility code Fix indentation --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 737e25551..6989a6411 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5724,6 +5724,7 @@ void lcd_hw_setup_menu(void) // can not be "static" if (_md->status == 0 || lcd_draw_update) { + _md->status = 1; _md->experimental_menu_visibility = eeprom_read_byte((uint8_t *)EEPROM_EXPERIMENTAL_VISIBILITY); if (_md->experimental_menu_visibility == EEPROM_EMPTY_VALUE) { From bd7bb5acb337566cb25182391dfd3877dc1a262f Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 18 Sep 2020 16:50:25 +0200 Subject: [PATCH 034/218] Update new messages and their translations (#2835) * Add missing translations * Add missing CZ and IT translations * Update CZ, FR, IT, ES translations CZ thanks to @DRracer FR thanks to Carlin Dcustom ES tried myself IT thanks to @wavexx Only missing is PL * Improve wording +change keys * Add missing PL translations * Fix copy paste error in Italian fix double translations * Make PL translation shorter * Fix some length issues and capital letters * Fixed again translations length issues updated po files * Update FR translation - thanks @awenelo * Fix execution of lang-check.py - Make lang-check.py executable - Execute directly instead of specifying the python interpreter manually ("python" is no longer available on Debian, and would default to version 2 prior to that despite being written for python 3) * Fix permissions of translation files Co-authored-by: D.R.racer Co-authored-by: Yuri D'Elia --- Firmware/ultralcd.cpp | 2 +- lang/lang-build.sh | 4 +- lang/lang-check.py | 0 lang/lang_en.txt | 19 +- lang/lang_en_cz.txt | 24 ++- lang/lang_en_de.txt | 24 ++- lang/lang_en_es.txt | 24 ++- lang/lang_en_fr.txt | 24 ++- lang/lang_en_it.txt | 22 ++- lang/lang_en_pl.txt | 24 ++- lang/po/Firmware.pot | 409 +++++++++++++++++++++-------------------- lang/po/Firmware_cs.po | 409 +++++++++++++++++++++-------------------- lang/po/Firmware_de.po | 409 +++++++++++++++++++++-------------------- lang/po/Firmware_es.po | 409 +++++++++++++++++++++-------------------- lang/po/Firmware_fr.po | 409 +++++++++++++++++++++-------------------- lang/po/Firmware_it.po | 407 ++++++++++++++++++++-------------------- lang/po/Firmware_pl.po | 409 +++++++++++++++++++++-------------------- lang/po/new/cs.po | 409 +++++++++++++++++++++-------------------- lang/po/new/de.po | 409 +++++++++++++++++++++-------------------- lang/po/new/es.po | 409 +++++++++++++++++++++-------------------- lang/po/new/fr.po | 409 +++++++++++++++++++++-------------------- lang/po/new/it.po | 407 ++++++++++++++++++++-------------------- lang/po/new/pl.po | 409 +++++++++++++++++++++-------------------- 23 files changed, 2878 insertions(+), 2602 deletions(-) mode change 100644 => 100755 lang/lang-check.py mode change 100755 => 100644 lang/lang_en.txt mode change 100755 => 100644 lang/lang_en_cz.txt mode change 100755 => 100644 lang/lang_en_de.txt mode change 100755 => 100644 lang/lang_en_es.txt mode change 100755 => 100644 lang/lang_en_fr.txt mode change 100755 => 100644 lang/lang_en_it.txt mode change 100755 => 100644 lang/lang_en_pl.txt diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6989a6411..44c2dff77 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7583,7 +7583,7 @@ static void lcd_detect_IRsensor(){ lcd_show_fullscreen_message_and_wait_P(_i("Please unload the filament first, then repeat this action.")); return; } else { - lcd_show_fullscreen_message_and_wait_P(_i("Please check the IR sensor connections and filament is unloaded.")); + lcd_show_fullscreen_message_and_wait_P(_i("Please check the IR sensor connection, unload filament if present.")); bAction = lcd_selftest_IRsensor(true); } if(bAction){ diff --git a/lang/lang-build.sh b/lang/lang-build.sh index b8c2476eb..e9d46c055 100755 --- a/lang/lang-build.sh +++ b/lang/lang-build.sh @@ -5,7 +5,7 @@ # # Input files: # lang_en.txt or lang_en_xx.txt -# +# # Output files: # lang_xx.bin # @@ -82,7 +82,7 @@ generate_binary() rm -f lang_$1.dat LNG=$1 #check lang dictionary - /usr/bin/env python lang-check.py $1 --no-warning + ./lang-check.py $1 --no-warning #create lang_xx.tmp - different processing for 'en' language if [ "$1" = "en" ]; then #remove comments and empty lines diff --git a/lang/lang-check.py b/lang/lang-check.py old mode 100644 new mode 100755 diff --git a/lang/lang_en.txt b/lang/lang_en.txt old mode 100755 new mode 100644 index a209acfd6..469084d10 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,12 +1,21 @@ # "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -#MSG_03_OR_OLDER c=18 +#MSG_IR_03_OR_OLDER c=18 " 0.3 or older" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" +# c=18 +"FS v0.4 or newer" + +#MSG_IR_UNKNOWN c=18 +"unknown state" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" @@ -265,9 +274,6 @@ #MSG_FS_ACTION c=10 "FS Action" -# c=18 -"FS v0.4 or newer" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" @@ -670,6 +676,9 @@ # c=20 r=4 "Please unload the filament first, then repeat this action." +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." + #MSG_RECOVERING_PRINT c=20 "Recovering print " diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt old mode 100755 new mode 100644 index 4914bc800..f0b4f3522 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -2,14 +2,26 @@ "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" -#MSG_03_OR_OLDER c=18 +#MSG_IR_03_OR_OLDER c=18 " 0.3 or older" " 0.3 nebo starsi" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" +"FS 0.3 nebo starsi" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" " 0.4 nebo novejsi" +# c=18 +"FS v0.4 or newer" +"FS 0.4 a novejsi" + +#MSG_IR_UNKNOWN c=18 +"unknown state" +"neznamy stav" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" @@ -354,10 +366,6 @@ "FS Action" "FS reakce" -# c=18 -"FS v0.4 or newer" -"FS v0.4 a novejsi" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" "Soubor nekompletni. Pokracovat?" @@ -894,6 +902,10 @@ "Please unload the filament first, then repeat this action." "Prosim vyjmete filament a zopakujte tuto akci" +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." +"Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" + #MSG_RECOVERING_PRINT c=20 "Recovering print " "Obnovovani tisku " diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt old mode 100755 new mode 100644 index 25d3ae466..289fcba93 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -2,14 +2,26 @@ "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" -#MSG_03_OR_OLDER c=18 +#MSG_IR_03_OR_OLDER c=18 " 0.3 or older" " 0.3 oder aelter" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" +"FS 0.3 oder aelter" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" " 0.4 oder neuer" +# c=18 +"FS v0.4 or newer" +"FS 0.4 oder neuer" + +#MSG_IR_UNKNOWN c=18 +"unknown state" +"Status unbekannt" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " von 4" @@ -354,10 +366,6 @@ "FS Action" "FS Aktion" -# c=18 -"FS v0.4 or newer" -"FS v0.4 oder neuer" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" "Datei unvollstaendig Trotzdem fortfahren?" @@ -894,6 +902,10 @@ "Please unload the filament first, then repeat this action." "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." +"Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." + #MSG_RECOVERING_PRINT c=20 "Recovering print " "Druck wiederherst " diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt old mode 100755 new mode 100644 index 8404c5b3e..1bb0c968e --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -2,14 +2,26 @@ "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" -#MSG_03_OR_OLDER c=18 +#MSG_IR_03_OR_OLDER c=18 " 0.3 or older" " 0.3 o mayor" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" +"FS 0.3 o mayor" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" " 0.4 o mas nueva" +# c=18 +"FS v0.4 or newer" +"FS 0.4 o mas nueva" + +#MSG_IR_UNKNOWN c=18 +"unknown state" +"estado desconocido" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " de 4" @@ -354,10 +366,6 @@ "FS Action" "FS accion" -# c=18 -"FS v0.4 or newer" -"FS v0.4 o +nueva" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" "Archivo incompleto. ?Continuar de todos modos?" @@ -894,6 +902,10 @@ "Please unload the filament first, then repeat this action." "Primero descargue el filamento, luego repita esta accion." +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." +"Por favor comprueba la conexion del IR sensor y filamento esta descargado." + #MSG_RECOVERING_PRINT c=20 "Recovering print " "Recuper. impresion " diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt old mode 100755 new mode 100644 index bbd82522f..612c9756e --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -2,14 +2,26 @@ "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" -#MSG_03_OR_OLDER c=18 +#MSG_IR_03_OR_OLDER c=18 " 0.3 or older" " 0.3 ou +ancien" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" +"FS v0.3 ou +ancien" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" " 0.4 ou +recent" +# c=18 +"FS v0.4 or newer" +"FS v0.4 ou +recent" + +#MSG_IR_UNKNOWN c=18 +"unknown state" +"Etat inconnu" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " de 4" @@ -354,10 +366,6 @@ "FS Action" "\x00" -# c=18 -"FS v0.4 or newer" -"FS v0.4 ou +recent" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" "Fichier incomplet. Continuer qd meme?" @@ -894,6 +902,10 @@ "Please unload the filament first, then repeat this action." "SVP, dechargez le filament et reessayez." +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." +"SVP, verifiez la connexion du capteur IR et decharge le filament." + #MSG_RECOVERING_PRINT c=20 "Recovering print " "Recup. impression " diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt old mode 100755 new mode 100644 index 70b4bbc0f..8bf6ad409 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -6,10 +6,22 @@ " 0.3 or older" " 0.3 o inferiore" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" +"FS 0.3 o inferiore" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" " 0.4 o superiore" +# c=18 +"FS v0.4 or newer" +"FS 0.4 o superiore" + +#MSG_IR_UNKNOWN c=18 +"unknown state" +"stato sconosciuto" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " su 4" @@ -354,10 +366,6 @@ "FS Action" "Azione FS" -# c=18 -"FS v0.4 or newer" -"FS 0.4 o superiore" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" "File incompleto. Continuare comunque?" @@ -894,6 +902,10 @@ "Please unload the filament first, then repeat this action." "Scaricare prima il filamento, poi ripetere l'operazione." +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." +"Controllare il collegamento al sensore e rimuovere il filamento." + #MSG_RECOVERING_PRINT c=20 "Recovering print " "Recupero stampa " diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt old mode 100755 new mode 100644 index 62fd5d939..32027934e --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -2,14 +2,26 @@ "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" -#MSG_03_OR_OLDER c=18 +#MSG_IR_03_OR_OLDER c=18 " 0.3 or older" " 0.3 lub starszy" -#MSG_04_OR_NEWER c=18 +# c=18 +"FS v0.3 or older" +"FS 0.3 lub starszy" + +#MSG_IR_04_OR_NEWER c=18 " 0.4 or newer" " 0.4 lub nowszy" +# c=18 +"FS v0.4 or newer" +"FS 0.4 lub nowszy" + +#MSG_IR_UNKNOWN c=18 +"unknown state" +"Stan nieznany" + #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" @@ -354,10 +366,6 @@ "FS Action" "Akcja FS" -# c=18 -"FS v0.4 or newer" -"FS v0.4 lub nowszy" - #MSG_FILE_INCOMPLETE c=20 r=3 "File incomplete. Continue anyway?" "Plik niekompletny. Kontynowac?" @@ -894,6 +902,10 @@ "Please unload the filament first, then repeat this action." "Najpierw rozladuj filament, nastepnie powtorz czynnosc." +# c=20 r=4 +"Please check the IR sensor connection, unload filament if present." +"Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." + #MSG_RECOVERING_PRINT c=20 "Recovering print " "Wznawianie wydruku " diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 02dc7715a..bd92a7ecd 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: Wed May 13 17:40:37 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:40:37 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:22:18 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:22:18 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr "" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr "" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr "" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr "" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "" # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "" @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 msgid "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "" @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "" # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "" @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "" # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "" @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "" @@ -460,13 +475,8 @@ msgstr "" msgid "FS Action" msgstr "" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "" # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "" @@ -536,12 +546,12 @@ msgid "Heating" msgstr "" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "" # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "" @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "" @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "" @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "" @@ -821,7 +831,7 @@ msgid "High power" msgstr "" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "" # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "" @@ -871,7 +881,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "" @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "" @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 msgstr "" # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "" @@ -956,7 +966,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "" # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "" @@ -996,7 +1006,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "" @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "" @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "" # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "" # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "" # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "" # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "" +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "" + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "" @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "" @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" # MSG_STATISTICS -#: ultralcd.cpp:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "" # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "" # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "" # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "" # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "" @@ -1436,17 +1451,17 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "" # -#: ultralcd.cpp:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t msgstr "" # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1510 +#: Marlin_main.cpp:1525 msgid "Warning: both printer type and motherboard type changed." msgstr "" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "" @@ -1571,12 +1586,12 @@ msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3904 +#: ultralcd.cpp:3902 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "" # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "" # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "" @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "" # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index e1f8932ae..dda52924b 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: Wed May 13 17:41:02 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:41:02 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:22:53 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:22:53 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 nebo starsi" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 nebo starsi" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 a novejsi" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "neznamy stav" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Doladeni Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Vse OK " @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 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:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Zahrivani bedu" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Korekce podlozky" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test remenu " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Zrusit" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Barva neni cista" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Vypnout motory" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "Pokr." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Korekce E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Strihani filamentu" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "CHYBA:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Selhani MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "F. autozav." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Selhani" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Kontr. vent." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Filament nezaveden" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Senzor filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Spotrebovano filam." # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Cas tisku" @@ -460,13 +475,8 @@ msgstr "Cas tisku" msgid "FS Action" msgstr "FS reakce" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 a novejsi" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." @@ -491,12 +501,12 @@ 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:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Vymena ok?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Kontrola hotend " @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Kontrola osy Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Informace" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Vlozte filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Je filament zaveden?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Vlevo" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Korekce lin." @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Doladeni osy Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Cisteni barvy" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Zavest do trysky" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Merene zkoseni" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Mod" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Vys. vykon" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 pripojeno" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Posunout Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Zadna SD karta" @@ -871,7 +881,7 @@ msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Nezapojeno " @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Tryska" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Vent. trysky" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Pozastavit tisk" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "PID kalibrace" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Zkontrolujte :" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce restartovanim tiskarny." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." @@ -996,7 +1006,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Predehrev" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Tisk prerusen" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Predehrev k zavedeni" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Tiskovy vent." # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Prosim nejdriv zavedte filament" # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Vzadu [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyjmete filament a zopakujte tuto akci" +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Obnovovani tisku " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Pokracovat" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Vpravo [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Vpravo" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Chyba Selftestu!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Nastavte teplotu:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Stav senzoru" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Cas" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Tezke zkoseni:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Abeceda" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Trideni souboru" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Hlasity" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Lehke zkoseni:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Jednou" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Rychlost" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Toci se" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistika " @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Prohozene" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Zvolte filament:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Tepl. kal." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Teploty" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Ladit" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "k vyjmuti filamentu" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 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!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Zavest vse" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Korekce Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Zpet" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Kontrola" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falesne spusteni" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "HW nastaveni" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Mesh Bed Leveling" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detekovan na tiskarne MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "MMU mod" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Probiha zmena modu..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Predehrev ke strihu" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Prejmenovat" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Vybrat" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Senzor info" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Asist." # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Tiskove platy" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Korekce Z:" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 7745bde85..dc3c21284 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: Fri May 15 16:44:45 CEST 2020\n" -"PO-Revision-Date: Fri May 15 16:44:45 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:23:29 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:23:29 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 oder aelter" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 oder aelter" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 oder neuer" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "Status unbekannt" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Abbruch" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Alles richtig " @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "AutoLaden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 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:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Ausgleich Bett ok" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Riementest " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Abbruch" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Falsche Farbe" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Crash Erk." # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Motoren aus" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "E-Korrektur:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Schneide filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "FEHLER:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Extruder Info" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "MMU-Fehler" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "F. autoladen" # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Fehlerstatistik" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Luefter Chk." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert mit richtiger Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. nicht geladen" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Filamentsensor" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Druckzeit" @@ -460,13 +475,8 @@ msgstr "Druckzeit" msgid "FS Action" msgstr "FS Aktion" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 oder neuer" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 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." @@ -491,12 +501,12 @@ 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:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Wechsel ok?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Pruefe Duese " @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Pruefe Z Achse " @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Infoanzeige" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Filament einlegen" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Z einstellen" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Lade Farbe" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "In Druckduese laden" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Schraeglauf" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Modus" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-Firmware am MK3S-Drucker erkannt" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Hohe leist" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 verbunden" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Bewege Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Keine SD Karte" @@ -871,7 +881,7 @@ msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Duese" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 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:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Duesevent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Druck pausieren" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "PID Kalibrierung" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Bitte pruefe:" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Vorheizen" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Druck abgebrochen" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Heizen zum Laden" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Druckvent.:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Knopf druecken zum" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Druckvent." # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Bitte laden Sie zuerst das Filament." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Hinten [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Druck wiederherst " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "Ruecksetzen" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Druck fortsetzen" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Rechts [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Rechts" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Selbsttest Fehler!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Selbsttest Error " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 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:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Temp. einstellen:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Sensorstatus" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Zeit" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Schwer.Schr:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Sortiere Dateien" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Laut" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Leicht.Schr:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Einmal" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Geschwindigkeit" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Dreht sich" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistiken " @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Ausgetauscht" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Filament auswaehlen:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Temp Kalib." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Waehlen Sie die Temperatur, die zu Ihrem Material passt." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Sensor ueberprueft, entladen Sie jetzt das Filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperaturen" @@ -1436,17 +1451,17 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Feineinstellung" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "Filament laden" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "Filament entladen" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 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:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "Verzoegerung" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Alle laden" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Y-Korrektur:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Zurueck" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Kontrolle" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falschtriggerung" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "HW Einstellungen" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Gitter" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "MeshBett Ausgleich" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-Firmware auf MK3-Drucker erkannt" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "MMU Modus" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Moduswechsel erfolgt..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Umbenennen" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Auswahl" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Sensor Info" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Stahlbleche" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Z-Korrektur:" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 1fa12ab75..ce2fcdf3e 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: Wed May 13 17:41:49 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:41:49 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:24:02 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:24:02 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 o mayor" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 o mayor" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 o mas nueva" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "estado desconocido" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Cancelar" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Ajustar-Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Todo bien" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Carga auto. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Corr. de la cama" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test cinturon " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Cancelar" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Color no homogeneo" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Det. choque" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Apagar motores" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Corregir-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Corte de filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Vent.extrusor:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Info. del extrusor" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "Autocarg.fil." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Estadistica de fallos" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Comprob.vent" @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. no introducido" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Sensor de filamento" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Tiempo de imp.:" @@ -460,13 +475,8 @@ msgstr "Tiempo de imp.:" msgid "FS Action" msgstr "FS accion" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 o +nueva" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 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." @@ -491,12 +501,12 @@ 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:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Cambio correcto?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Control fusor" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Comprobando sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Control sensor Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Monitorizar" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Introducir filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Micropaso Eje Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Cambiando color" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Cargar a la boquilla" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Desviacion med:" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Modo" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detectado en impresora MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Rend.pleno" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 conectado" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Mover Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "No hay tarjeta SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "No hay conexion " @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Boquilla" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 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:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Vent. capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Pausar impresion" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Calibracion PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -956,7 +966,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Controla :" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Precalentar" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "Pausa" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Impresion cancelada" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Precalent. cargar" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Precalent. descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Vent.fusor:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Pulsa el dial" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Vent. extr" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Por favor, cargar primero el filamento. " # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Trasera [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descargue el filamento, luego repita esta accion." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Por favor comprueba la conexion del IR sensor y filamento esta descargado." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Recuper. impresion " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Reanudar impres." @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Continuan. impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Derecha [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Puerto RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Derecha" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Error Selftest !" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 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:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Establecer temp.:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Estado del sensor" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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. " @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Fecha" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Incl.severa:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Alfabet" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Ordenando archivos" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Alto" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Liger.incl.:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Una vez" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Velocidad" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Ventilador girando" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Estadisticas " @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Intercambiado" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Selecciona filamento:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Cal. temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Calibracion temperatura terminada. Haz clic para continuar." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retire el filamento ahora." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperaturas" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filamento total" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Tiempo total" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Ajustar" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "para descargar el filamento" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 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:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 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!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "Expirar" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Corregir-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Intr. todos fil." # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retire el filamento e intente nuevamente." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Corregir-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "atras" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Comprobaciones" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falsa activacion" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "FINDA:" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Configuracion HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Malla" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Nivelacion Malla Base" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectado en impresora MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Modo MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Cambio de modo progresando ..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Precalent. laminar" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Precalent. expulsar" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Renombrar" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Seleccionar" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info sensor" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Asistido" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Lamina de acero" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Corregir-Z:" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 7e7db4e8c..fd77f7afa 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: Wed May 13 17:42:13 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:42:13 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:24:37 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:24:37 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS v0.3 ou +ancien" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS v0.4 ou +recent" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "Etat inconnu" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "Offset point [0;0]" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Annuler" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Ajuster Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Tout est correct" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "et appuyez sur le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Autocharge du fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Corr. niveau plateau" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test de courroie " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impression?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Calibration Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Annuler" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Copier la langue choisie?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Detect.crash" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Date:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Correct-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Le fil. remonte" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire statique a ete ecrasee" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Je coupe filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "ERREUR:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Infos extrudeur" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "F. autocharg." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Stat. d'echec" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test du ventilateur" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Verif vent." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Filament non charge" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Capteur de filament" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Temps d'impression" @@ -460,13 +475,8 @@ msgstr "Temps d'impression" msgid "FS Action" msgstr "" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 ou +recent" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Ventilo impr avant?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Change correctement?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Verif. plateau chauf" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Verification butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Verif. du hotend" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Verification axe Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Ecran d'info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Inserez le filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Echecs derniere imp." # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Ventilo gauche?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Correction lin." @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Ajuster Z en dir." # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Charg. de la couleur" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Chargement du fil." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Charger la buse" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Rechauffage de la buse..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Deviat.mesuree" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detecte sur imprimante MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Haute puiss" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 connecte" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Deplacer Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Pas de carte SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Non connecte" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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 la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Buse" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Vent. buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Pause de l'impr." @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Calibration PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez plateau chauffant en acier et appuyez sur le bouton." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Verifiez:" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." @@ -996,7 +1006,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "Retirez la plaque en acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Prechauffage" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Impression annulee" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Chauffe pour charger" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Chauf.pour decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Vent. impr:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Impr. depuis la SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "App. sur sur bouton" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Vent. impr" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Arriere [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Recup. impression " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "Reinitialiser" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Reprendre impression" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Droite [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "FlshAir" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Droite" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du plateau chauffant" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Erreur auto-test!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Regler temp.:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Etat capteur" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Heure" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Deviat.sev.:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Tri des fichiers" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Fort" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Deviat.leg.:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Une fois" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Vitesse" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Tourne" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistiques" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Echange" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Selectionnez le filament:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Calib. Temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Echec de la calibration en temperature" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "" @@ -1436,17 +1451,17 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Regler" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "pour decharger fil." @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau chauffant" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t msgstr "Utilisez Remonter le fil. 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Attention: Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Attention: Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1571,12 +1586,12 @@ msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 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!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Charger un par un" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Correct-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Retour" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Verifications" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Faux declenchement" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "FINDA:" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Config HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "IR:" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detecte sur imprimante MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Mode MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Changement de mode en cours..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Chauffe pour couper" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Chauf. pour remonter" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Renommer" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Selectionner" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info capteur" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Plaques en acier" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Correct-Z:" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 1e8c36ac7..2c1a41d92 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: Fri May 15 18:16:31 CEST 2020\n" -"PO-Revision-Date: Fri May 15 18:16:31 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:25:10 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:25:10 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -25,11 +25,26 @@ msgstr "[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cCont msgid " 0.3 or older" msgstr " 0.3 o inferiore" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 o inferiore" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 o superiore" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 o superiore" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "stato sconosciuto" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Annulla" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Nessun errore" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 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:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Piano/Riscald." @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Riscald. piano" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Correz. liv.piano" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test cinghie " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare la stampa?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Annulla" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Colore non puro" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Rileva.crash" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Disabilita motori" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Correzione-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Espellendo filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Finec. fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e' stata sovrascritta" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Tagliando filam." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "ERRORE:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Ventola estr:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Info estrusore" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "Autocar.fil." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Stat. fallimenti" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Control.vent" @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso e con colore corretto?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. non caricato" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Sensore filam." # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Fil. utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Tempo di stampa" @@ -460,13 +475,8 @@ msgstr "Tempo di stampa" msgid "FS Action" msgstr "Azione FS" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 o superiore" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Cal. primo strato" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 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." @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvere il problema e premere il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Cambio corretto?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Verifica ugello" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Verifica asse Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Schermata info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Inserire filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Sinistra [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Correzione lineare" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Compensazione Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Caricando colore" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Carica ugello" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "Liv. grilia piano" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Deviazione mis" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Mod." # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 rilevato su stampante MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Forte" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 connessa" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Sposta Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Nessuna SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Non connesso" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Ugello" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Metti in pausa" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Calibrazione PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Verifica:" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Per favore consulta il nostro manuale per risolvere il problema. Poi riprendi il Wizard dopo aver riavviato la stampante." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Preriscalda" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "Pausa" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Stampa interrotta" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Preriscald. carico" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Preriscald. scarico" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Vent.stam:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Premere la manopola" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Ventola di stampa" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Per favore prima carica il filamento." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Retro [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Controllare il collegamento al sensore e rimuovere il filamento." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Recupero stampa " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Riprendi stampa" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Destra [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Porta RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Destra" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Autotest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Errore Autotest !" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Imposta temperatura" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Stato sensore" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Cron." # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Devia.grave:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Alfabeti" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Ordinando i file" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Forte" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Devia.lieve:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "Esaurim" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Singolo" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Velocita" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Gira" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistiche" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Scambiato" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Seleziona il filamento:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Calib. temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperature" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Tempo stampa totale" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Regola" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "per scaricare il filamento" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 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:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Caricare tutti" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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):" # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Correzione-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Indietro" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Controlli" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falso innesco" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Impostazioni HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Griglia" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Liv. griglia piano" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S rilevato su stampante MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Mod. MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Cambio modalita in corso ..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Preriscalda. taglio" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Preriscalda. espuls." @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "atteso livello %s" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Rinomina" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Seleziona" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info Sensore" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Assist." # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Piani d'acciaio" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Correzione-Z:" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index a086c4044..3de78e7f7 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: Fri May 15 18:16:57 CEST 2020\n" -"PO-Revision-Date: Fri May 15 18:16:57 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:25:45 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:25:45 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 lub starszy" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 lub starszy" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 lub nowszy" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "Stan nieznany" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Anuluj" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Ustawianie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Wszystko OK " @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Autoladowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 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:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Korekta stolu" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test paskow" @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Anuluj" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Wykr.zderzen" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "Kont." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Korekcja-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Obcinanie fil." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "BLAD:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "WentHotend:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Ekstruder - info" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Bledy MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "Autolad. fil." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Statystyki bledow" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Sprawd.went." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy,kolor jest ok?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Czujnik filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Czas druku" @@ -460,13 +475,8 @@ msgstr "Czas druku" msgid "FS Action" msgstr "Akcja FS" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 lub nowszy" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Wymiana ok?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Kontrola hotendu" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Kontrola czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Kontrola osi Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Ekran informacyjny" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Wprowadz filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Korekcja liniowa" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Ustaw. Live Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Zmierzony skos" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Tryb" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Wykryto firmware MK3 w drukarce MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Wysoka wyd." # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU podlaczone" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Ruch osi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Brak karty SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Nie podlaczono " @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Dysza" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "WentHotend" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Wstrzymanie wydruku" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Kalibracja PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -956,7 +966,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Sprawdz :" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Grzanie" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "Pauza" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Druk przerwany" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "WentWydruk:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Wcisnij pokretlo" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "WentWydruk" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Tyl [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Wznawianie wydruku " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Wznowic wydruk" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Prawo [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Prawa" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Selftest startuje" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Blad selftest!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Ustaw temperature:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Stan czujnikow" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Czas" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Znaczny skos:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Alfab" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Sortowanie plikow" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Glosny" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Lekki skos:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "Konce f" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "1-raz" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Predkosc" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Kreci sie" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statystyki" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Zamieniono" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Wybierz filament:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Kalib. temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperatury" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Zuzycie filamentu" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Laczny czas druku" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Strojenie" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "aby rozlad. filament" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "Wyl. czas." # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Korekcja-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Zalad. wszystkie" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Korekcja-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Wstecz" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Testy" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falszywy alarm" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Ustawienia HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Siatka" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Poziomowanie stolu" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Wykryto firmware MK3S w drukarce MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Tryb MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Trwa zmiana trybu..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "Oczekiwano wersji %s" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Zmien nazwe" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Wybierz" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info o sensorach" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Asyst." # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Plyty stalowe" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Korekcja-Z:" diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index e1f8932ae..dda52924b 100644 --- a/lang/po/new/cs.po +++ b/lang/po/new/cs.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: cs\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Wed May 13 17:41:02 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:41:02 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:22:53 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:22:53 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 nebo starsi" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 nebo starsi" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 a novejsi" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "neznamy stav" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Doladeni Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Vse OK " @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 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:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Zahrivani bedu" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Korekce podlozky" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test remenu " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Zrusit" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Barva neni cista" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Vypnout motory" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "Pokr." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Korekce E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Strihani filamentu" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "CHYBA:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Selhani MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "F. autozav." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Selhani" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Kontr. vent." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Filament nezaveden" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Senzor filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Spotrebovano filam." # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Cas tisku" @@ -460,13 +475,8 @@ msgstr "Cas tisku" msgid "FS Action" msgstr "FS reakce" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 a novejsi" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." @@ -491,12 +501,12 @@ 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:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Vymena ok?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Kontrola hotend " @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Kontrola osy Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Informace" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Vlozte filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Je filament zaveden?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Vlevo" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Korekce lin." @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Doladeni osy Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Cisteni barvy" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Zavest do trysky" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Merene zkoseni" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Mod" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Vys. vykon" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 pripojeno" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Posunout Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Zadna SD karta" @@ -871,7 +881,7 @@ msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Nezapojeno " @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Tryska" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Vent. trysky" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Pozastavit tisk" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "PID kalibrace" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Zkontrolujte :" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce restartovanim tiskarny." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Prosim otevrete idler a manualne odstrante filament." @@ -996,7 +1006,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Predehrev" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Tisk prerusen" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Predehrev k zavedeni" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Tiskovy vent." # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Prosim nejdriv zavedte filament" # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Vzadu [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyjmete filament a zopakujte tuto akci" +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Obnovovani tisku " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Pokracovat" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Vpravo [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Vpravo" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Chyba Selftestu!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Nastavte teplotu:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Stav senzoru" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Cas" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Tezke zkoseni:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Abeceda" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Trideni souboru" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Hlasity" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Lehke zkoseni:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Jednou" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Rychlost" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Toci se" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistika " @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Prohozene" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Zvolte filament:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Tepl. kal." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Teploty" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Ladit" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "k vyjmuti filamentu" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 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!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Zavest vse" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Korekce Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Zpet" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Kontrola" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falesne spusteni" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "HW nastaveni" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Mesh Bed Leveling" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detekovan na tiskarne MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "MMU mod" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Probiha zmena modu..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Predehrev ke strihu" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Prejmenovat" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Vybrat" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Senzor info" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Asist." # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Tiskove platy" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Korekce Z:" diff --git a/lang/po/new/de.po b/lang/po/new/de.po index 7745bde85..dc3c21284 100644 --- a/lang/po/new/de.po +++ b/lang/po/new/de.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri May 15 16:44:45 CEST 2020\n" -"PO-Revision-Date: Fri May 15 16:44:45 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:23:29 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:23:29 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 oder aelter" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 oder aelter" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 oder neuer" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "Status unbekannt" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Abbruch" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Alles richtig " @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "AutoLaden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 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:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Ausgleich Bett ok" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Riementest " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Abbruch" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Falsche Farbe" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Crash Erk." # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Motoren aus" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "E-Korrektur:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Schneide filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "FEHLER:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Extruder Info" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "MMU-Fehler" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "F. autoladen" # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Fehlerstatistik" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Luefter Chk." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert mit richtiger Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. nicht geladen" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Filamentsensor" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Druckzeit" @@ -460,13 +475,8 @@ msgstr "Druckzeit" msgid "FS Action" msgstr "FS Aktion" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 oder neuer" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 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." @@ -491,12 +501,12 @@ 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:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Wechsel ok?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Pruefe Duese " @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Pruefe Z Achse " @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Infoanzeige" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Filament einlegen" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Z einstellen" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Lade Farbe" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "In Druckduese laden" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Schraeglauf" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Modus" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-Firmware am MK3S-Drucker erkannt" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Hohe leist" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 verbunden" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Bewege Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Keine SD Karte" @@ -871,7 +881,7 @@ msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Duese" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 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:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Duesevent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Druck pausieren" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "PID Kalibrierung" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Bitte pruefe:" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen" @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Vorheizen" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Druck abgebrochen" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Heizen zum Laden" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Druckvent.:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Knopf druecken zum" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Druckvent." # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Bitte laden Sie zuerst das Filament." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Hinten [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Druck wiederherst " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "Ruecksetzen" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Druck fortsetzen" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Rechts [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Rechts" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Selbsttest Fehler!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Selbsttest Error " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 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:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Temp. einstellen:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Sensorstatus" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Zeit" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Schwer.Schr:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Sortiere Dateien" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Laut" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Leicht.Schr:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Einmal" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Geschwindigkeit" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Dreht sich" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistiken " @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Ausgetauscht" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Filament auswaehlen:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Temp Kalib." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Waehlen Sie die Temperatur, die zu Ihrem Material passt." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Sensor ueberprueft, entladen Sie jetzt das Filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperaturen" @@ -1436,17 +1451,17 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Feineinstellung" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "Filament laden" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "Filament entladen" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 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:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "Verzoegerung" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Alle laden" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Y-Korrektur:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Zurueck" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Kontrolle" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falschtriggerung" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "HW Einstellungen" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Gitter" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "MeshBett Ausgleich" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-Firmware auf MK3-Drucker erkannt" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "MMU Modus" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Moduswechsel erfolgt..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Umbenennen" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Auswahl" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Sensor Info" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Stahlbleche" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Z-Korrektur:" diff --git a/lang/po/new/es.po b/lang/po/new/es.po index 1fa12ab75..ce2fcdf3e 100644 --- a/lang/po/new/es.po +++ b/lang/po/new/es.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: es\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Wed May 13 17:41:49 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:41:49 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:24:02 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:24:02 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 o mayor" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 o mayor" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 o mas nueva" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "estado desconocido" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Cancelar" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Ajustar-Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Todo bien" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Carga auto. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Corr. de la cama" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test cinturon " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Cancelar" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Color no homogeneo" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Det. choque" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Apagar motores" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Corregir-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Corte de filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Vent.extrusor:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Info. del extrusor" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "Autocarg.fil." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Estadistica de fallos" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Comprob.vent" @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. no introducido" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Sensor de filamento" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Tiempo de imp.:" @@ -460,13 +475,8 @@ msgstr "Tiempo de imp.:" msgid "FS Action" msgstr "FS accion" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 o +nueva" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 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." @@ -491,12 +501,12 @@ 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:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Cambio correcto?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Control fusor" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Comprobando sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Control sensor Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Monitorizar" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Introducir filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Micropaso Eje Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Cambiando color" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Cargar a la boquilla" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Desviacion med:" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Modo" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detectado en impresora MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Rend.pleno" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 conectado" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Mover Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "No hay tarjeta SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "No hay conexion " @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Boquilla" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 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:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Vent. capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Pausar impresion" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Calibracion PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" @@ -956,7 +966,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Controla :" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente." @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Precalentar" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "Pausa" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Impresion cancelada" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Precalent. cargar" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Precalent. descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Vent.fusor:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Pulsa el dial" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Vent. extr" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Por favor, cargar primero el filamento. " # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Trasera [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descargue el filamento, luego repita esta accion." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Por favor comprueba la conexion del IR sensor y filamento esta descargado." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Recuper. impresion " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Reanudar impres." @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Continuan. impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Derecha [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Puerto RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Derecha" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Error Selftest !" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 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:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Establecer temp.:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Estado del sensor" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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. " @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Fecha" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Incl.severa:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Alfabet" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Ordenando archivos" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Alto" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Liger.incl.:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Una vez" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Velocidad" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Ventilador girando" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Estadisticas " @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Intercambiado" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Selecciona filamento:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Cal. temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Calibracion temperatura terminada. Haz clic para continuar." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retire el filamento ahora." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperaturas" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filamento total" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Tiempo total" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Ajustar" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "para descargar el filamento" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 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:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 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!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "Expirar" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Corregir-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Intr. todos fil." # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retire el filamento e intente nuevamente." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Corregir-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "atras" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Comprobaciones" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falsa activacion" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "FINDA:" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Configuracion HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Malla" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Nivelacion Malla Base" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectado en impresora MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Modo MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Cambio de modo progresando ..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Precalent. laminar" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Precalent. expulsar" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Renombrar" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Seleccionar" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info sensor" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Asistido" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Lamina de acero" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Corregir-Z:" diff --git a/lang/po/new/fr.po b/lang/po/new/fr.po index 7e7db4e8c..fdfd39174 100644 --- a/lang/po/new/fr.po +++ b/lang/po/new/fr.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Wed May 13 17:42:13 CEST 2020\n" -"PO-Revision-Date: Wed May 13 17:42:13 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:24:37 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:24:37 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS v0.3 ou +ancien" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS v0.4 ou +recent" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "Etat inconnu" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "Offset point [0;0]" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Annuler" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Ajuster Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Tout est correct" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "et appuyez sur le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Autocharge du fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Corr. niveau plateau" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test de courroie " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impression?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Calibration Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Annuler" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Couleur incorrecte" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Copier la langue choisie?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Detect.crash" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Date:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Correct-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Le fil. remonte" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire statique a ete ecrasee" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Je coupe filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "ERREUR:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Infos extrudeur" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "F. autocharg." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Stat. d'echec" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test du ventilateur" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Verif vent." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Filament non charge" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Capteur de filament" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Temps d'impression" @@ -460,13 +475,8 @@ msgstr "Temps d'impression" msgid "FS Action" msgstr "" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 ou +recent" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Ventilo impr avant?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Change correctement?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Verif. plateau chauf" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Verification butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Verif. du hotend" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Verification axe Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Ecran d'info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Inserez le filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Echecs derniere imp." # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Ventilo gauche?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Correction lin." @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Ajuster Z en dir." # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Charg. de la couleur" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Chargement du fil." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Charger la buse" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Rechauffage de la buse..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Deviat.mesuree" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detecte sur imprimante MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Haute puiss" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 connecte" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Deplacer Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Pas de carte SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Non connecte" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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 la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Buse" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Vent. buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Pause de l'impr." @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Calibration PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez plateau chauffant en acier et appuyez sur le bouton." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Verifiez:" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." @@ -996,7 +1006,7 @@ msgid "Please remove steel sheet from heatbed." msgstr "Retirez la plaque en acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Prechauffage" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Impression annulee" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Chauffe pour charger" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Chauf.pour decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Vent. impr:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Impr. depuis la SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "App. sur sur bouton" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Vent. impr" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Arriere [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "SVP, verifiez la connexion du capteur IR et si le filament est decharge." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Recup. impression " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "Reinitialiser" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Reprendre impression" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Droite [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "FlshAir" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Droite" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du plateau chauffant" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Erreur auto-test!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Regler temp.:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Etat capteur" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Heure" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Deviat.sev.:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Tri des fichiers" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Fort" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Deviat.leg.:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Une fois" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Vitesse" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Tourne" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistiques" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Echange" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Selectionnez le filament:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Calib. Temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Echec de la calibration en temperature" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "" @@ -1436,17 +1451,17 @@ msgid "There is still a need to make Z calibration. Please follow the manual, ch msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Regler" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "pour decharger fil." @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau chauffant" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t msgstr "Utilisez Remonter le fil. 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Attention: Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Attention: Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1571,12 +1586,12 @@ msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 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!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Charger un par un" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Correct-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Retour" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Verifications" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Faux declenchement" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "FINDA:" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Config HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "IR:" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detecte sur imprimante MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Mode MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Changement de mode en cours..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Chauffe pour couper" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Chauf. pour remonter" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Renommer" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Selectionner" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info capteur" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Plaques en acier" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Correct-Z:" diff --git a/lang/po/new/it.po b/lang/po/new/it.po index 1e8c36ac7..2c1a41d92 100644 --- a/lang/po/new/it.po +++ b/lang/po/new/it.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: it\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri May 15 18:16:31 CEST 2020\n" -"PO-Revision-Date: Fri May 15 18:16:31 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:25:10 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:25:10 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -25,11 +25,26 @@ msgstr "[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cCont msgid " 0.3 or older" msgstr " 0.3 o inferiore" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 o inferiore" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 o superiore" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 o superiore" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "stato sconosciuto" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Annulla" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Nessun errore" @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 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:2804 +#: ultralcd.cpp:2802 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Piano/Riscald." @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Riscald. piano" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Correz. liv.piano" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test cinghie " @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare la stampa?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Calibra XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Annulla" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Colore non puro" @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Rileva.crash" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Disabilita motori" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Correzione-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Espellendo filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Finec. fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e' stata sovrascritta" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Tagliando filam." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "ERRORE:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "Ventola estr:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Info estrusore" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "Autocar.fil." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Stat. fallimenti" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Control.vent" @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filamento estruso e con colore corretto?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. non caricato" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Sensore filam." # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Fil. utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Tempo di stampa" @@ -460,13 +475,8 @@ msgstr "Tempo di stampa" msgid "FS Action" msgstr "Azione FS" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 o superiore" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Cal. primo strato" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 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." @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvere il problema e premere il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Cambio corretto?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Verifica ugello" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Verifica asse Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Schermata info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Inserire filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Sinistra [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Correzione lineare" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Compensazione Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Caricando colore" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Carica ugello" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "Liv. grilia piano" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Deviazione mis" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Mod." # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 rilevato su stampante MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Forte" # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU2 connessa" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Sposta Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Nessuna SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Non connesso" @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Ugello" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Metti in pausa" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Calibrazione PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." @@ -956,7 +966,7 @@ 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:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Verifica:" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Per favore consulta il nostro manuale per risolvere il problema. Poi riprendi il Wizard dopo aver riavviato la stampante." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Aprire la guida filam. e rimuovere il filam. a mano" @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Preriscalda" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "Pausa" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Stampa interrotta" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Preriscald. carico" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Preriscald. scarico" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "Vent.stam:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Premere la manopola" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "Ventola di stampa" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Per favore prima carica il filamento." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Retro [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Controllare il collegamento al sensore e rimuovere il filamento." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Recupero stampa " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Riprendi stampa" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Destra [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Porta RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Destra" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Autotest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Errore Autotest !" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Imposta temperatura" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Stato sensore" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Cron." # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Devia.grave:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Alfabeti" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Ordinando i file" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Forte" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Devia.lieve:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "Esaurim" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "Singolo" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Velocita" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Gira" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statistiche" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Scambiato" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Seleziona il filamento:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Calib. temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperature" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Tempo stampa totale" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Regola" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "per scaricare il filamento" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 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:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Caricare tutti" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "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):" # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Correzione-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Indietro" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Controlli" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falso innesco" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Impostazioni HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Griglia" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Liv. griglia piano" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S rilevato su stampante MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Mod. MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Cambio modalita in corso ..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Preriscalda. taglio" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Preriscalda. espuls." @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "atteso livello %s" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Rinomina" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Seleziona" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info Sensore" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Assist." # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Piani d'acciaio" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Correzione-Z:" diff --git a/lang/po/new/pl.po b/lang/po/new/pl.po index a086c4044..3de78e7f7 100644 --- a/lang/po/new/pl.po +++ b/lang/po/new/pl.po @@ -7,8 +7,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" "Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri May 15 18:16:57 CEST 2020\n" -"PO-Revision-Date: Fri May 15 18:16:57 CEST 2020\n" +"POT-Creation-Date: Fri Sep 18 15:25:45 CEST 2020\n" +"PO-Revision-Date: Fri Sep 18 15:25:45 CEST 2020\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -20,16 +20,31 @@ msgstr "" msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" msgstr "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" -# MSG_03_OR_OLDER c=18 +# MSG_IR_03_OR_OLDER c=18 #: messages.c:144 msgid " 0.3 or older" msgstr " 0.3 lub starszy" -# MSG_04_OR_NEWER c=18 +# c=18 +#: Marlin_main.cpp:9463 +msgid "FS v0.3 or older" +msgstr "FS 0.3 lub starszy" + +# MSG_IR_04_OR_NEWER c=18 #: messages.c:143 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" +# c=18 +#: Marlin_main.cpp:9462 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 lub nowszy" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:145 +msgid "unknown state" +msgstr "Stan nieznany" + # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #: messages.c:36 msgid " of 4" @@ -41,7 +56,7 @@ msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3064 +#: ultralcd.cpp:3062 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" @@ -56,17 +71,17 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2460 +#: ultralcd.cpp:2451 msgid ">Cancel" msgstr ">Anuluj" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3184 +#: ultralcd.cpp:3182 msgid "Adjusting Z:" msgstr "Ustawianie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8677 +#: ultralcd.cpp:8704 msgid "All correct " msgstr "Wszystko OK " @@ -86,12 +101,12 @@ msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2609 +#: ultralcd.cpp:2607 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3506 +#: ultralcd.cpp:3504 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" @@ -106,32 +121,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6961 +#: ultralcd.cpp:6993 msgid "AutoLoad filament" msgstr "Autoladowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4445 +#: ultralcd.cpp:4441 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2804 +#: ultralcd.cpp:2802 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:8325 +#: ultralcd.cpp:8371 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8327 +#: ultralcd.cpp:8373 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8269 +#: ultralcd.cpp:8315 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -146,12 +161,12 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5861 +#: ultralcd.cpp:5889 msgid "Bed level correct" msgstr "Korekta stolu" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5841 +#: ultralcd.cpp:5869 msgid "Belt test " msgstr "Test paskow" @@ -186,12 +201,12 @@ msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:8679 +#: ultralcd.cpp:8706 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5850 +#: ultralcd.cpp:5878 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" @@ -201,12 +216,12 @@ msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4637 +#: ultralcd.cpp:4633 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -216,7 +231,7 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3469 +#: ultralcd.cpp:3467 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." @@ -231,17 +246,17 @@ msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4815 +#: ultralcd.cpp:4811 msgid "Cancel" msgstr "Anuluj" # MSG_SD_REMOVED -#: ultralcd.cpp:9090 +#: ultralcd.cpp:9142 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2709 +#: ultralcd.cpp:2707 msgid "Color not correct" msgstr "Kolor zanieczysz." @@ -251,7 +266,7 @@ msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4570 +#: ultralcd.cpp:4566 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" @@ -261,7 +276,7 @@ msgid "Crash det." msgstr "Wykr.zderzen" # -#: ultralcd.cpp:4950 +#: ultralcd.cpp:4946 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." @@ -271,7 +286,7 @@ msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:607 +#: Marlin_main.cpp:605 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" @@ -281,17 +296,17 @@ msgid "Crash" msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6002 +#: ultralcd.cpp:6033 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2163 +#: ultralcd.cpp:2164 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5743 +#: ultralcd.cpp:5769 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -306,12 +321,12 @@ msgid "Cont." msgstr "Kont." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5125 +#: ultralcd.cpp:5121 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=13 -#: ultralcd.cpp:5194 +#: ultralcd.cpp:5190 msgid "E-correct:" msgstr "Korekcja-E:" @@ -326,22 +341,22 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8293 +#: ultralcd.cpp:8339 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8287 +#: ultralcd.cpp:8333 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8275 +#: ultralcd.cpp:8321 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6998 +#: ultralcd.cpp:7030 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" @@ -361,7 +376,7 @@ msgid "Cutting filament" msgstr "Obcinanie fil." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4458 +#: ultralcd.cpp:4454 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." @@ -376,12 +391,12 @@ msgid "ERROR:" msgstr "BLAD:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8686 +#: ultralcd.cpp:8713 msgid "Extruder fan:" msgstr "WentHotend:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2201 msgid "Extruder info" msgstr "Ekstruder - info" @@ -391,7 +406,7 @@ msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:6985 +#: ultralcd.cpp:7017 msgid "Fail stats MMU" msgstr "Bledy MMU" @@ -401,7 +416,7 @@ msgid "F. autoload" msgstr "Autolad. fil." # -#: ultralcd.cpp:6982 +#: ultralcd.cpp:7014 msgid "Fail stats" msgstr "Statystyki bledow" @@ -416,7 +431,7 @@ msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK -#: ultralcd.cpp:5751 +#: ultralcd.cpp:5777 msgid "Fans check" msgstr "Sprawd.went." @@ -436,7 +451,7 @@ msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy,kolor jest ok?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2705 +#: ultralcd.cpp:2703 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" @@ -446,12 +461,12 @@ msgid "Filament sensor" msgstr "Czujnik filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2869 +#: ultralcd.cpp:2867 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2870 +#: ultralcd.cpp:2868 msgid "Print time" msgstr "Czas druku" @@ -460,13 +475,8 @@ msgstr "Czas druku" msgid "FS Action" msgstr "Akcja FS" -# c=18 -#: Marlin_main.cpp:9512 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 lub nowszy" - # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8814 +#: ultralcd.cpp:8841 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" @@ -481,7 +491,7 @@ msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5046 +#: ultralcd.cpp:5042 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." @@ -491,12 +501,12 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:7125 +#: ultralcd.cpp:7157 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2157 msgid "forum.prusa3d.com" msgstr "" @@ -506,22 +516,22 @@ msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3264 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8379 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8263 +#: ultralcd.cpp:8309 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9440 +#: Marlin_main.cpp:9453 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -536,12 +546,12 @@ msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5025 +#: ultralcd.cpp:5021 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:2157 +#: ultralcd.cpp:2158 msgid "howto.prusa3d.com" msgstr "" @@ -551,12 +561,12 @@ msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2620 +#: ultralcd.cpp:2618 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2697 +#: ultralcd.cpp:2695 msgid "Changed correctly?" msgstr "Wymiana ok?" @@ -566,12 +576,12 @@ msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8668 +#: ultralcd.cpp:8695 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8674 +#: ultralcd.cpp:8701 msgid "Checking hotend " msgstr "Kontrola hotendu" @@ -581,17 +591,17 @@ msgid "Checking sensors " msgstr "Kontrola czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7482 +#: ultralcd.cpp:7514 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7491 +#: ultralcd.cpp:7523 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8671 +#: ultralcd.cpp:8698 msgid "Checking Z axis " msgstr "Kontrola osi Z" @@ -611,12 +621,12 @@ msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5055 +#: ultralcd.cpp:5051 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:5063 +#: ultralcd.cpp:5059 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." @@ -626,12 +636,12 @@ msgid "Info screen" msgstr "Ekran informacyjny" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2605 +#: ultralcd.cpp:2603 msgid "Insert filament" msgstr "Wprowadz filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4835 +#: ultralcd.cpp:4831 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" @@ -646,7 +656,7 @@ msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:5133 +#: ultralcd.cpp:5129 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." @@ -661,17 +671,17 @@ msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2991 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3262 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5766 +#: ultralcd.cpp:5792 msgid "Lin. correction" msgstr "Korekcja liniowa" @@ -681,7 +691,7 @@ msgid "Live adjust Z" msgstr "Ustaw. Live Z" # c=20 r=6 -#: ultralcd.cpp:7527 +#: ultralcd.cpp:7559 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." @@ -691,7 +701,7 @@ msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2645 +#: ultralcd.cpp:2643 msgid "Loading color" msgstr "Czyszcz. koloru" @@ -701,12 +711,12 @@ msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8317 +#: ultralcd.cpp:8363 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6944 +#: ultralcd.cpp:6976 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" @@ -736,7 +746,7 @@ msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5856 +#: ultralcd.cpp:5884 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" @@ -751,7 +761,7 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:3032 msgid "Measured skew" msgstr "Zmierzony skos" @@ -781,7 +791,7 @@ msgid "Mode" msgstr "Tryb" # c=20 r=3 -#: Marlin_main.cpp:879 +#: Marlin_main.cpp:884 msgid "MK3 firmware detected on MK3S printer" msgstr "Wykryto firmware MK3 w drukarce MK3S" @@ -821,7 +831,7 @@ msgid "High power" msgstr "Wysoka wyd." # -#: ultralcd.cpp:2186 +#: ultralcd.cpp:2176 msgid "MMU2 connected" msgstr "MMU podlaczone" @@ -831,32 +841,32 @@ msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5741 +#: ultralcd.cpp:5767 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4361 +#: ultralcd.cpp:4357 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4362 +#: ultralcd.cpp:4358 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4363 +#: ultralcd.cpp:4359 msgid "Move Z" msgstr "Ruch osi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5541 +#: Marlin_main.cpp:5555 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6911 +#: ultralcd.cpp:6943 msgid "No SD card" msgstr "Brak karty SD" @@ -871,7 +881,7 @@ msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8265 +#: ultralcd.cpp:8311 msgid "Not connected" msgstr "Nie podlaczono " @@ -886,12 +896,12 @@ msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4942 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:5071 +#: ultralcd.cpp:5067 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." @@ -901,12 +911,12 @@ msgid "Nozzle" msgstr "Dysza" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1518 +#: Marlin_main.cpp:1533 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:5062 +#: ultralcd.cpp:5058 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." @@ -916,7 +926,7 @@ msgid "Nozzle FAN" msgstr "WentHotend" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6875 +#: ultralcd.cpp:6907 msgid "Pause print" msgstr "Wstrzymanie wydruku" @@ -931,7 +941,7 @@ msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5890 msgid "PID calibration" msgstr "Kalibracja PID" @@ -946,7 +956,7 @@ msgid "Place a sheet of paper under the nozzle during the calibration of first 4 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:5128 +#: ultralcd.cpp:5124 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." @@ -956,7 +966,7 @@ msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8257 +#: ultralcd.cpp:8303 msgid "Please check :" msgstr "Sprawdz :" @@ -966,7 +976,7 @@ msgid "Please check our handbook and fix the problem. Then resume the Wizard by msgstr "Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3138 +#: Marlin_main.cpp:3152 msgid "Please open idler and remove filament manually." msgstr "Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." @@ -996,7 +1006,7 @@ 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:4583 +#: Marlin_main.cpp:4601 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" @@ -1011,7 +1021,7 @@ msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:5061 +#: ultralcd.cpp:5057 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" @@ -1021,7 +1031,7 @@ msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6853 +#: ultralcd.cpp:6885 msgid "Preheat" msgstr "Grzanie" @@ -1041,12 +1051,12 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11526 +#: Marlin_main.cpp:11556 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:710 +#: fsensor.cpp:730 msgid "Pause" msgstr "Pauza" @@ -1061,17 +1071,17 @@ msgid "Print aborted" msgstr "Druk przerwany" # c=20 -#: ultralcd.cpp:2442 +#: ultralcd.cpp:2433 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" # c=20 -#: ultralcd.cpp:2446 +#: ultralcd.cpp:2437 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8689 +#: ultralcd.cpp:8716 msgid "Print fan:" msgstr "WentWydruk:" @@ -1081,7 +1091,7 @@ msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2289 +#: ultralcd.cpp:2280 msgid "Press the knob" msgstr "Wcisnij pokretlo" @@ -1106,37 +1116,42 @@ msgid "Print FAN" msgstr "WentWydruk" # -#: ultralcd.cpp:4926 +#: ultralcd.cpp:4922 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4921 +#: ultralcd.cpp:4917 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4843 +#: ultralcd.cpp:4839 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." # MSG_PRUSA3D -#: ultralcd.cpp:2155 +#: ultralcd.cpp:2156 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3267 +#: ultralcd.cpp:3265 msgid "Rear side [um]" msgstr "Tyl [um]" # c=20 r=4 -#: ultralcd.cpp:7549 +#: ultralcd.cpp:7583 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." +# c=20 r=4 +#: ultralcd.cpp:7586 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." + # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10883 +#: Marlin_main.cpp:10913 msgid "Recovering print " msgstr "Wznawianie wydruku " @@ -1151,17 +1166,17 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5867 +#: ultralcd.cpp:5895 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3268 +#: ultralcd.cpp:3266 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6861 +#: ultralcd.cpp:6893 msgid "Resume print" msgstr "Wznowic wydruk" @@ -1171,7 +1186,7 @@ msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3263 msgid "Right side[um]" msgstr "Prawo [um]" @@ -1181,7 +1196,7 @@ msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4860 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?" @@ -1196,7 +1211,7 @@ msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2994 +#: ultralcd.cpp:2992 msgid "Right" msgstr "Prawa" @@ -1206,27 +1221,27 @@ msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5779 +#: ultralcd.cpp:5807 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7812 +#: ultralcd.cpp:7858 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7582 +#: ultralcd.cpp:7626 msgid "Self test start " msgstr "Selftest startuje" # MSG_SELFTEST -#: ultralcd.cpp:5843 +#: ultralcd.cpp:5871 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8255 +#: ultralcd.cpp:8301 msgid "Selftest error !" msgstr "Blad selftest!" @@ -1236,17 +1251,17 @@ msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1550 +#: Marlin_main.cpp:1565 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:5102 +#: ultralcd.cpp:5098 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3286 +#: ultralcd.cpp:3284 msgid "Set temperature:" msgstr "Ustaw temperature:" @@ -1271,17 +1286,17 @@ msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5864 +#: ultralcd.cpp:5892 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:4008 +#: ultralcd.cpp:4004 msgid "Sensor state" msgstr "Stan czujnikow" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:738 +#: cardreader.cpp:736 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." @@ -1301,7 +1316,7 @@ msgid "Time" msgstr "Czas" # -#: ultralcd.cpp:3037 +#: ultralcd.cpp:3035 msgid "Severe skew:" msgstr "Znaczny skos:" @@ -1311,7 +1326,7 @@ msgid "Alphabet" msgstr "Alfab" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:745 +#: cardreader.cpp:743 msgid "Sorting files" msgstr "Sortowanie plikow" @@ -1321,7 +1336,7 @@ msgid "Loud" msgstr "Glosny" # -#: ultralcd.cpp:3036 +#: ultralcd.cpp:3034 msgid "Slight skew:" msgstr "Lekki skos:" @@ -1336,7 +1351,7 @@ msgid "Runouts" msgstr "Konce f" # -#: Marlin_main.cpp:5101 +#: Marlin_main.cpp:5115 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." @@ -1346,7 +1361,7 @@ msgid "Once" msgstr "1-raz" # MSG_SPEED -#: ultralcd.cpp:7119 +#: ultralcd.cpp:7151 msgid "Speed" msgstr "Predkosc" @@ -1356,12 +1371,12 @@ msgid "Spinning" msgstr "Kreci sie" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4596 +#: Marlin_main.cpp:4614 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:6978 +#: ultralcd.cpp:7010 msgid "Statistics " msgstr "Statystyki" @@ -1376,17 +1391,17 @@ msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6987 +#: ultralcd.cpp:7019 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8335 +#: ultralcd.cpp:8381 msgid "Swapped" msgstr "Zamieniono" # -#: ultralcd.cpp:4814 +#: ultralcd.cpp:4810 msgid "Select filament:" msgstr "Wybierz filament:" @@ -1396,17 +1411,17 @@ msgid "Temp. cal." msgstr "Kalib. temp." # -#: ultralcd.cpp:4955 +#: ultralcd.cpp:4951 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5873 +#: ultralcd.cpp:5903 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3933 +#: ultralcd.cpp:3930 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" @@ -1416,17 +1431,17 @@ msgid "Temperature calibration is finished and active. Temp. calibration can be msgstr "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." # c=20 r=3 -#: ultralcd.cpp:7554 +#: ultralcd.cpp:7590 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5739 +#: ultralcd.cpp:5765 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2218 +#: ultralcd.cpp:2208 msgid "Temperatures" msgstr "Temperatury" @@ -1436,17 +1451,17 @@ 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:2891 +#: ultralcd.cpp:2889 msgid "Total filament" msgstr "Zuzycie filamentu" # -#: ultralcd.cpp:2892 +#: ultralcd.cpp:2890 msgid "Total print time" msgstr "Laczny czas druku" # MSG_TUNE -#: ultralcd.cpp:6850 +#: ultralcd.cpp:6882 msgid "Tune" msgstr "Strojenie" @@ -1461,12 +1476,12 @@ msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2296 +#: ultralcd.cpp:2287 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2300 +#: ultralcd.cpp:2291 msgid "to unload filament" msgstr "aby rozlad. filament" @@ -1486,32 +1501,32 @@ msgid "Total" msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6001 +#: ultralcd.cpp:6032 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2221 +#: ultralcd.cpp:2211 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2194 +#: ultralcd.cpp:2184 msgid "unknown" msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:5511 +#: Marlin_main.cpp:5525 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3432 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3395 +#: ultralcd.cpp:3393 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" @@ -1521,22 +1536,22 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1510 +#: Marlin_main.cpp:1525 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:1502 +#: Marlin_main.cpp:1517 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1506 +#: Marlin_main.cpp:1521 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3128 +#: Marlin_main.cpp:3142 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" @@ -1546,12 +1561,12 @@ msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5834 +#: ultralcd.cpp:5862 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2210 +#: ultralcd.cpp:2200 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1571,12 +1586,12 @@ 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:3904 +#: ultralcd.cpp:3902 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:3901 +#: ultralcd.cpp:3899 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" @@ -1586,62 +1601,62 @@ msgid "Timeout" msgstr "Wyl. czas." # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5186 msgid "X-correct:" msgstr "Korekcja-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3898 +#: ultralcd.cpp:3896 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:3882 +#: ultralcd.cpp:3880 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:3885 +#: ultralcd.cpp:3883 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6261 +#: ultralcd.cpp:6292 msgid "Load all" msgstr "Zalad. wszystkie" # -#: ultralcd.cpp:3864 +#: ultralcd.cpp:3862 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3870 +#: ultralcd.cpp:3868 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3873 +#: ultralcd.cpp:3871 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2989 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:4958 +#: ultralcd.cpp:4954 msgid "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)." msgstr "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." # c=20 r=5 -#: ultralcd.cpp:7558 +#: ultralcd.cpp:7594 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5191 +#: ultralcd.cpp:5187 msgid "Y-correct:" msgstr "Korekcja-Y:" @@ -1661,17 +1676,17 @@ msgid "Back" msgstr "Wstecz" # -#: ultralcd.cpp:5724 +#: ultralcd.cpp:5742 msgid "Checks" msgstr "Testy" # -#: ultralcd.cpp:8349 +#: ultralcd.cpp:8395 msgid "False triggering" msgstr "Falszywy alarm" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:4009 msgid "FINDA:" msgstr "" @@ -1696,7 +1711,7 @@ msgid "HW Setup" msgstr "Ustawienia HW" # -#: ultralcd.cpp:4017 +#: ultralcd.cpp:4013 msgid "IR:" msgstr "" @@ -1711,12 +1726,12 @@ msgid "Mesh" msgstr "Siatka" # -#: ultralcd.cpp:5763 +#: ultralcd.cpp:5789 msgid "Mesh bed leveling" msgstr "Poziomowanie stolu" # -#: Marlin_main.cpp:872 +#: Marlin_main.cpp:877 msgid "MK3S firmware detected on MK3 printer" msgstr "Wykryto firmware MK3S w drukarce MK3" @@ -1726,7 +1741,7 @@ msgid "MMU Mode" msgstr "Tryb MMU" # -#: ultralcd.cpp:4494 +#: ultralcd.cpp:4490 msgid "Mode change in progress ..." msgstr "Trwa zmiana trybu..." @@ -1771,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:4005 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2452 +#: ultralcd.cpp:2443 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" # c=20 -#: ultralcd.cpp:2449 +#: ultralcd.cpp:2440 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" @@ -1796,22 +1811,22 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." # c=20 -#: ultralcd.cpp:8355 +#: ultralcd.cpp:8401 msgid "%s level expected" msgstr "Oczekiwano wersji %s" # -#: ultralcd.cpp:6814 +#: ultralcd.cpp:6846 msgid "Rename" msgstr "Zmien nazwe" # -#: ultralcd.cpp:6807 +#: ultralcd.cpp:6839 msgid "Select" msgstr "Wybierz" # -#: ultralcd.cpp:2212 +#: ultralcd.cpp:2202 msgid "Sensor info" msgstr "Info o sensorach" @@ -1826,12 +1841,12 @@ msgid "Assist" msgstr "Asyst." # c=18 -#: ultralcd.cpp:5722 +#: ultralcd.cpp:5740 msgid "Steel sheets" msgstr "Plyty stalowe" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5192 +#: ultralcd.cpp:5188 msgid "Z-correct:" msgstr "Korekcja-Z:" From 72784583162239119ac557872b9daf5cfe63a1e9 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 18 Sep 2020 16:59:22 +0200 Subject: [PATCH 035/218] Version changed (3.9.1 build 3518) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index d94d846bf..a9bf23e99 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.9.1-RC1" -#define FW_COMMIT_NR 3512 +#define FW_VERSION "3.9.1" +#define FW_COMMIT_NR 3518 // 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 From d9fa44c142db83014c6186483b3d76578f1f10b1 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 23 Sep 2020 09:14:35 +0300 Subject: [PATCH 036/218] Document M155 command --- Firmware/Marlin_main.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f030f6897..dd6dd78b1 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3613,6 +3613,7 @@ extern uint8_t st_backlash_y; //!@n M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil) //!@n M140 - Set bed target temp //!@n M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work. +//!@n M155 - Automatically send temperatures //!@n M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating //! Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling //!@n M200 D- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). @@ -6406,6 +6407,17 @@ Sigma_Exit: } #ifdef AUTO_REPORT_TEMPERATURES + /*! + ### M155 - Automatically send temperatures M155: Automatically send temperatures + #### Usage + + M155 [ S ] + + #### Parameters + + - `S` - Set temperature autoreporting interval in seconds. 0 to disable. Maximum: 255 + + */ case 155: { if (code_seen('S')) From 6d476d71447e707df2ee5b3c367a650235357f9b Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 27 Sep 2020 14:29:07 +0200 Subject: [PATCH 037/218] Still use SWI2C on RAMBo10a boards The wiring for the PAT9125 on RAMBo10a boards is not directly connected to the SCL pin and requires the sw mode. Detect this requirement by checking the definition for the SWI2C_SCL pin in the board definition. Remove SWI2C_SCL/SDA from the other boards to use the HW mode. --- Firmware/config.h | 5 ++++- Firmware/pins_Einsy_1_0.h | 6 ------ Firmware/pins_Rambo_1_3.h | 3 --- Firmware/swi2c.c | 3 +++ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Firmware/config.h b/Firmware/config.h index c64bd441e..922a53989 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -31,8 +31,11 @@ //PAT9125 configuration //#define PAT9125_SWSPI // software SPI mode (incomplete) -//#define PAT9125_SWI2C // software I2C mode +#ifdef SWI2C_SCL +#define PAT9125_SWI2C // software I2C mode +#else #define PAT9125_I2C // hardware I2C mode +#endif #define PAT9125_I2C_ADDR 0x75 //ID=LO //#define PAT9125_I2C_ADDR 0x79 //ID=HI diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 14b562337..21578ebd0 100755 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -18,12 +18,6 @@ #define W25X20CL // external 256kB flash #define BOOTAPP // bootloader support - -#define SWI2C_SDA 20 //SDA on P3 -#define SWI2C_SCL 21 //SCL on P3 - - - #define X_TMC2130_CS 41 #define X_TMC2130_DIAG 64 // !!! changed from 40 (EINY03) #define X_STEP_PIN 37 diff --git a/Firmware/pins_Rambo_1_3.h b/Firmware/pins_Rambo_1_3.h index 538fb4f35..522ad28f8 100644 --- a/Firmware/pins_Rambo_1_3.h +++ b/Firmware/pins_Rambo_1_3.h @@ -11,9 +11,6 @@ #define PINDA_THERMISTOR -#define SWI2C_SDA 20 //SDA on P3 -#define SWI2C_SCL 21 //SCL on P3 - #ifdef MICROMETER_LOGGING #define D_DATACLOCK 24 //Y_MAX (green) #define D_DATA 30 //X_MAX (blue) diff --git a/Firmware/swi2c.c b/Firmware/swi2c.c index 49fbc5efc..62a28e1a9 100644 --- a/Firmware/swi2c.c +++ b/Firmware/swi2c.c @@ -7,6 +7,7 @@ #include "pins.h" #include "io_atmega2560.h" +#ifdef SWI2C_SCL #define SWI2C_RMSK 0x01 //read mask (bit0 = 1) #define SWI2C_WMSK 0x00 //write mask (bit0 = 0) @@ -187,3 +188,5 @@ uint8_t swi2c_writeByte_A16(uint8_t dev_addr, unsigned short addr, uint8_t* pbyt } #endif //SWI2C_A16 + +#endif //SWI2C_SCL From 384f40956c4292c33ec087e90f9dfa6da5383800 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sun, 27 Sep 2020 16:42:20 +0200 Subject: [PATCH 038/218] Remove obsolete cbi/sbi --- Firmware/twi.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Firmware/twi.c b/Firmware/twi.c index 11c708aa7..f8c077abb 100644 --- a/Firmware/twi.c +++ b/Firmware/twi.c @@ -22,14 +22,6 @@ #include #include "Arduino.h" // for digitalWrite -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif - -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - #include "twi.h" @@ -40,8 +32,7 @@ void twi_init(void) digitalWrite(SCL, 1); // initialize twi prescaler and bit rate - cbi(TWSR, TWPS0); - cbi(TWSR, TWPS1); + TWSR &= ~(_BV(TWPS0) | _BV(TWPS1)); TWBR = ((F_CPU / TWI_FREQ) - 16) / 2; /* twi bit rate formula from atmega128 manual pg 204 From c2e8d229a751df2451fd49915c55b4d3ba3f52c7 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 28 Sep 2020 20:21:07 +0200 Subject: [PATCH 039/218] Be more compliant in the I2C protocol - Enter a repeated-start for reading data - Write in the same session --- Firmware/pat9125.c | 6 +-- Firmware/twi.c | 110 +++++++++++++++++++++++++++++---------------- Firmware/twi.h | 20 ++++++--- 3 files changed, 89 insertions(+), 47 deletions(-) diff --git a/Firmware/pat9125.c b/Firmware/pat9125.c index f47d676bb..c6ffecf3c 100644 --- a/Firmware/pat9125.c +++ b/Firmware/pat9125.c @@ -263,8 +263,7 @@ uint8_t pat9125_rd_reg(uint8_t addr) if (!swi2c_readByte_A8(PAT9125_I2C_ADDR, addr, &data)) //NO ACK error goto error; #elif defined(PAT9125_I2C) - if (twi_rw8(PAT9125_I2C_ADDR,TW_WRITE,&addr) || - twi_rw8(PAT9125_I2C_ADDR,TW_READ,&data)) + if (twi_r8(PAT9125_I2C_ADDR,addr,&data)) goto error; #endif return data; @@ -286,8 +285,7 @@ void pat9125_wr_reg(uint8_t addr, uint8_t data) if (!swi2c_writeByte_A8(PAT9125_I2C_ADDR, addr, &data)) //NO ACK error goto error; #elif defined(PAT9125_I2C) - if (twi_rw8(PAT9125_I2C_ADDR,TW_WRITE,&addr) || - twi_rw8(PAT9125_I2C_ADDR,TW_READ,&data)) + if (twi_w8(PAT9125_I2C_ADDR,addr,data)) goto error; #endif return; diff --git a/Firmware/twi.c b/Firmware/twi.c index f8c077abb..6dd1645c0 100644 --- a/Firmware/twi.c +++ b/Firmware/twi.c @@ -48,55 +48,89 @@ void twi_disable(void) digitalWrite(SCL, 0); } -static void twi_wait() + +static void twi_stop() { - while(!(TWCR & _BV(TWINT))); + TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTO); } -uint8_t twi_rw8(uint8_t address, uint8_t mode, uint8_t* data) + +static uint8_t twi_wait(uint8_t status) +{ + while(!(TWCR & _BV(TWINT))); + if(TW_STATUS != status) + { + twi_stop(); + return 1; + } + return 0; +} + + +static uint8_t twi_start(uint8_t address, uint8_t reg) { // send start condition TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTA); - twi_wait(); - if(TW_STATUS != TW_START) + if(twi_wait(TW_START)) return 1; // send address - TWDR = mode; - TWDR |= (address << 1); + TWDR = TW_WRITE | (address << 1); TWCR = _BV(TWEN) | _BV(TWINT); - twi_wait(); + if(twi_wait(TW_MT_SLA_ACK)) + return 2; - if(mode == TW_WRITE) - { - if(TW_STATUS != TW_MT_SLA_ACK) - return 2; - - // send data - TWDR = *data; - TWCR = _BV(TWEN) | _BV(TWINT); - twi_wait(); - if(TW_STATUS != TW_MT_DATA_ACK) - return 3; - } - else - { - if(TW_STATUS != TW_MR_SLA_ACK) - return 2; - - // receive data - TWCR = _BV(TWEN) | _BV(TWINT); - twi_wait(); - - // accept ACK or NACK (since only 1 byte is read) - if(!(TW_STATUS & TW_MR_DATA_ACK)) - return 3; - - *data = TWDR; - } - - // send stop - TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTO); + // send register + TWDR = reg; + TWCR = _BV(TWEN) | _BV(TWINT); + if(twi_wait(TW_MT_DATA_ACK)) + return 3; return 0; } + + +uint8_t twi_r8(uint8_t address, uint8_t reg, uint8_t* data) +{ + if(twi_start(address, reg)) + return 1; + + // repeat start + TWCR = _BV(TWEN) | _BV(TWINT) | _BV(TWSTA); + if(twi_wait(TW_REP_START)) + return 2; + + // start receiving + TWDR = TW_READ | (address << 1); + TWCR = _BV(TWEN) | _BV(TWINT); + if(twi_wait(TW_MR_SLA_ACK)) + return 3; + + // receive data + TWCR = _BV(TWEN) | _BV(TWINT); + if(twi_wait(TW_MR_DATA_NACK)) + return 4; + + *data = TWDR; + + // send stop + twi_stop(); + return 0; +} + + +uint8_t twi_w8(uint8_t address, uint8_t reg, uint8_t data) +{ + if(twi_start(address, reg)) + return 1; + + // send data + TWDR = data; + TWCR = _BV(TWEN) | _BV(TWINT); + if(twi_wait(TW_MT_DATA_ACK)) + return 2; + + // send stop + twi_stop(); + return 0; +} diff --git a/Firmware/twi.h b/Firmware/twi.h index abcb8e975..bdb617fcb 100644 --- a/Firmware/twi.h +++ b/Firmware/twi.h @@ -43,11 +43,21 @@ void twi_init(void); void twi_disable(void); /* - * Function twi_rw8 - * Desc read/write a single byte from a device + * Function twi_r8 + * Desc read a single byte from a device * Input address: 7bit i2c device address - * mode: TW_READ or TW_WRITE - * data: pointer to byte + * reg: register address + * data: pointer to byte for result * Output 0 on success */ -uint8_t twi_rw8(uint8_t address, uint8_t mode, uint8_t* data); +uint8_t twi_r8(uint8_t address, uint8_t reg, uint8_t* data); + +/* + * Function twi_w8 + * Desc write a single byte from a device + * Input address: 7bit i2c device address + * reg: register address + * data: byte to write + * Output 0 on success + */ +uint8_t twi_w8(uint8_t address, uint8_t reg, uint8_t data); From df824414eface1c89175eb23e41ca06210bda334 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 28 Sep 2020 21:02:06 +0200 Subject: [PATCH 040/218] Fix probing in IR_SENSOR --- Firmware/pat9125.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/pat9125.c b/Firmware/pat9125.c index c6ffecf3c..58308a9a7 100644 --- a/Firmware/pat9125.c +++ b/Firmware/pat9125.c @@ -118,8 +118,8 @@ uint8_t pat9125_probe() twi_init(); #ifdef IR_SENSOR // NOTE: this is called from the MK3S variant, so it should be kept minimal - uint8_t addr = PAT9125_PID1; - return (twi_rw8(PAT9125_I2C_ADDR,TW_READ,&addr) == 0); + uint8_t data; + return (twi_r8(PAT9125_I2C_ADDR,PAT9125_PID1,&data) == 0); #else return (pat9125_rd_reg(PAT9125_PID1) != 0); #endif From a6a4a0b71d9403fe13b3c50ca1936aa9a255bf8b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 1 Oct 2020 16:49:38 +0200 Subject: [PATCH 041/218] Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. --- PF-build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index f459095c9..adec0e353 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_18 +# Version: 1.0.6-Build_27 # 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 @@ -124,6 +124,8 @@ # After compiling All multilanguage vairants it makes it easier to find missing or unused transltions. # 12 May 2020, DRracer , Cleanup double MK2/s MK25/s `not_tran` and `not_used` files # 13 May 2020, leptun , If cleanup files do not exist don't try to. +# 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. +# Change Build number to scrpit commits #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -473,12 +475,10 @@ if [ -z "$2" ] ; then case $yn in "Multi languages") LANGUAGES="ALL" - sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE 1/g" $SCRIPT_PATH/Firmware/config.h break ;; "English only") LANGUAGES="EN_ONLY" - sed -i -- "s/^#define LANG_MODE *1/#define LANG_MODE 0/g" $SCRIPT_PATH/Firmware/config.h break ;; *) @@ -622,13 +622,15 @@ do sed -i -- 's/#define FW_REPOSITORY "Unknown"/#define FW_REPOSITORY "Prusa3d"/g' $SCRIPT_PATH/Firmware/Configuration.h #Prepare english only or multilanguage version to be build - if [ $LANGUAGES == "ALL" ]; then + if [ $LANGUAGES == "EN_ONLY" ]; then echo " " - echo "Multi-language firmware will be built" + echo "English only language firmware will be built" + sed -i -- "s/^#define LANG_MODE *1/#define LANG_MODE 0/g" $SCRIPT_PATH/Firmware/config.h echo " " else echo " " - echo "English only language firmware will be built" + echo "Multi-language firmware will be built" + sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE 1/g" $SCRIPT_PATH/Firmware/config.h echo " " fi From 2dbce5c0cb825ef3f804c382f83aad0eb4785aa1 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 2 Oct 2020 18:54:18 +0200 Subject: [PATCH 042/218] Add UNKNOWN as agrument option --- PF-build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index adec0e353..cc3898b75 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_27 +# Version: 1.0.6-Build_28 # 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 @@ -126,6 +126,7 @@ # 13 May 2020, leptun , If cleanup files do not exist don't try to. # 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. # Change Build number to scrpit commits +# 02 Oct 2020, 3d-gussner, Add UNKNOWN as argument option #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -497,11 +498,11 @@ else fi #Check if DEV_STATUS is selected via argument 3 if [ ! -z "$3" ] ; then - if [[ "$3" == "GOLD" || "$3" == "RC" || "$3" == "BETA" || "$3" == "ALPHA" || "$3" == "DEVEL" || "$3" == "DEBUG" ]] ; then + if [[ "$3" == "GOLD" || "$3" == "RC" || "$3" == "BETA" || "$3" == "ALPHA" || "$3" == "DEVEL" || "$3" == "DEBUG" || "$3" == "UNKNOWN" ]] ; then DEV_STATUS_SELECTED=$3 else echo "$(tput setaf 1)Development argument is wrong!$(tput sgr0)" - echo "Only $(tput setaf 2)'GOLD', 'RC', 'BETA', 'ALPHA', 'DEVEL' or 'DEBUG'$(tput sgr0) are allowed as 3rd argument!$(tput sgr0)" + echo "Only $(tput setaf 2)'GOLD', 'RC', 'BETA', 'ALPHA', 'DEVEL', 'DEBUG' or 'UNKOWN' $(tput sgr0) are allowed as 3rd argument!$(tput sgr0)" exit 23 fi fi From ffc7a5344a41774eed52a639de8d3448c89b7f2c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 2 Oct 2020 18:56:50 +0200 Subject: [PATCH 043/218] Typo fix --- PF-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PF-build.sh b/PF-build.sh index cc3898b75..08c3756fd 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -502,7 +502,7 @@ if [ ! -z "$3" ] ; then DEV_STATUS_SELECTED=$3 else echo "$(tput setaf 1)Development argument is wrong!$(tput sgr0)" - echo "Only $(tput setaf 2)'GOLD', 'RC', 'BETA', 'ALPHA', 'DEVEL', 'DEBUG' or 'UNKOWN' $(tput sgr0) are allowed as 3rd argument!$(tput sgr0)" + echo "Only $(tput setaf 2)'GOLD', 'RC', 'BETA', 'ALPHA', 'DEVEL', 'DEBUG' or 'UNKNOWN' $(tput sgr0) are allowed as 3rd argument!$(tput sgr0)" exit 23 fi fi From 93fd3c95a94ebe2c5c89d5f197cabd213655bedd Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 5 Oct 2020 13:18:18 +0200 Subject: [PATCH 044/218] Disable pause and warnings using command line with all needed arguments Install needed apps under linux if needed. --- PF-build.sh | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 08c3756fd..2ef702ec0 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_28 +# Version: 1.0.6-Build_29 # 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 @@ -127,6 +127,8 @@ # 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. # Change Build number to scrpit commits # 02 Oct 2020, 3d-gussner, Add UNKNOWN as argument option +# 05 Oct 2020, 3d-gussner, Disable pause and warnings using command line with all needed arguments +# Install needed apps under linux if needed. #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -201,13 +203,14 @@ if ! type zip > /dev/null; then elif [ $TARGET_OS == "linux" ]; then echo "$(tput setaf 1)Missing 'zip' which is important to run this script" echo "install it with the command $(tput setaf 2)'sudo apt-get install zip'$(tput sgr0)" + sudo apt-get update && apt-get install zip exit 3 fi fi # Check python ... needed during language build if ! type python > /dev/null; then if [ $TARGET_OS == "windows" ]; then - echo "$(tput setaf 1)Missing 'python' which is important to run this script" + echo "$(tput setaf 1)Missing 'python3' which is important to run this script" exit 4 elif [ $TARGET_OS == "linux" ]; then echo "$(tput setaf 1)Missing 'python' which is important to run this script" @@ -215,6 +218,7 @@ if ! type python > /dev/null; then echo "install it with the command $(tput setaf 2)'sudo apt-get install python3'." echo "Check which version of Python3 has been installed using 'ls /usr/bin/python3*'" echo "Use 'sudo ln -sf /usr/bin/python3.x /usr/bin/python' (where 'x' is your version number) to make it default.$(tput sgr0)" + sudo apt-get update && apt-get install python3 && ln -sf /usr/bin/python3 /usr/bin/python exit 4 fi fi @@ -507,6 +511,14 @@ if [ ! -z "$3" ] ; then fi fi +# check if script has been started with arguments +if [ "$#" -eq "0" ] ; then + OUTPUT=1 +else + OUTPUT=0 +fi +#echo "Output is:" $OUTPUT + #Set BUILD_ENV_PATH cd ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 24 BUILD_ENV_PATH="$( pwd -P )" @@ -581,18 +593,24 @@ do echo "" ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.hex | xargs -n1 basename echo "$(tput setaf 6)This hex file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" - read -t 10 -p "Press Enter to continue..." + if [ $OUTPUT == "1" ] ; then + read -t 10 -p "Press Enter to continue..." + fi elif [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT-EN_ONLY.hex" && "$LANGUAGES" == "EN_ONLY" ]]; then echo "" ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT-EN_ONLY.hex | xargs -n1 basename echo "$(tput setaf 6)This hex file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" - read -t 10 -p "Press Enter to continue..." + if [ $OUTPUT == "1" ] ; then + read -t 10 -p "Press Enter to continue..." + fi fi if [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.zip" && "$LANGUAGES" == "ALL" ]]; then echo "" ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.zip | xargs -n1 basename echo "$(tput setaf 6)This zip file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" - read -t 10 -p "Press Enter to continue..." + if [ $OUTPUT == "1" ] ; then + read -t 10 -p "Press Enter to continue..." + fi fi #List some useful data @@ -654,7 +672,9 @@ do echo "Start to build Prusa Firmware ..." echo "Using variant $VARIANT$(tput setaf 3)" - sleep 2 + if [ $OUTPUT == "1" ] ; then + sleep 2 + fi #$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)" @@ -664,7 +684,9 @@ do echo "Building multi language firmware" $MULTI_LANGUAGE_CHECK echo "$(tput sgr 0)" - sleep 2 + if [ $OUTPUT == "1" ] ; then + sleep 2 + fi cd $SCRIPT_PATH/lang echo "$(tput setaf 3)" ./config.sh || exit 31 @@ -673,7 +695,9 @@ do if [ -f "lang_en.tmp" ]; then echo "" echo "$(tput setaf 6)Previous lang build files already exist these will be cleaned up in 10 seconds.$(tput sgr 0)" - read -t 10 -p "Press Enter to continue..." + if [ $OUTPUT == "1" ] ; then + read -t 10 -p "Press Enter to continue..." + fi echo "$(tput setaf 3)" ./lang-clean.sh echo "$(tput sgr 0)" @@ -681,7 +705,9 @@ do if [ -f "progmem.out" ]; then echo "" echo "$(tput setaf 6)Previous firmware build files already exist these will be cleaned up in 10 seconds.$(tput sgr 0)" - read -t 10 -p "Press Enter to continue..." + if [ $OUTPUT == "1" ] ; then + read -t 10 -p "Press Enter to continue..." + fi echo "$(tput setaf 3)" ./fw-clean.sh echo "$(tput sgr 0)" @@ -749,7 +775,9 @@ do #sed -i -- "s/^#define LANG_MODE * /#define LANG_MODE $MULTI_LANGUAGE_CHECK/g" $SCRIPT_PATH/Firmware/config.h sed -i -- "s/^#define LANG_MODE *1/#define LANG_MODE ${MULTI_LANGUAGE_CHECK}/g" $SCRIPT_PATH/Firmware/config.h sed -i -- "s/^#define LANG_MODE *0/#define LANG_MODE ${MULTI_LANGUAGE_CHECK}/g" $SCRIPT_PATH/Firmware/config.h - sleep 5 + if [ $OUTPUT == "1" ] ; then + sleep 5 + fi done # Switch to hex path and list build files From e3b3e66665913a535ec7841d1378f7e5fe1eee08 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 5 Oct 2020 15:25:54 +0200 Subject: [PATCH 045/218] Clean PF-Firmware build when changing git branch --- PF-build.sh | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/PF-build.sh b/PF-build.sh index 2ef702ec0..9bdd377c8 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_29 +# Version: 1.0.6-Build_30 # 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 @@ -129,6 +129,7 @@ # 02 Oct 2020, 3d-gussner, Add UNKNOWN as argument option # 05 Oct 2020, 3d-gussner, Disable pause and warnings using command line with all needed arguments # Install needed apps under linux if needed. +# Clean PF-Firmware build when changing git branch #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -519,6 +520,26 @@ else fi #echo "Output is:" $OUTPUT +#Check git branch has changed +if ! type git > /dev/null; then + BRANCH="" + CLEAN_PF_FW_BUILD=0 +else + BRANCH=$(git branch --show-current) + echo "Branch is:" $BRANCH + if [ ! -f "$SCRIPT_PATH/../PF-build.branch" ]; then + echo "$BRANCH" >| $SCRIPT_PATH/../PF-build.branch + echo "created PF-build.branch file" + else + PRE_BRANCH=$(cat "$SCRIPT_PATH/../PF-build.branch") + echo "Previous branch was:" $PRE_BRANCH + if [ ! "$BRANCH" == "$PRE_BRANCH" ] ; then + CLEAN_PF_FW_BUILD=1 + echo "$BRANCH" >| $SCRIPT_PATH/../PF-build.branch + fi + fi +fi + #Set BUILD_ENV_PATH cd ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 24 BUILD_ENV_PATH="$( pwd -P )" @@ -534,6 +555,14 @@ fi cd Prusa-Firmware-build || exit 26 BUILD_PATH="$( pwd -P )" +#Check git branch has changed +if [ "$CLEAN_PF_FW_BUILD" == "1" ]; then + read -t 10 -p "Branch changed, cleaning Prusa-Firmware-build folder" + rm -r * +else + echo "Nothing to clean up" +fi + for v in ${VARIANTS[*]} do VARIANT=$(basename "$v" ".h") From c8c7563e8a1366330c80c0da5d70dcf87e6959ad Mon Sep 17 00:00:00 2001 From: MartinPoupa <58166333+MartinPoupa@users.noreply.github.com> Date: Wed, 7 Oct 2020 17:44:17 +0200 Subject: [PATCH 046/218] LCD status changed When the lcd status changed it will be printed "LCD status changed" to serial line. --- Firmware/ultralcd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 936ae873e..a9d3da59f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8968,6 +8968,7 @@ void lcd_ignore_click(bool b) } void lcd_finishstatus() { + SERIAL_PROTOCOLLN("LCD status changed"); int len = strlen(lcd_status_message); if (len > 0) { while (len < LCD_WIDTH) { From a84d7ef8d6e7bf37ec6290e92b23cf823bcd1fa8 Mon Sep 17 00:00:00 2001 From: MartinPoupa <58166333+MartinPoupa@users.noreply.github.com> Date: Wed, 7 Oct 2020 18:41:49 +0200 Subject: [PATCH 047/218] corectino of declaration --- Firmware/messages.c | 2 +- Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index be613cab1..1c442b479 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -176,4 +176,4 @@ 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 const char MSG_ADVANCE_K[] PROGMEM_N1 = "Advance K:"; ////c=13 const char MSG_POWERPANIC_DETECTED[] PROGMEM_N1 = "POWER PANIC DETECTED"; ////c=20 - +const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 4653c869e..a9a23f0d2 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -176,6 +176,7 @@ extern const char MSG_FANCHECK_PRINT[]; extern const char MSG_M112_KILL[]; extern const char MSG_ADVANCE_K[]; extern const char MSG_POWERPANIC_DETECTED[]; +extern const char MSG_LCD_STATUS_CHANGED[]; #if defined(__cplusplus) } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a9d3da59f..63fea0e3f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8968,7 +8968,7 @@ void lcd_ignore_click(bool b) } void lcd_finishstatus() { - SERIAL_PROTOCOLLN("LCD status changed"); + SERIAL_PROTOCOLLNRPGM(MSG_LCD_STATUS_CHANGED); int len = strlen(lcd_status_message); if (len > 0) { while (len < LCD_WIDTH) { From c05d4c9112c3b4ef8b086ef4fb18fda983a66599 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 21 Oct 2020 17:04:20 +0200 Subject: [PATCH 048/218] Update messages.h cleanup space --- Firmware/messages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/messages.h b/Firmware/messages.h index a9a23f0d2..cb8010225 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -176,7 +176,7 @@ extern const char MSG_FANCHECK_PRINT[]; extern const char MSG_M112_KILL[]; extern const char MSG_ADVANCE_K[]; extern const char MSG_POWERPANIC_DETECTED[]; -extern const char MSG_LCD_STATUS_CHANGED[]; +extern const char MSG_LCD_STATUS_CHANGED[]; #if defined(__cplusplus) } From 5f23474c95309b8a47a0bea92a88dbe3bbf25111 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Wed, 28 Oct 2020 20:49:28 +0100 Subject: [PATCH 049/218] Raise Z while preheating when auto/[un]loading the filament Preheating already raised Z to avoid scorching the PEI sheet, as does filament loading/unloading to allow for excess material to be removed. However, when loading/autoloading/unloading via the LCD with a cold nozzle the preheating menu is performed before the carriage is raised, leaving the carriage close to the sheet while heating the nozzle. Pre-raise the carriage already while waiting, so that the subsequent move is automagically skipped. Set bFilamentWaitingFlag only once to perform both the LCD initialization and raising to the appropriate height. Should fix #2761 --- Firmware/ultralcd.cpp | 61 +++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 63fea0e3f..adb9f2c31 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2412,7 +2412,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) case FilamentAction::None: case FilamentAction::Preheat: case FilamentAction::Lay1Cal: - + // handled earlier break; } if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt); @@ -2420,34 +2420,45 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) } 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) + + if (!bFilamentWaitingFlag) { - case FilamentAction::Load: - case FilamentAction::AutoLoad: - case FilamentAction::MmuLoad: - lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 - break; - case FilamentAction::UnLoad: - case FilamentAction::MmuUnLoad: - lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 - break; - case FilamentAction::MmuEject: - lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 - break; - case FilamentAction::MmuCut: - lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 - break; - case FilamentAction::None: - case FilamentAction::Preheat: - case FilamentAction::Lay1Cal: - break; + // First run after the filament preheat selection: + // setup the fixed LCD parts and raise Z as we wait + bFilamentWaitingFlag = true; + + 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 + raise_z_above(MIN_Z_FOR_LOAD); + break; + case FilamentAction::UnLoad: + case FilamentAction::MmuUnLoad: + lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 + raise_z_above(MIN_Z_FOR_UNLOAD); + break; + case FilamentAction::MmuEject: + lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 + break; + case FilamentAction::MmuCut: + lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 + break; + case FilamentAction::None: + case FilamentAction::Preheat: + case FilamentAction::Lay1Cal: + // handled earlier + break; + } + lcd_set_cursor(0, 3); + lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 } - lcd_set_cursor(0, 3); - lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 + if (lcd_clicked()) { bFilamentWaitingFlag = false; From e28159122fcbff5e70d13325304a094d61fb9c2d Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Thu, 29 Oct 2020 15:14:17 +0100 Subject: [PATCH 050/218] Make MIN_Z_FOR_LOAD/UNLOAD the same When unloading + preheat immediately followed by a load, the carriage is raised first up to 20mm, then again to 50mm. With PR #2318 it makes sense to make more space for the extra extrusion anyway, so make them the same. This moves the carriage only once _while_ preheating, which is nice. --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index a9bf23e99..58e3ee743 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -552,7 +552,7 @@ enum CalibrationStatus // 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_UNLOAD 50 #define MIN_Z_FOR_PREHEAT 10 #include "Configuration_adv.h" From a5ba666af0991784a27a7a1863abb1543c6c0ef3 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 2 Nov 2020 14:54:16 +0100 Subject: [PATCH 051/218] Changed from arguments to flags/options Check for "gawk" on Linux Add argument to change build number automatically to current commit or define own number Update exit numbers 1-13 for prepare build env 21-29 for prepare compiling 30-36 compiling --- PF-build.sh | 136 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 106 insertions(+), 30 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 9bdd377c8..7f0fd362e 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_30 +# Version: 1.0.6-Build_32 # 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 @@ -125,11 +125,15 @@ # 12 May 2020, DRracer , Cleanup double MK2/s MK25/s `not_tran` and `not_used` files # 13 May 2020, leptun , If cleanup files do not exist don't try to. # 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. -# Change Build number to scrpit commits +# Change Build number to scrpit commits 'git rev-list --count HEAD PF-build.sh' # 02 Oct 2020, 3d-gussner, Add UNKNOWN as argument option # 05 Oct 2020, 3d-gussner, Disable pause and warnings using command line with all needed arguments # Install needed apps under linux if needed. # Clean PF-Firmware build when changing git branch +# 02 Nov 2020, 3d-gussner, Check for "gawk" on Linux +# Add argument to change build number automatically to current commit or define own number +# Update exit numbers 1-13 for prepare build env 21-29 for prepare compiling 30-36 compiling + #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -224,6 +228,16 @@ if ! type python > /dev/null; then fi fi +# Check gawk ... needed during language build +if ! type gawk > /dev/null; then + if [ $TARGET_OS == "linux" ]; then + echo "$(tput setaf 1)Missing 'gawk' which is important to run this script" + echo "install it with the command $(tput setaf 2)'sudo apt-get install gawk'." + sudo apt-get update && apt-get install gawk + exit 4 + fi +fi + #### End prepare bash / Linux environment @@ -430,8 +444,36 @@ fi #### Start cd $SCRIPT_PATH -# First argument defines which variant of the Prusa Firmware will be compiled -if [ -z "$1" ] ; then +# Check if git is availible +if type git > /dev/null; then + git_availible="1" +fi + +#arguments +#'-v' Variant "All" or variant file name +#'-l' Languages "ALL" for multi language or "EN_ONLY" for english only +#'-d' Devel build "GOLD", "RC", "BETA", "ALPHA", "DEBUG", "DEVEL" and "UNKNOWN" +#'-b' Build/commit number "Auto" needs git or a number +#'-o' Output "1" force or "0" block output and delays +while getopts v:l:d:b:o: flag + do + case "${flag}" in + v) variant_flag=${OPTARG};; + l) language_flag=${OPTARG};; + d) devel_flag=${OPTARG};; + b) build_flag=${OPTARG};; + o) output_flag=${OPTARG};; + esac + done +#echo "variant_flag: $variant_flag"; +#echo "language_flag: $language_flag"; +#echo "devel_flag: $devel_flag"; +#echo "build_flag: $build_flag"; +#echo "output_flag: $output_flag"; + +# +# '-v' argument defines which variant of the Prusa Firmware will be compiled +if [ -z "$variant_flag" ] ; then # Select which variant of the Prusa Firmware will be compiled, like PS3="Select a variant: " while IFS= read -r -d $'\0' f; do @@ -451,7 +493,7 @@ if [ -z "$1" ] ; then ;; "Quit") echo "You chose to stop" - exit + exit 20 ;; *) echo "$(tput setaf 1)This is not a valid variant$(tput sgr0)" @@ -459,21 +501,28 @@ if [ -z "$1" ] ; then esac done else - if [ -f "$SCRIPT_PATH/Firmware/variants/$1" ] ; then - VARIANTS=$1 + if [ -f "$SCRIPT_PATH/Firmware/variants/$variant_flag" ] ; then + VARIANTS=$variant_flag + elif [ "$variant_flag" == "All" ] ; then + while IFS= read -r -d $'\0' f; do + options[i++]="$f" + done < <(find Firmware/variants/ -maxdepth 1 -type f -name "*.h" -print0 ) + VARIANT="All" + VARIANTS=${options[*]} else - echo "$(tput setaf 1)$1 could not be found in Firmware/variants please choose a valid one$(tput setaf 2)" + echo "$(tput setaf 1)Argument $variant_flag could not be found in Firmware/variants please choose a valid one.$(tput sgr0)" + echo "Only $(tput setaf 2)'All'$(tput sgr0) and file names below are allowed as variant '-v' argument.$(tput setaf 2)" ls -1 $SCRIPT_PATH/Firmware/variants/*.h | xargs -n1 basename echo "$(tput sgr0)" exit 21 fi fi -#Second argument defines if it is an english only version. Known values EN_ONLY / ALL +#'-l' argument defines if it is an english only version. Known values EN_ONLY / ALL #Check default language mode MULTI_LANGUAGE_CHECK=$(grep --max-count=1 "^#define LANG_MODE *" $SCRIPT_PATH/Firmware/config.h|sed -e's/ */ /g'|cut -d ' ' -f3) -if [ -z "$2" ] ; then +if [ -z "$language_flag" ] ; then PS3="Select a language: " echo echo "Which lang-build do you want?" @@ -493,27 +542,43 @@ if [ -z "$2" ] ; then esac done else - if [[ "$2" == "ALL" || "$2" == "EN_ONLY" ]] ; then - LANGUAGES=$2 + if [[ "$language_flag" == "ALL" || "$language_flag" == "EN_ONLY" ]] ; then + LANGUAGES=$language_flag else echo "$(tput setaf 1)Language argument is wrong!$(tput sgr0)" - echo "Only $(tput setaf 2)'ALL'$(tput sgr0) or $(tput setaf 2)'EN_ONLY'$(tput sgr0) are allowed as 2nd argument!" + echo "Only $(tput setaf 2)'ALL'$(tput sgr0) or $(tput setaf 2)'EN_ONLY'$(tput sgr0) are allowed as language '-l' argument!" exit 22 fi fi -#Check if DEV_STATUS is selected via argument 3 -if [ ! -z "$3" ] ; then - if [[ "$3" == "GOLD" || "$3" == "RC" || "$3" == "BETA" || "$3" == "ALPHA" || "$3" == "DEVEL" || "$3" == "DEBUG" || "$3" == "UNKNOWN" ]] ; then - DEV_STATUS_SELECTED=$3 +#Check if DEV_STATUS is selected via argument '-d' +if [ ! -z "$devel_flag" ] ; then + if [[ "$devel_flag" == "GOLD" || "$devel_flag" == "RC" || "$devel_flag" == "BETA" || "$devel_flag" == "ALPHA" || "$devel_flag" == "DEVEL" || "$devel_flag" == "DEBUG" || "$devel_flag" == "UNKNOWN" ]] ; then + DEV_STATUS_SELECTED=$devel_flag else echo "$(tput setaf 1)Development argument is wrong!$(tput sgr0)" - echo "Only $(tput setaf 2)'GOLD', 'RC', 'BETA', 'ALPHA', 'DEVEL', 'DEBUG' or 'UNKNOWN' $(tput sgr0) are allowed as 3rd argument!$(tput sgr0)" + echo "Only $(tput setaf 2)'GOLD', 'RC', 'BETA', 'ALPHA', 'DEVEL', 'DEBUG' or 'UNKNOWN' $(tput sgr0) are allowed as devel '-d' argument!$(tput sgr0)" exit 23 fi fi +#Check if Build is selected via argument '-b' +if [ ! -z "$build_flag" ] ; then + if [[ "$build_flag" == "Auto" && "$git_availible" == "1" ]] ; then + echo "Build changed to $build_flag" + BUILD=$(git rev-list --count HEAD) + elif [[ $build_flag =~ ^[0-9]+$ ]] ; then + BUILD=$build_flag + else + echo "$(tput setaf 1)Build number argument is wrong!$(tput sgr0)" + echo "Only $(tput setaf 2)'Auto' (git needed) or numbers $(tput sgr0) are allowed as build '-b' argument!$(tput sgr0)" + exit 24 + + fi + echo "New Build number is: $BUILD" +fi + # check if script has been started with arguments -if [ "$#" -eq "0" ] ; then +if [[ "$#" -eq "0" || "$output_flag" == 1 ]] ; then OUTPUT=1 else OUTPUT=0 @@ -521,12 +586,12 @@ fi #echo "Output is:" $OUTPUT #Check git branch has changed -if ! type git > /dev/null; then +if [ ! -z "git_availible" ]; then BRANCH="" CLEAN_PF_FW_BUILD=0 else BRANCH=$(git branch --show-current) - echo "Branch is:" $BRANCH + echo "Current branch is:" $BRANCH if [ ! -f "$SCRIPT_PATH/../PF-build.branch" ]; then echo "$BRANCH" >| $SCRIPT_PATH/../PF-build.branch echo "created PF-build.branch file" @@ -541,18 +606,18 @@ else fi #Set BUILD_ENV_PATH -cd ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 24 +cd ../PF-build-env-$BUILD_ENV/$ARDUINO_ENV-$BOARD_VERSION-$TARGET_OS-$Processor || exit 25 BUILD_ENV_PATH="$( pwd -P )" cd ../.. #Checkif BUILD_PATH exists and if not creates it if [ ! -d "Prusa-Firmware-build" ]; then - mkdir Prusa-Firmware-build || exit 25 + mkdir Prusa-Firmware-build || exit 26 fi #Set the BUILD_PATH for Arduino IDE -cd Prusa-Firmware-build || exit 26 +cd Prusa-Firmware-build || exit 27 BUILD_PATH="$( pwd -P )" #Check git branch has changed @@ -568,8 +633,15 @@ do VARIANT=$(basename "$v" ".h") # Find firmware version in Configuration.h file and use it to generate the hex filename FW=$(grep --max-count=1 "\bFW_VERSION\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d '"' -f2|sed 's/\.//g') - # Find build version in Configuration.h file and use it to generate the hex filename - BUILD=$(grep --max-count=1 "\bFW_COMMIT_NR\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d ' ' -f3) + if [ -z "$BUILD" ] ; then + # Find build version in Configuration.h file and use it to generate the hex filename + BUILD=$(grep --max-count=1 "\bFW_COMMIT_NR\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d ' ' -f3) + else + # Find and replace build version in Configuration.h file + BUILD_ORG=$(grep --max-count=1 "\bFW_COMMIT_NR\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d ' ' -f3) + echo "Original build number: $BUILD_ORG" + sed -i -- "s/^#define FW_COMMIT_NR.*/#define FW_COMMIT_NR $BUILD/g" $SCRIPT_PATH/Firmware/Configuration.h + fi # Check if the motherboard is an EINSY and if so only one hex file will generated MOTHERBOARD=$(grep --max-count=1 "\bMOTHERBOARD\b" $SCRIPT_PATH/Firmware/variants/$VARIANT.h | sed -e's/ */ /g' |cut -d ' ' -f3) # Check development status @@ -613,7 +685,7 @@ do fi #Prepare hex files folders if [ ! -d "$SCRIPT_PATH/../PF-build-hex/FW$FW-Build$BUILD/$MOTHERBOARD" ]; then - mkdir -p $SCRIPT_PATH/../PF-build-hex/FW$FW-Build$BUILD/$MOTHERBOARD || exit 27 + mkdir -p $SCRIPT_PATH/../PF-build-hex/FW$FW-Build$BUILD/$MOTHERBOARD || exit 28 fi OUTPUT_FOLDER="PF-build-hex/FW$FW-Build$BUILD/$MOTHERBOARD" @@ -656,11 +728,11 @@ do #Prepare Firmware to be compiled by copying variant as Configuration_prusa.h if [ ! -f "$SCRIPT_PATH/Firmware/Configuration_prusa.h" ]; then - cp -f $SCRIPT_PATH/Firmware/variants/$VARIANT.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 28 + cp -f $SCRIPT_PATH/Firmware/variants/$VARIANT.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 29 else echo "$(tput setaf 6)Configuration_prusa.h already exist it will be overwritten in 10 seconds by the chosen variant.$(tput sgr 0)" read -t 10 -p "Press Enter to continue..." - cp -f $SCRIPT_PATH/Firmware/variants/$VARIANT.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 28 + cp -f $SCRIPT_PATH/Firmware/variants/$VARIANT.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 29 fi #Prepare Configuration.h to use the correct FW_DEV_VERSION to prevent LCD messages when connecting with OctoPrint @@ -705,7 +777,7 @@ do sleep 2 fi #$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 + $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 30 echo "$(tput sgr 0)" if [ $LANGUAGES == "ALL" ]; then @@ -798,8 +870,12 @@ do then rm $SCRIPT_PATH/lang/not_used.txt fi + # Restore files to previous state sed -i -- "s/^#define FW_DEV_VERSION FW_VERSION_$DEV_STATUS/#define FW_DEV_VERSION FW_VERSION_UNKNOWN/g" $SCRIPT_PATH/Firmware/Configuration.h sed -i -- 's/^#define FW_REPOSITORY "Prusa3d"/#define FW_REPOSITORY "Unknown"/g' $SCRIPT_PATH/Firmware/Configuration.h + if [ ! -z "$BUILD_ORG" ] ; then + sed -i -- "s/^#define FW_COMMIT_NR.*/#define FW_COMMIT_NR $BUILD_ORG/g" $SCRIPT_PATH/Firmware/Configuration.h + fi echo $MULTI_LANGUAGE_CHECK #sed -i -- "s/^#define LANG_MODE * /#define LANG_MODE $MULTI_LANGUAGE_CHECK/g" $SCRIPT_PATH/Firmware/config.h sed -i -- "s/^#define LANG_MODE *1/#define LANG_MODE ${MULTI_LANGUAGE_CHECK}/g" $SCRIPT_PATH/Firmware/config.h From 7651fbb0d192dedd9691b8d0dc3388c41af6fbcf Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 2 Nov 2020 17:11:24 +0100 Subject: [PATCH 052/218] Fix output "Configuration_prusa.h" delay if compiling failed. --- PF-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PF-build.sh b/PF-build.sh index 7f0fd362e..5a174c9ca 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -731,7 +731,9 @@ do cp -f $SCRIPT_PATH/Firmware/variants/$VARIANT.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 29 else echo "$(tput setaf 6)Configuration_prusa.h already exist it will be overwritten in 10 seconds by the chosen variant.$(tput sgr 0)" - read -t 10 -p "Press Enter to continue..." + if [ $OUTPUT == "1" ] ; then + read -t 10 -p "Press Enter to continue..." + fi cp -f $SCRIPT_PATH/Firmware/variants/$VARIANT.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 29 fi From cd4e16ef9fc216d88dc3a3ad65709fc65baae724 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 6 Nov 2020 08:25:56 +0100 Subject: [PATCH 053/218] XYZ calibration tune PFW-1159 --- Firmware/xyzcal.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 060bb13af..7085c4095 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -494,7 +494,11 @@ int8_t xyzcal_find_point_center2(uint16_t delay_us) xyzcal_lineXYZ_to(_X, _Y, z0 + 400, 500, -1); xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1); - z0 = _Z - 20; + if (has_temperature_compensation()) + z0 = _Z - 20; // normal PINDA + else + z0 = _Z + 10; // alternate PINDA + xyzcal_lineXYZ_to(_X, _Y, z0, 500, 0); // xyzcal_lineXYZ_to(x0, y0, z0 - 100, 500, 1); From 5184910ef9f108330e4868d30980b35c6951c380 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 9 Nov 2020 06:33:41 +0100 Subject: [PATCH 054/218] Try harder finding the calibration center with alternative PINDAs it looks like their properties vary a lot and searching for the calibration center requires trying different Z levels. --- Firmware/xyzcal.cpp | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 7085c4095..22dfa1817 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -478,7 +478,7 @@ int16_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, u #define MAX_DIAMETR 600 #define XYZCAL_FIND_CENTER_DIAGONAL - +int8_t xyzcal_find_point_center2A(int16_t x0, int16_t y0, int16_t z0, uint16_t delay_us); int8_t xyzcal_find_point_center2(uint16_t delay_us) { printf_P(PSTR("xyzcal_find_point_center2\n")); @@ -494,11 +494,25 @@ int8_t xyzcal_find_point_center2(uint16_t delay_us) xyzcal_lineXYZ_to(_X, _Y, z0 + 400, 500, -1); xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1); - if (has_temperature_compensation()) + if (has_temperature_compensation()){ z0 = _Z - 20; // normal PINDA - else - z0 = _Z + 10; // alternate PINDA + return xyzcal_find_point_center2A(x0, y0, z0, delay_us); + } else { + // try searching harder, each PINDA is different + for(z0 = _Z - 20; z0 < _Z + 60; z0 += 20 ){ // alternate PINDA + int8_t rv = xyzcal_find_point_center2A(x0, y0, z0, delay_us); + printf_P(PSTR(" z0=%d"), z0); + if( rv != 0 ){ + printf_P(PSTR("ok\n")); + return rv; + } else { + printf_P(PSTR("fail\n")); + } + } + } +} +int8_t xyzcal_find_point_center2A(int16_t x0, int16_t y0, int16_t z0, uint16_t delay_us){ xyzcal_lineXYZ_to(_X, _Y, z0, 500, 0); // xyzcal_lineXYZ_to(x0, y0, z0 - 100, 500, 1); From 4747c8c9f5660a525f86e0626983ed5e0a5abfa7 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 9 Nov 2020 12:29:19 +0100 Subject: [PATCH 055/218] Increase top Z-offset limit based on some test results --- Firmware/xyzcal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 22dfa1817..767024dbe 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -499,7 +499,7 @@ int8_t xyzcal_find_point_center2(uint16_t delay_us) return xyzcal_find_point_center2A(x0, y0, z0, delay_us); } else { // try searching harder, each PINDA is different - for(z0 = _Z - 20; z0 < _Z + 60; z0 += 20 ){ // alternate PINDA + for(z0 = _Z - 20; z0 <= _Z + 140; z0 += 20 ){ // alternate PINDA int8_t rv = xyzcal_find_point_center2A(x0, y0, z0, delay_us); printf_P(PSTR(" z0=%d"), z0); if( rv != 0 ){ From 26f62f042ee0a0448eba6310547d8f47219e6218 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 19:32:03 +0200 Subject: [PATCH 056/218] Use the longest filename instead of just using the long filename in M27 --- Firmware/cardreader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index fdef1cd43..0a6fdeea8 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -498,7 +498,7 @@ void CardReader::getStatus() SERIAL_PROTOCOLLNPGM("Print saved"); } else { - SERIAL_PROTOCOLLN(longFilename); + SERIAL_PROTOCOLLN(LONGEST_FILENAME); SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE SERIAL_PROTOCOL(sdpos); SERIAL_PROTOCOL('/'); From e5ebf7c67f057f1ddeba53c759238d2c3b65bdd2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 19:32:23 +0200 Subject: [PATCH 057/218] Fix missing keep-alive messages --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index dd6dd78b1..dac3aa6a8 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2631,7 +2631,6 @@ void gcode_M105(uint8_t extruder) } #endif SERIAL_PROTOCOLLN(""); - KEEPALIVE_STATE(NOT_BUSY); } #ifdef TMC2130 From 0ee8e1f424a2895912e39349ef1a6965a341fb24 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 19:32:41 +0200 Subject: [PATCH 058/218] Fix missing ok in M601 --- Firmware/Marlin_main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index dac3aa6a8..f1abeb87f 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7994,6 +7994,7 @@ Sigma_Exit: if (!isPrintPaused) { st_synchronize(); + ClearToSend(); //send OK even before the command finishes executing because we want to make sure it is not skipped because of cmdqueue_pop_front(); cmdqueue_pop_front(); //trick because we want skip this command (M601) after restore lcd_pause_print(); } From 6873a9d28e527dbcf9d26495e18133c2649e8e87 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 19:33:02 +0200 Subject: [PATCH 059/218] Only send capabilities when M115 is run without arguments --- Firmware/Marlin_main.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f1abeb87f..fe8bbbade 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6863,12 +6863,10 @@ Sigma_Exit: SERIAL_ECHOPGM(STRINGIFY(EXTRUDERS)); SERIAL_ECHOPGM(" UUID:"); SERIAL_ECHOLNPGM(MACHINE_UUID); - } - #ifdef EXTENDED_CAPABILITIES_REPORT - extended_capabilities_report(); + extended_capabilities_report(); #endif //EXTENDED_CAPABILITIES_REPORT - + } break; /*! From 5f0e4a1cac9abb3ef35137038afe7945c76f6c8e Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 19:33:23 +0200 Subject: [PATCH 060/218] Temporary M602 patch. Needs more work --- 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 fe8bbbade..260b9a30b 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -11459,7 +11459,7 @@ void restore_print_from_ram_and_continue(float e_move) //not sd printing nor usb printing } - SERIAL_PROTOCOLLNRPGM(MSG_OK); //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_type = PRINTING_TYPE_NONE; saved_printing = false; From ff56ece6f8f5037bf5f00a194911be0fe856bc93 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 19:48:48 +0200 Subject: [PATCH 061/218] Remove redundant get_command prototype --- Firmware/Marlin.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 6e4b24206..5a38cae52 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -116,7 +116,6 @@ void serial_echopair_P(const char *s_P, unsigned long v); void serialprintPGM(const char *str); bool is_buffer_empty(); -void get_command(); void process_commands(); void ramming(); From fdbbc7d62a0336280d4cf043018ee66ba21e824f Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Oct 2020 20:12:01 +0200 Subject: [PATCH 062/218] Terminate last line from the SD card even if it doesn't have a \n --- Firmware/cmdqueue.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index c86935529..9167aaaa6 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -582,8 +582,6 @@ void get_command() ((serial_char == '#' || serial_char == ':') && comment_mode == false) || serial_count >= (MAX_CMD_SIZE - 1) || n==-1) { - if(card.eof()) break; - if(serial_char=='#') stop_buffering=true; @@ -631,6 +629,9 @@ void get_command() comment_mode = false; //for new command serial_count = 0; //clear buffer + + if(card.eof()) break; + // The following line will reserve buffer space if available. if (! cmdqueue_could_enqueue_back(MAX_CMD_SIZE-1, true)) return; From 4abf1f436a43fa4a0ae7b5237acdc251c85d85d5 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 26 Oct 2020 09:42:26 +0200 Subject: [PATCH 063/218] Gracefully dump the queue + fixes to fancheck --- Firmware/Marlin.h | 11 ----------- Firmware/Marlin_main.cpp | 17 +++++++---------- Firmware/cardreader.cpp | 1 + Firmware/cmdqueue.cpp | 20 +++++++++++++++----- Firmware/cmdqueue.h | 5 +++-- Firmware/first_lay_cal.cpp | 1 + Firmware/menu.cpp | 1 + Firmware/mmu.cpp | 1 + Firmware/temperature.cpp | 2 +- Firmware/ultralcd.cpp | 16 ++++++++++------ 10 files changed, 40 insertions(+), 35 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 5a38cae52..19635c178 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -240,23 +240,12 @@ void Stop(); bool IsStopped(); void finishAndDisableSteppers(); -//put an ASCII command at the end of the current buffer. -void enquecommand(const char *cmd, bool from_progmem = false); - //put an ASCII command at the end of the current buffer, read from flash #define enquecommand_P(cmd) enquecommand(cmd, true) -//put an ASCII command at the begin of the current buffer -void enquecommand_front(const char *cmd, bool from_progmem = false); - //put an ASCII command at the begin of the current buffer, read from flash #define enquecommand_front_P(cmd) enquecommand_front(cmd, true) -void repeatcommand_front(); - -// Remove all lines from the command queue. -void cmdqueue_reset(); - void prepare_arc_move(char isclockwise); void clamp_to_software_endstops(float target[3]); void refresh_cmd_timeout(void); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 260b9a30b..5376daefe 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -631,7 +631,7 @@ void crashdet_cancel() lcd_print_stop(); }else if(saved_printing_type == PRINTING_TYPE_USB){ SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI - SERIAL_PROTOCOLLNRPGM(MSG_OK); + cmdqueue_reset(); } } @@ -3678,14 +3678,12 @@ There are reasons why some G Codes aren't in numerical order. void process_commands() { #ifdef FANCHECK - if(fan_check_error){ - if(fan_check_error == EFCE_DETECTED){ - fan_check_error = EFCE_REPORTED; - // SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); - lcd_pause_print(); - } // otherwise it has already been reported, so just ignore further processing - return; //ignore usb stream. It is reenabled by selecting resume from the lcd. - } + if(fan_check_error == EFCE_DETECTED){ + fan_check_error = EFCE_REPORTED; + // SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); + lcd_pause_print(); + cmdqueue_serial_disabled = true; + } #endif if (!buflen) return; //empty command @@ -11459,7 +11457,6 @@ void restore_print_from_ram_and_continue(float e_move) //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; diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 0a6fdeea8..94077f4cd 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -1,4 +1,5 @@ #include "Marlin.h" +#include "cmdqueue.h" #include "cardreader.h" #include "ultralcd.h" #include "stepper.h" diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 9167aaaa6..5c5a71731 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -18,6 +18,10 @@ int buflen = 0; // Therefore don't remove the command from the queue in the loop() function. bool cmdbuffer_front_already_processed = false; +// Used for temporarely preventing accidental adding of Serial commands to the queue. +// For now only check_file and the fancheck pause use this. +bool cmdqueue_serial_disabled = false; + int serial_count = 0; //index of character read from serial line boolean comment_mode = false; char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc @@ -91,14 +95,20 @@ bool cmdqueue_pop_front() void cmdqueue_reset() { - bufindr = 0; - bufindw = 0; - buflen = 0; + while (buflen) + { + uint8_t cmdqueue_current_type = *(cmdbuffer+bufindr); + // printf_P(PSTR("dumping: \"%s\" of type %hu\n"), cmdbuffer+bufindr+CMDHDRSIZE, cmdqueue_current_type); + ClearToSend(); + cmdqueue_pop_front(); + } + bufindr = 0; + bufindw = 0; //commands are removed from command queue after process_command() function is finished //reseting command queue and enqueing new commands during some (usually long running) command processing would cause that new commands are immediately removed from queue (or damaged) //this will ensure that all new commands which are enqueued after cmdqueue reset, will be always executed - cmdbuffer_front_already_processed = true; + cmdbuffer_front_already_processed = true; } // How long a string could be pushed to the front of the command queue? @@ -390,7 +400,7 @@ void get_command() } // start of serial line processing loop - while ((MYSERIAL.available() > 0 && !saved_printing) || (MYSERIAL.available() > 0 && isPrintPaused)) { //is print is saved (crash detection or filament detection), dont process data from serial line + while (((MYSERIAL.available() > 0 && !saved_printing) || (MYSERIAL.available() > 0 && isPrintPaused)) && !cmdqueue_serial_disabled) { //is print is saved (crash detection or filament detection), dont process data from serial line char serial_char = MYSERIAL.read(); /* if (selectedSerialPort == 1) diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index 13185f179..017452a2a 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -35,6 +35,7 @@ extern char cmdbuffer[BUFSIZE * (MAX_CMD_SIZE + 1) + CMDBUFFER_RESERVE_FRONT]; extern size_t bufindr; extern int buflen; extern bool cmdbuffer_front_already_processed; +extern bool cmdqueue_serial_disabled; // Type of a command, which is to be executed right now. #define CMDBUFFER_CURRENT_TYPE (cmdbuffer[bufindr]) @@ -65,8 +66,8 @@ extern void cmdqueue_dump_to_serial_single_line(int nr, const char *p); extern void cmdqueue_dump_to_serial(); #endif /* CMDBUFFER_DEBUG */ extern bool cmd_buffer_empty(); -extern void enquecommand(const char *cmd, bool from_progmem); -extern void enquecommand_front(const char *cmd, bool from_progmem); +extern void enquecommand(const char *cmd, bool from_progmem = false); +extern void enquecommand_front(const char *cmd, bool from_progmem = false); extern void repeatcommand_front(); extern bool is_buffer_empty(); extern void get_command(); diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index a6b5f109f..d7ddc5c8d 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -7,6 +7,7 @@ #include "Configuration_prusa.h" #include "language.h" #include "Marlin.h" +#include "cmdqueue.h" #include "mmu.h" #include diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 3c4e89260..9c7704e6f 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -8,6 +8,7 @@ #include "lcd.h" #include "Configuration.h" #include "Marlin.h" +#include "cmdqueue.h" #include "ultralcd.h" #include "language.h" #include "static_assert.h" diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index ab4af5e29..18b5d5e79 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -9,6 +9,7 @@ #include "Configuration_prusa.h" #include "fsensor.h" #include "cardreader.h" +#include "cmdqueue.h" #include "ultralcd.h" #include "sound.h" #include "printers.h" diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index cb4fc8aee..b4977c405 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -30,6 +30,7 @@ #include "Marlin.h" +#include "cmdqueue.h" #include "ultralcd.h" #include "sound.h" #include "temperature.h" @@ -632,7 +633,6 @@ void fanSpeedError(unsigned char _fan) { fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), MSG_FANCHECK_PRINT); break; } - // SERIAL_PROTOCOLLNRPGM(MSG_OK); //This ok messes things up with octoprint. } #endif //(defined(TACH_0) && TACH_0 >-1) || (defined(TACH_1) && TACH_1 > -1) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 63fea0e3f..e93047465 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1582,6 +1582,7 @@ void lcd_return_to_status() //! @brief Pause print, disable nozzle heater, move to park position void lcd_pause_print() { + SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); //pause for octoprint stop_and_save_print_to_ram(0.0, -default_retraction); lcd_return_to_status(); isPrintPaused = true; @@ -1589,7 +1590,6 @@ void lcd_pause_print() { lcd_commands_type = LcdCommands::LongPause; } - SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSED); //pause for octoprint } @@ -6740,6 +6740,7 @@ void lcd_resume_print() lcd_return_to_status(); lcd_reset_alert_level(); //for fan speed error if (fan_error_selftest()) return; //abort if error persists + cmdqueue_serial_disabled = false; lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS)); st_synchronize(); @@ -7352,6 +7353,7 @@ void lcd_print_stop() if (!card.sdprinting) { SERIAL_ECHOLNRPGM(MSG_OCTOPRINT_CANCEL); // for Octoprint } + cmdqueue_serial_disabled = false; //for when canceling a print with a fancheck CRITICAL_SECTION_START; @@ -8780,27 +8782,29 @@ static void lcd_selftest_screen_step(int _row, int _col, int _state, const char /** Menu action functions **/ static bool check_file(const char* filename) { - if (farm_mode) return true; + if (farm_mode) + return true; bool result = false; uint32_t filesize; card.openFile((char*)filename, true); filesize = card.getFileSize(); if (filesize > END_FILE_SECTION) { card.setIndex(filesize - END_FILE_SECTION); - } + cmdqueue_reset(); + cmdqueue_serial_disabled = true; - while (!card.eof() && !result) { + while (!card.eof() && !result) { card.sdprinting = true; get_command(); result = check_commands(); - } + + cmdqueue_serial_disabled = false; card.printingHasFinished(); strncpy_P(lcd_status_message, _T(WELCOME_MSG), LCD_WIDTH); lcd_finishstatus(); return result; - } static void menu_action_sdfile(const char* filename) From 0c305ee5f573c3b925e5089eb0bc8dae60b30143 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 28 Oct 2020 10:07:46 +0200 Subject: [PATCH 064/218] Fix warning --- Firmware/cmdqueue.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 5c5a71731..afdddfba2 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -97,8 +97,7 @@ void cmdqueue_reset() { while (buflen) { - uint8_t cmdqueue_current_type = *(cmdbuffer+bufindr); - // printf_P(PSTR("dumping: \"%s\" of type %hu\n"), cmdbuffer+bufindr+CMDHDRSIZE, cmdqueue_current_type); + // printf_P(PSTR("dumping: \"%s\" of type %hu\n"), cmdbuffer+bufindr+CMDHDRSIZE, CMDBUFFER_CURRENT_TYPE); ClearToSend(); cmdqueue_pop_front(); } From 023ccb0e895c4c936e5e2ceb49fd8a40c34c533b Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Mon, 9 Nov 2020 21:39:10 +0200 Subject: [PATCH 065/218] Fix double ok in M603 --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5376daefe..d47576cd8 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9205,8 +9205,8 @@ void FlushSerialRequestResend() // Execution of a command from a SD card will not be confirmed. void ClearToSend() { - previous_millis_cmd = _millis(); - if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)) + previous_millis_cmd = _millis(); + if (buflen && ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR))) SERIAL_PROTOCOLLNRPGM(MSG_OK); } From 176e2674b9b3bebdff40f3afc393ee1992801e9c Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Mon, 9 Nov 2020 21:39:22 +0200 Subject: [PATCH 066/218] Fix M105 ok hack --- 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 d47576cd8..c6f9e4b74 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6399,7 +6399,8 @@ Sigma_Exit: SERIAL_PROTOCOLPGM("ok "); gcode_M105(extruder); - return; + cmdqueue_pop_front(); //prevent an ok after the command since this command uses an ok at the beginning. + break; } From 396ee0fde25898a3b949a3df117b20eb332dd9d7 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 10 Nov 2020 10:06:10 +0100 Subject: [PATCH 067/218] Version changed (3.9.2 build 3524) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index a9bf23e99..45874e317 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.9.1" -#define FW_COMMIT_NR 3518 +#define FW_VERSION "3.9.2" +#define FW_COMMIT_NR 3524 // 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 From 43ace00a243cc221b8bfcdc4b61c2e5f16a784d4 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 12 Nov 2020 18:43:48 +0200 Subject: [PATCH 068/218] Fill the progress bar at the end and code optimizations --- Firmware/ultralcd.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 15d0d68c7..0a2236f4a 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8786,6 +8786,7 @@ static bool check_file(const char* filename) { const uint32_t filesize = card.getFileSize(); uint32_t startPos = 0; const uint16_t bytesToCheck = min(END_FILE_SECTION, filesize); + uint8_t blocksPrinted = 0; if (filesize > END_FILE_SECTION) { startPos = filesize - END_FILE_SECTION; card.setIndex(startPos); @@ -8793,23 +8794,23 @@ static bool check_file(const char* filename) { lcd_clear(); lcd_puts_at_P(0, 1, _i("Checking file"));////c=20 r=1 + lcd_set_cursor(0, 2); printf_P(PSTR("startPos=%lu\n"), startPos); while (!card.eof() && !result) { - lcd_set_cursor(0, 2); - for (int column = 0; column < 20; column++) { - const int8_t percent = ((card.get_sdpos() - startPos) * 100) / bytesToCheck; - if (column < (percent / 5)) - { - lcd_set_cursor(column, 2); - lcd_print('\xFF'); //simple progress bar - } - } + for (; blocksPrinted < (((card.get_sdpos() - startPos) * LCD_WIDTH) / bytesToCheck); blocksPrinted++) + lcd_print('\xFF'); //simple progress bar card.sdprinting = true; get_command(); result = check_commands(); } + + for (; blocksPrinted < LCD_WIDTH; blocksPrinted++) + lcd_print('\xFF'); //simple progress bar + _delay(100); //for the user to see the end of the progress bar. + card.printingHasFinished(); + strncpy_P(lcd_status_message, _T(WELCOME_MSG), LCD_WIDTH); lcd_finishstatus(); return result; From 807eddafb046bf15e68019244cff927980775ab5 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 13 Nov 2020 12:12:18 +0200 Subject: [PATCH 069/218] Remove debugging code --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0a2236f4a..0a6e47916 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8795,7 +8795,6 @@ static bool check_file(const char* filename) { lcd_clear(); lcd_puts_at_P(0, 1, _i("Checking file"));////c=20 r=1 lcd_set_cursor(0, 2); - printf_P(PSTR("startPos=%lu\n"), startPos); while (!card.eof() && !result) { for (; blocksPrinted < (((card.get_sdpos() - startPos) * LCD_WIDTH) / bytesToCheck); blocksPrinted++) lcd_print('\xFF'); //simple progress bar From f96f75bd171cf32afec9e876bc2ff3c2a76db5e7 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Mon, 16 Nov 2020 10:58:26 +0200 Subject: [PATCH 070/218] Fix warning and a bit of indentation Saved 64B of flash and 1B of SRAM --- Firmware/xyzcal.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 767024dbe..7179996d8 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -495,20 +495,22 @@ int8_t xyzcal_find_point_center2(uint16_t delay_us) xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1); if (has_temperature_compensation()){ - z0 = _Z - 20; // normal PINDA + z0 = _Z - 20; // normal PINDA return xyzcal_find_point_center2A(x0, y0, z0, delay_us); } else { // try searching harder, each PINDA is different + int8_t rv = 0; for(z0 = _Z - 20; z0 <= _Z + 140; z0 += 20 ){ // alternate PINDA - int8_t rv = xyzcal_find_point_center2A(x0, y0, z0, delay_us); + rv = xyzcal_find_point_center2A(x0, y0, z0, delay_us); printf_P(PSTR(" z0=%d"), z0); if( rv != 0 ){ - printf_P(PSTR("ok\n")); - return rv; + puts_P(PSTR("ok")); + break; } else { - printf_P(PSTR("fail\n")); + puts_P(PSTR("fail")); } } + return rv; } } From a8f4207df99a3530801addd13aa23349d08c29fb Mon Sep 17 00:00:00 2001 From: espr14 Date: Thu, 17 Dec 2020 18:19:36 +0100 Subject: [PATCH 071/218] New XYZ calibration algorithm --- Firmware/xyzcal.cpp | 814 +++++++++++++++++++------------------------- Firmware/xyzcal.h | 14 - 2 files changed, 358 insertions(+), 470 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 767024dbe..2130b223e 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -9,7 +9,6 @@ #include "temperature.h" #include "sm4.h" - #define XYZCAL_PINDA_HYST_MIN 20 //50um #define XYZCAL_PINDA_HYST_MAX 100 //250um #define XYZCAL_PINDA_HYST_DIF 5 //12.5um @@ -30,13 +29,83 @@ #define _Z ((int16_t)count_position[Z_AXIS]) #define _E ((int16_t)count_position[E_AXIS]) +#define X_PLUS 0 +#define X_MINUS 1 +#define Y_PLUS 0 +#define Y_MINUS 1 +#define Z_PLUS 0 +#define Z_MINUS 1 + #define _PI 3.14159265F +/// \returns positive value always +#define ABS(a) \ + ({ __typeof__ (a) _a = (a); \ + _a >= 0 ? _a : (-_a); }) + +/// \returns maximum of the two +#define MAX(a, b) \ + ({ __typeof__ (a) _a = (a); \ + __typeof__ (b) _b = (b); \ + _a >= _b ? _a : _b; }) + +/// \returns minimum of the two +#define MIN(a, b) \ + ({ __typeof__ (a) _a = (a); \ + __typeof__ (b) _b = (b); \ + _a <= _b ? _a : _b; }) + +/// swap values +#define SWAP(a, b) \ + ({ __typeof__ (a) c = (a); \ + a = (b); \ + b = c; }) + +/// Saturates value +/// \returns min if value is less than min +/// \returns max if value is more than min +/// \returns value otherwise +#define CLAMP(value, min, max) \ + ({ __typeof__ (value) a_ = (value); \ + __typeof__ (min) min_ = (min); \ + __typeof__ (max) max_ = (max); \ + ( a_ < min_ ? min_ : (a_ <= max_ ? a_ : max_)); }) + +/// position types +typedef int16_t pos_i16_t; +typedef long pos_i32_t; +typedef float pos_mm_t; +typedef int16_t usteps_t; + uint8_t check_pinda_0(); uint8_t check_pinda_1(); void xyzcal_update_pos(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); uint16_t xyzcal_calc_delay(uint16_t nd, uint16_t dd); +uint8_t round_to_u8(float f){ + return (uint8_t)(f + .5f); +} + +uint16_t round_to_u16(float f){ + return (uint16_t)(f + .5f); +} + +int16_t round_to_i16(float f){ + return (int16_t)(f + .5f); +} + +/// converts millimeters to integer position +pos_i16_t mm_2_pos(pos_mm_t mm){ + return (pos_i16_t)(0.5f + mm * 100); +} + +/// converts integer position to millimeters +pos_mm_t pos_2_mm(pos_i16_t pos){ + return pos * 0.01f; +} +pos_mm_t pos_2_mm(float pos){ + return pos * 0.01f; +} void xyzcal_meassure_enter(void) { @@ -142,6 +211,7 @@ uint16_t xyzcal_calc_delay(uint16_t, uint16_t) } #endif //SM4_ACCEL_TEST +/// Moves printer to absolute position [x,y,z] defined in integer position system bool xyzcal_lineXYZ_to(int16_t x, int16_t y, int16_t z, uint16_t delay_us, int8_t check_pinda) { // DBG(_n("xyzcal_lineXYZ_to x=%d y=%d z=%d check=%d\n"), x, y, z, check_pinda); @@ -152,12 +222,17 @@ bool xyzcal_lineXYZ_to(int16_t x, int16_t y, int16_t z, uint16_t delay_us, int8_ sm4_set_dir_bits(xyzcal_dm); sm4_stop_cb = check_pinda?((check_pinda<0)?check_pinda_0:check_pinda_1):0; xyzcal_sm4_delay = delay_us; -// uint32_t u = _micros(); - bool ret = sm4_line_xyze_ui(abs(x), abs(y), abs(z), 0)?true:false; -// u = _micros() - u; + // uint32_t u = _micros(); + bool ret = sm4_line_xyze_ui(abs(x), abs(y), abs(z), 0) ? true : false; + // u = _micros() - u; return ret; } +/// Moves printer to absolute position [x,y,z] defined in millimeters +bool xyzcal_lineXYZ_to_float(pos_mm_t x, pos_mm_t y, pos_mm_t z, uint16_t delay_us, int8_t check_pinda){ + return xyzcal_lineXYZ_to(mm_2_pos(x), mm_2_pos(y), mm_2_pos(z), delay_us, check_pinda); +} + bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radius, int16_t rotation, uint16_t delay_us, int8_t check_pinda, uint16_t* pad) { bool ret = false; @@ -171,7 +246,13 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi uint8_t k = 720 / (dad_max - dad_min); //delta calculation constant ad = 0; if (pad) ad = *pad % 720; + DBG(_n("xyzcal_spiral2 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad); + // lcd_set_cursor(0, 4); + // char text[10]; + // snprintf(text, 10, "%4d", z0); + // lcd_print(text); + for (; ad < 720; ad++) { if (radius > 0) @@ -200,6 +281,10 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi ad += dad; } if (pad) *pad = ad; + // if(ret){ + // lcd_set_cursor(0, 4); + // lcd_print(" "); + // } return ret; } @@ -275,426 +360,113 @@ int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t d } #endif //XYZCAL_MEASSURE_PINDA_HYSTEREZIS +void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ + if(!pixels) + return; + int16_t z = _Z; + uint16_t line_buffer[32]; + xyzcal_lineXYZ_to(cx, cy, z, delay_us, 0); + for (uint8_t r = 0; r < 32; r++){ ///< Y axis + xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); + for (int8_t d = 0; d < 2; ++d){ ///< direction + + // xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, z, 2 * delay_us, 0); + // xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 1); + // xyzcal_lineXYZ_to(_X, _Y, max_z, delay_us, -1); -void xyzcal_scan_pixels_32x32(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels) -{ - DBG(_n("xyzcal_scan_pixels_32x32 cx=%d cy=%d min_z=%d max_z=%d\n"), cx, cy, min_z, max_z); -// xyzcal_lineXYZ_to(cx - 1024, cy - 1024, max_z, 2*delay_us, 0); -// xyzcal_lineXYZ_to(cx, cy, max_z, delay_us, 0); - int16_t z = (int16_t)count_position[2]; - xyzcal_lineXYZ_to(cx, cy, z, 2*delay_us, 0); - for (uint8_t r = 0; r < 32; r++) - { -// int8_t _pinda = _PINDA; - xyzcal_lineXYZ_to((r&1)?(cx+1024):(cx-1024), cy - 1024 + r*64, z, 2*delay_us, 0); - xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 1); - xyzcal_lineXYZ_to(_X, _Y, max_z, delay_us, -1); - z = (int16_t)count_position[2]; - sm4_set_dir(X_AXIS, (r&1)?1:0); - for (uint8_t c = 0; c < 32; c++) - { - uint16_t sum = 0; - int16_t z_sum = 0; - for (uint8_t i = 0; i < 64; i++) - { - int8_t pinda = _PINDA; - int16_t pix = z - min_z; - pix += (pinda)?23:-24; - if (pix < 0) pix = 0; - if (pix > 255) pix = 255; - sum += pix; - z_sum += z; -// if (_pinda != pinda) -// { -// if (pinda) -// DBG(_n("!1 x=%d z=%d\n"), c*64+i, z+23); -// else -// DBG(_n("!0 x=%d z=%d\n"), c*64+i, z-24); -// } - sm4_set_dir(Z_AXIS, !pinda); - if (!pinda) - { - if (z > min_z) - { - sm4_do_step(Z_AXIS_MASK); - z--; - } + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + + z = _Z; + sm4_set_dir(X_AXIS, d); + for (uint8_t c = 0; c < 32; c++){ ///< X axis + + /// move up to un-trigger (surpress hysteresis) + sm4_set_dir(Z_AXIS, Z_PLUS); + while (z < max_z && _PINDA){ + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us); + z++; } - else - { - if (z < max_z) - { - sm4_do_step(Z_AXIS_MASK); - z++; - } + int16_t last_top_z = z; + + /// move down to trigger + sm4_set_dir(Z_AXIS, Z_MINUS); + while (z > min_z && !_PINDA){ + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us); + z--; + } + + count_position[2] = z; + if (d == 0){ + line_buffer[c] = (uint16_t)(z - min_z); + } else { + /// data reversed in X + // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); + /// save average of both directions + pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z - min_z)) / 2); } - sm4_do_step(X_AXIS_MASK); - delayMicroseconds(600); -// _pinda = pinda; - } - sum >>= 6; //div 64 - if (z_sum < 0) - { - z_sum = -z_sum; - z_sum >>= 6; //div 64 - z_sum = -z_sum; - } - else - z_sum >>= 6; //div 64 - if (pixels) pixels[((uint16_t)r<<5) + ((r&1)?(31-c):c)] = sum; -// DBG(_n("c=%d r=%d l=%d z=%d\n"), c, r, sum, z_sum); - count_position[0] += (r&1)?-64:64; - count_position[2] = z; - } - if (pixels) - for (uint8_t c = 0; c < 32; c++) - DBG(_n("%02x"), pixels[((uint16_t)r<<5) + c]); - DBG(_n("\n")); - } -// xyzcal_lineXYZ_to(cx, cy, z, 2*delay_us, 0); -} -void xyzcal_histo_pixels_32x32(uint8_t* pixels, uint16_t* histo) -{ - for (uint8_t l = 0; l < 16; l++) - histo[l] = 0; - for (uint8_t r = 0; r < 32; r++) - for (uint8_t c = 0; c < 32; c++) - { - uint8_t pix = pixels[((uint16_t)r<<5) + c]; - histo[pix >> 4]++; - } - for (uint8_t l = 0; l < 16; l++) - DBG(_n(" %2d %d\n"), l, histo[l]); -} - -void xyzcal_adjust_pixels(uint8_t* pixels, uint16_t* histo) -{ - uint8_t l; - uint16_t max_c = histo[1]; - uint8_t max_l = 1; - for (l = 1; l < 16; l++) - { - uint16_t c = histo[l]; - if (c > max_c) - { - max_c = c; - max_l = l; - } - } - DBG(_n("max_c=%2d max_l=%d\n"), max_c, max_l); - for (l = 14; l > 8; l--) - if (histo[l] >= 10) - break; - uint8_t pix_min = 0; - uint8_t pix_max = l << 4; - if (histo[0] < (32*32 - 144)) - { - pix_min = (max_l << 4) / 2; - } - uint8_t pix_dif = pix_max - pix_min; - DBG(_n(" min=%d max=%d dif=%d\n"), pix_min, pix_max, pix_dif); - for (int16_t i = 0; i < 32*32; i++) - { - uint16_t pix = pixels[i]; - if (pix > pix_min) pix -= pix_min; - else pix = 0; - pix <<= 8; - pix /= pix_dif; -// if (pix < 0) pix = 0; - if (pix > 255) pix = 255; - pixels[i] = (uint8_t)pix; - } - for (uint8_t r = 0; r < 32; r++) - { - for (uint8_t c = 0; c < 32; c++) - DBG(_n("%02x"), pixels[((uint16_t)r<<5) + c]); - DBG(_n("\n")); - } -} - -/* -void xyzcal_draw_pattern_12x12_in_32x32(uint8_t* pattern, uint32_t* pixels, int w, int h, uint8_t x, uint8_t y, uint32_t and, uint32_t or) -{ - for (int i = 0; i < 8; i++) - for (int j = 0; j < 8; j++) - { - int idx = (x + j) + w * (y + i); - if (pattern[i] & (1 << j)) - { - pixels[idx] &= and; - pixels[idx] |= or; + /// move to the next point + xyzcal_lineXYZ_to(((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx, _Y, (last_top_z + z) / 2, delay_us, 0); + z = _Z; } } + // DBG(_n("\n\n")); + } } -*/ -int16_t xyzcal_match_pattern_12x12_in_32x32(uint16_t* pattern, uint8_t* pixels, uint8_t c, uint8_t r) -{ +/// Returns rate of match +/// max match = 132, min match = 0 +uint8_t xyzcal_match_pattern_12x12_in_32x32(uint16_t* pattern, uint8_t* pixels, uint8_t c, uint8_t r){ uint8_t thr = 16; - int16_t match = 0; - for (uint8_t i = 0; i < 12; i++) - for (uint8_t j = 0; j < 12; j++) - { - if (((i == 0) || (i == 11)) && ((j < 2) || (j >= 10))) continue; //skip corners + uint8_t match = 0; + for (uint8_t i = 0; i < 12; ++i){ + for (uint8_t j = 0; j < 12; ++j){ + /// skip corners (3 pixels in each) + if (((i == 0) || (i == 11)) && ((j < 2) || (j >= 10))) continue; if (((j == 0) || (j == 11)) && ((i < 2) || (i >= 10))) continue; - uint16_t idx = (c + j) + 32 * (r + i); - uint8_t val = pixels[idx]; - if (pattern[i] & (1 << j)) - { - if (val > thr) match ++; - else match --; - } - else - { - if (val <= thr) match ++; - else match --; - } + const uint16_t idx = (c + j) + 32 * ((uint16_t)r + i); + const bool high_pix = pixels[idx] > thr; + const bool high_pat = pattern[i] & (1 << j); + if (high_pix == high_pat) + match++; } + } return match; } -int16_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, uint8_t* pc, uint8_t* pr) -{ +/// Searches for best match of pattern by shifting it +/// Returns rate of match and the best location +/// max match = 132, min match = 0 +uint8_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, uint8_t* pc, uint8_t* pr){ + if (!pixels || !pattern || !pc || !pr) + return -1; uint8_t max_c = 0; uint8_t max_r = 0; - int16_t max_match = 0; - for (uint8_t r = 0; r < (32 - 12); r++) - for (uint8_t c = 0; c < (32 - 12); c++) - { - int16_t match = xyzcal_match_pattern_12x12_in_32x32(pattern, pixels, c, r); - if (max_match < match) - { + uint8_t max_match = 0; + + // DBG(_n("Matching:\n")); + /// pixel precision + for (uint8_t r = 0; r < (32 - 12); ++r){ + for (uint8_t c = 0; c < (32 - 12); ++c){ + const uint8_t match = xyzcal_match_pattern_12x12_in_32x32(pattern, pixels, c, r); + if (max_match < match){ max_c = c; max_r = r; max_match = match; } + // DBG(_n("%d "), match); } - DBG(_n("max_c=%d max_r=%d max_match=%d\n"), max_c, max_r, max_match); - if (pc) *pc = max_c; - if (pr) *pr = max_r; + // DBG(_n("\n")); + } + DBG(_n("max_c=%f max_r=%f max_match=%d pixel\n"), max_c, max_r, max_match); + + *pc = max_c; + *pr = max_r; return max_match; } -#define MAX_DIAMETR 600 -#define XYZCAL_FIND_CENTER_DIAGONAL -int8_t xyzcal_find_point_center2A(int16_t x0, int16_t y0, int16_t z0, uint16_t delay_us); -int8_t xyzcal_find_point_center2(uint16_t delay_us) -{ - printf_P(PSTR("xyzcal_find_point_center2\n")); - int16_t x0 = _X; - int16_t y0 = _Y; - int16_t z0 = _Z; - printf_P(PSTR(" x0=%d\n"), x0); - printf_P(PSTR(" y0=%d\n"), y0); - printf_P(PSTR(" z0=%d\n"), z0); - - xyzcal_lineXYZ_to(_X, _Y, z0 + 400, 500, -1); - xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1); - xyzcal_lineXYZ_to(_X, _Y, z0 + 400, 500, -1); - xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1); - - if (has_temperature_compensation()){ - z0 = _Z - 20; // normal PINDA - return xyzcal_find_point_center2A(x0, y0, z0, delay_us); - } else { - // try searching harder, each PINDA is different - for(z0 = _Z - 20; z0 <= _Z + 140; z0 += 20 ){ // alternate PINDA - int8_t rv = xyzcal_find_point_center2A(x0, y0, z0, delay_us); - printf_P(PSTR(" z0=%d"), z0); - if( rv != 0 ){ - printf_P(PSTR("ok\n")); - return rv; - } else { - printf_P(PSTR("fail\n")); - } - } - } -} - -int8_t xyzcal_find_point_center2A(int16_t x0, int16_t y0, int16_t z0, uint16_t delay_us){ - xyzcal_lineXYZ_to(_X, _Y, z0, 500, 0); - -// xyzcal_lineXYZ_to(x0, y0, z0 - 100, 500, 1); -// z0 = _Z; -// printf_P(PSTR(" z0=%d\n"), z0); -// xyzcal_lineXYZ_to(x0, y0, z0 + 100, 500, -1); -// z0 += _Z; -// z0 /= 2; - printf_P(PSTR(" z0=%d\n"), z0); -// xyzcal_lineXYZ_to(x0, y0, z0 - 100, 500, 1); -// z0 = _Z - 10; - - int8_t ret = 1; - -#ifdef XYZCAL_FIND_CENTER_DIAGONAL - int32_t xc = 0; - int32_t yc = 0; - int16_t ad = 45; - for (; ad < 360; ad += 90) - { - float ar = (float)ad * _PI / 180; - int16_t x = x0 + MAX_DIAMETR * cos(ar); - int16_t y = y0 + MAX_DIAMETR * sin(ar); - if (!xyzcal_lineXYZ_to(x, y, z0, delay_us, -1)) - { - printf_P(PSTR("ERROR ad=%d\n"), ad); - ret = 0; - break; - } - xc += _X; - yc += _Y; - xyzcal_lineXYZ_to(x0, y0, z0, delay_us, 0); - } - if (ret) - { - printf_P(PSTR("OK\n"), ad); - x0 = xc / 4; - y0 = yc / 4; - printf_P(PSTR(" x0=%d\n"), x0); - printf_P(PSTR(" y0=%d\n"), y0); - } - -#else //XYZCAL_FIND_CENTER_DIAGONAL - xyzcal_lineXYZ_to(x0 - MAX_DIAMETR, y0, z0, delay_us, -1); - int16_t dx1 = x0 - _X; - if (dx1 >= MAX_DIAMETR) - { - printf_P(PSTR("!!! dx1 = %d\n"), dx1); - return 0; - } - xyzcal_lineXYZ_to(x0, y0, z0, delay_us, 0); - xyzcal_lineXYZ_to(x0 + MAX_DIAMETR, y0, z0, delay_us, -1); - int16_t dx2 = _X - x0; - if (dx2 >= MAX_DIAMETR) - { - printf_P(PSTR("!!! dx2 = %d\n"), dx2); - return 0; - } - xyzcal_lineXYZ_to(x0, y0, z0, delay_us, 0); - xyzcal_lineXYZ_to(x0 , y0 - MAX_DIAMETR, z0, delay_us, -1); - int16_t dy1 = y0 - _Y; - if (dy1 >= MAX_DIAMETR) - { - printf_P(PSTR("!!! dy1 = %d\n"), dy1); - return 0; - } - xyzcal_lineXYZ_to(x0, y0, z0, delay_us, 0); - xyzcal_lineXYZ_to(x0, y0 + MAX_DIAMETR, z0, delay_us, -1); - int16_t dy2 = _Y - y0; - if (dy2 >= MAX_DIAMETR) - { - printf_P(PSTR("!!! dy2 = %d\n"), dy2); - return 0; - } - printf_P(PSTR("dx1=%d\n"), dx1); - printf_P(PSTR("dx2=%d\n"), dx2); - printf_P(PSTR("dy1=%d\n"), dy1); - printf_P(PSTR("dy2=%d\n"), dy2); - - x0 += (dx2 - dx1) / 2; - y0 += (dy2 - dy1) / 2; - - printf_P(PSTR(" x0=%d\n"), x0); - printf_P(PSTR(" y0=%d\n"), y0); - -#endif //XYZCAL_FIND_CENTER_DIAGONAL - - xyzcal_lineXYZ_to(x0, y0, z0, delay_us, 0); - - return ret; -} - -#ifdef XYZCAL_FIND_POINT_CENTER -int8_t xyzcal_find_point_center(int16_t x0, int16_t y0, int16_t z0, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t turns) -{ - uint8_t n; - uint16_t ad; - float ar; - float _cos; - float _sin; - int16_t r_min = 0; - int16_t r_max = 0; - int16_t x_min = 0; - int16_t x_max = 0; - int16_t y_min = 0; - int16_t y_max = 0; - int16_t r = 10; - int16_t x = x0; - int16_t y = y0; - int16_t z = z0; - int8_t _pinda = _PINDA; - for (n = 0; n < turns; n++) - { - uint32_t r_sum = 0; - for (ad = 0; ad < 720; ad++) - { - ar = ad * _PI / 360; - _cos = cos(ar); - _sin = sin(ar); - x = x0 + (int)(_cos * r); - y = y0 + (int)(_sin * r); - xyzcal_lineXYZ_to(x, y, z, 1000, 0); - int8_t pinda = _PINDA; - if (pinda) - r += 1; - else - { - r -= 1; - ad--; - r_sum -= r; - } - if (ad == 0) - { - x_min = x0; - x_max = x0; - y_min = y0; - y_max = y0; - r_min = r; - r_max = r; - } - else if (pinda) - { - if (x_min > x) x_min = (2*x + x_min) / 3; - if (x_max < x) x_max = (2*x + x_max) / 3; - if (y_min > y) y_min = (2*y + y_min) / 3; - if (y_max < y) y_max = (2*y + y_max) / 3; -/* if (x_min > x) x_min = x; - if (x_max < x) x_max = x; - if (y_min > y) y_min = y; - if (y_max < y) y_max = y;*/ - if (r_min > r) r_min = r; - if (r_max < r) r_max = r; - } - r_sum += r; -/* if (_pinda != pinda) - { - if (pinda) - DBG(_n("!1 x=%d y=%d\n"), x, y); - else - DBG(_n("!0 x=%d y=%d\n"), x, y); - }*/ - _pinda = pinda; -// DBG(_n("x=%d y=%d rx=%d ry=%d\n"), x, y, rx, ry); - } - DBG(_n("x_min=%d x_max=%d y_min=%d y_max=%d r_min=%d r_max=%d r_avg=%d\n"), x_min, x_max, y_min, y_max, r_min, r_max, r_sum / 720); - if ((n > 2) && (n & 1)) - { - x0 += (x_min + x_max); - y0 += (y_min + y_max); - x0 /= 3; - y0 /= 3; - int rx = (x_max - x_min) / 2; - int ry = (y_max - y_min) / 2; - r = (rx + ry) / 3;//(rx < ry)?rx:ry; - DBG(_n("x0=%d y0=%d r=%d\n"), x0, y0, r); - } - } - xyzcal_lineXYZ_to(x0, y0, z, 200, 0); -} -#endif //XYZCAL_FIND_POINT_CENTER - - uint8_t xyzcal_xycoords2point(int16_t x, int16_t y) { uint8_t ix = (x > 10000)?1:0; @@ -742,91 +514,221 @@ bool xyzcal_searchZ(void) return false; } -bool xyzcal_scan_and_process(void) -{ +/// returns value of any location within data +/// uses bilinear interpolation +float get_value(uint8_t * matrix_32x32, float c, float r){ + if (c <= 0 || r <= 0 || c >= 31 || r >= 31) + return 0; + + /// calculate weights of nearby points + const float wc1 = c - floor(c); + const float wr1 = r - floor(r); + const float wc0 = 1 - wc1; + const float wr0 = 1 - wr1; + + const float w00 = wc0 * wr0; + const float w01 = wc0 * wr1; + const float w10 = wc1 * wr0; + const float w11 = wc1 * wr1; + + const uint16_t c0 = c; + const uint16_t c1 = c0 + 1; + const uint16_t r0 = r; + const uint16_t r1 = r0 + 1; + + const uint16_t idx00 = c0 + 32 * r0; + const uint16_t idx01 = c0 + 32 * r1; + const uint16_t idx10 = c1 + 32 * r0; + const uint16_t idx11 = c1 + 32 * r1; + + /// bilinear resampling + return w00 * matrix_32x32[idx00] + w01 * matrix_32x32[idx01] + w10 * matrix_32x32[idx10] + w11 * matrix_32x32[idx11]; +} + +const constexpr float m_infinity = -1000.f; + +/// replaces the highest number by m_infinity +void remove_highest(float *points, const uint8_t num_points){ + if (num_points <= 0) + return; + + float max = points[0]; + uint8_t max_i = 0; + for (uint8_t i = 0; i < num_points; ++i){ + if (max < points[i]){ + max = points[i]; + max_i = i; + } + } + points[max_i] = m_infinity; +} + +/// return the highest number in the list +float highest(float *points, const uint8_t num_points){ + if (num_points <= 0) + return 0; + + float max = points[0]; + for (uint8_t i = 0; i < num_points; ++i){ + if (max < points[i]){ + max = points[i]; + } + } + return max; +} + +/// Searches for circle iteratively +/// Uses points on the perimeter. If point is high it pushes circle out of the center (shift or change of radius), +/// otherwise to the center. +/// Algorithm is stopped after fixed number of iterations. Move is limited to 0.5 px per iteration. +void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t iterations){ + /// circle of 10.5 diameter has 33 in circumference, don't go much above + const constexpr uint8_t num_points = 33; + float points[num_points]; + float pi_2_div_num_points = 2 * M_PI / num_points; + const constexpr uint8_t target_z = 32; ///< target z height of the circle + float norm; + float angle; + float max_val = 0.5f; + const uint8_t blocks = 7; + float shifts_x[blocks]; + float shifts_y[blocks]; + float shifts_r[blocks]; + + for (int8_t i = iterations; i > 0; --i){ + + // DBG(_n(" [%f, %f][%f] circle\n"), x, y, r); + + /// read points on the circle + for (uint8_t p = 0; p < num_points; ++p){ + angle = p * pi_2_div_num_points; + points[p] = get_value(matrix_32x32, r * cos(angle) + x, r * sin(angle) + y) - target_z; + // DBG(_n("%f "), points[p]); + } + // DBG(_n(" points\n")); + + /// sum blocks + for (uint8_t j = 0; j < blocks; ++j){ + shifts_x[j] = shifts_y[j] = shifts_r[j] = 0; + /// first part + for (uint8_t p = 0; p < num_points * 3 / 4; ++p){ + uint8_t idx = (p + j * num_points / blocks) % num_points; + + angle = idx * pi_2_div_num_points; + shifts_x[j] += cos(angle) * points[idx]; + shifts_y[j] += sin(angle) * points[idx]; + shifts_r[j] += points[idx]; + } + } + + /// remove extreme values (slow but simple) + for (uint8_t j = 0; j < blocks / 2; ++j){ + remove_highest(shifts_x, blocks); + remove_highest(shifts_y, blocks); + remove_highest(shifts_r, blocks); + } + + /// median is the highest now + norm = 1.f / (32.f * (num_points * 3 / 4)); + x += CLAMP(highest(shifts_x, blocks) * norm, -max_val, max_val); + y += CLAMP(highest(shifts_y, blocks) * norm, -max_val, max_val); + r += CLAMP(highest(shifts_r, blocks) * norm, -max_val, max_val); + + r = MAX(2, r); + + } + DBG(_n(" [%f, %f][%f] final circle\n"), x, y, r); +} + +/// Prints matrix in hex to debug output (serial line) +void print_image(uint8_t *matrix_32x32){ + for (uint8_t y = 0; y < 32; ++y){ + const uint16_t idx_y = y * 32; + for (uint8_t x = 0; x < 32; ++x){ + DBG(_n("%02x"), matrix_32x32[idx_y + x]); + } + DBG(_n("\n")); + } + DBG(_n("\n")); +} + +/// scans area around the current head location and +/// searches for the center of the calibration pin +bool xyzcal_scan_and_process(void){ DBG(_n("sizeof(block_buffer)=%d\n"), sizeof(block_t)*BLOCK_BUFFER_SIZE); -// DBG(_n("sizeof(pixels)=%d\n"), 32*32); -// DBG(_n("sizeof(histo)=%d\n"), 2*16); -// DBG(_n("sizeof(pattern)=%d\n"), 2*12); - DBG(_n("sizeof(total)=%d\n"), 32*32+2*16+2*12); bool ret = false; int16_t x = _X; int16_t y = _Y; int16_t z = _Z; - uint8_t* pixels = (uint8_t*)block_buffer; - xyzcal_scan_pixels_32x32(x, y, z - 72, 2400, 200, pixels); + uint8_t *matrix32 = (uint8_t *)block_buffer; + uint16_t *pattern = (uint16_t *)(matrix32 + 32 * 32); - uint16_t* histo = (uint16_t*)(pixels + 32*32); - xyzcal_histo_pixels_32x32(pixels, histo); + xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 300, matrix32); + print_image(matrix32); - xyzcal_adjust_pixels(pixels, histo); - - uint16_t* pattern = (uint16_t*)(histo + 2*16); - for (uint8_t i = 0; i < 12; i++) - { + for (uint8_t i = 0; i < 12; i++){ pattern[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern + i)); // DBG(_n(" pattern[%d]=%d\n"), i, pattern[i]); } - uint8_t c = 0; - uint8_t r = 0; - if (xyzcal_find_pattern_12x12_in_32x32(pixels, pattern, &c, &r) > 66) //total pixels=144, corner=12 (1/2 = 66) - { - DBG(_n(" pattern found at %d %d\n"), c, r); - c += 6; - r += 6; - x += ((int16_t)c - 16) << 6; - y += ((int16_t)r - 16) << 6; - DBG(_n(" x=%d y=%d z=%d\n"), x, y, z); + + /// SEARCH FOR BINARY CIRCLE + uint8_t uc = 0; + uint8_t ur = 0; + /// max match = 132, 1/2 good = 66, 2/3 good = 88 + if (xyzcal_find_pattern_12x12_in_32x32(matrix32, pattern, &uc, &ur) >= 88){ + /// find precise circle + /// move to the center of the pattern (+5.5) + float xf = uc + 5.5f; + float yf = ur + 5.5f; + float radius = 5; ///< default radius + const uint8_t iterations = 20; + dynamic_circle(matrix32, xf, yf, radius, iterations); + if (ABS(xf - uc + 5.5f) > 3 || ABS(yf - ur + 5.5f) > 3 || ABS(radius - 5) > 3){ + /// dynamic algorithm diverged, use original position instead + xf = uc + 5.5f; + yf = ur + 5.5f; + } + + /// move to the center of area and convert to position + xf = (float)x + (xf - 15.5f) * 64; + yf = (float)y + (yf - 15.5f) * 64; + DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); + x = round_to_i16(xf); + y = round_to_i16(yf); xyzcal_lineXYZ_to(x, y, z, 200, 0); ret = true; } + + /// wipe buffer for (uint16_t i = 0; i < sizeof(block_t)*BLOCK_BUFFER_SIZE; i++) - pixels[i] = 0; + matrix32[i] = 0; return ret; } -bool xyzcal_find_bed_induction_sensor_point_xy(void) -{ - DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); +bool xyzcal_find_bed_induction_sensor_point_xy(void){ bool ret = false; + + DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); st_synchronize(); - int16_t x = _X; - int16_t y = _Y; - int16_t z = _Z; + pos_i16_t x = _X; + pos_i16_t y = _Y; + pos_i16_t z = _Z; + uint8_t point = xyzcal_xycoords2point(x, y); - x = pgm_read_word((uint16_t*)(xyzcal_point_xcoords + point)); - y = pgm_read_word((uint16_t*)(xyzcal_point_ycoords + point)); + x = pgm_read_word((uint16_t *)(xyzcal_point_xcoords + point)); + y = pgm_read_word((uint16_t *)(xyzcal_point_ycoords + point)); DBG(_n("point=%d x=%d y=%d z=%d\n"), point, x, y, z); xyzcal_meassure_enter(); xyzcal_lineXYZ_to(x, y, z, 200, 0); - if (xyzcal_searchZ()) - { + + if (xyzcal_searchZ()){ int16_t z = _Z; xyzcal_lineXYZ_to(x, y, z, 200, 0); - if (xyzcal_scan_and_process()) - { - if (xyzcal_find_point_center2(500)) - { - uint32_t x_avg = 0; - uint32_t y_avg = 0; - uint8_t n; for (n = 0; n < 4; n++) - { - if (!xyzcal_find_point_center2(1000)) break; - x_avg += _X; - y_avg += _Y; - } - if (n == 4) - { - xyzcal_lineXYZ_to(x_avg >> 2, y_avg >> 2, _Z, 200, 0); - ret = true; - } - } - } + ret = xyzcal_scan_and_process(); } xyzcal_meassure_leave(); return ret; } - #endif //NEW_XYZCAL diff --git a/Firmware/xyzcal.h b/Firmware/xyzcal.h index 5590396e4..348ff3ce0 100644 --- a/Firmware/xyzcal.h +++ b/Firmware/xyzcal.h @@ -17,20 +17,6 @@ extern bool xyzcal_spiral8(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16 //extern int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t samples); -extern void xyzcal_scan_pixels_32x32(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels); - -extern void xyzcal_histo_pixels_32x32(uint8_t* pixels, uint16_t* histo); - -extern void xyzcal_adjust_pixels(uint8_t* pixels, uint16_t* histo); - -extern int16_t xyzcal_match_pattern_12x12_in_32x32(uint16_t* pattern, uint8_t* pixels, uint8_t x, uint8_t y); - -extern int16_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, uint8_t* pc, uint8_t* pr); - -extern int8_t xyzcal_find_point_center2(uint16_t delay_us); - -//extern int8_t xyzcal_find_point_center(int16_t x0, int16_t y0, int16_t z0, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t turns); - extern bool xyzcal_searchZ(void); extern bool xyzcal_scan_and_process(void); From ccf26e4e7a7c3ca1d476f6d5f40c8da523fe0fe2 Mon Sep 17 00:00:00 2001 From: espr14 Date: Fri, 18 Dec 2020 20:04:00 +0100 Subject: [PATCH 072/218] Basic acceleration --- Firmware/xyzcal.cpp | 54 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 2130b223e..3a794f9bf 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -360,20 +360,36 @@ int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t d } #endif //XYZCAL_MEASSURE_PINDA_HYSTEREZIS +uint8_t slow_down_z(uint16_t delay_us){ + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us / 3 * 4); + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us * 2); + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us * 4); + return 3; +} + +uint8_t speed_up_z(int16_t &z, uint8_t direction, uint16_t delay_us){ + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us * 4); + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us * 2); + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us / 3 * 4); + return 3; +} + void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ if(!pixels) return; int16_t z = _Z; + int16_t z_trig; uint16_t line_buffer[32]; - xyzcal_lineXYZ_to(cx, cy, z, delay_us, 0); + xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); - for (int8_t d = 0; d < 2; ++d){ ///< direction - - // xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, z, 2 * delay_us, 0); - // xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 1); - // xyzcal_lineXYZ_to(_X, _Y, max_z, delay_us, -1); - + for (int8_t d = 0; d < 2; ++d){ ///< direction xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); z = _Z; @@ -382,29 +398,47 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ /// move up to un-trigger (surpress hysteresis) sm4_set_dir(Z_AXIS, Z_PLUS); + z += speed_up_z(delay_us); while (z < max_z && _PINDA){ sm4_do_step(Z_AXIS_MASK); delayMicroseconds(delay_us); z++; } int16_t last_top_z = z; + z += slow_down_z(delay_us); /// move down to trigger sm4_set_dir(Z_AXIS, Z_MINUS); + + /// speed up + do (){ + if (z <= min_z || _PINDA) break; + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us * 4); + if (z <= min_z || _PINDA) break; + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us * 2); + if (z <= min_z || _PINDA) break; + sm4_do_step(Z_AXIS_MASK); + delayMicroseconds(delay_us / 3 * 4); + } while (0); + while (z > min_z && !_PINDA){ sm4_do_step(Z_AXIS_MASK); delayMicroseconds(delay_us); z--; } - + z_trig = z; + z -= slow_down_z(delay_us); + count_position[2] = z; if (d == 0){ - line_buffer[c] = (uint16_t)(z - min_z); + line_buffer[c] = (uint16_t)(z_trig - min_z); } else { /// data reversed in X // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); /// save average of both directions - pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z - min_z)) / 2); + pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } /// move to the next point From f39a0999e1d0aefe7949c52e170c6f67e11591d0 Mon Sep 17 00:00:00 2001 From: espr14 Date: Fri, 18 Dec 2020 21:33:43 +0100 Subject: [PATCH 073/218] Prepare full acceleration control --- Firmware/xyzcal.cpp | 49 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 3a794f9bf..1c03c4c3f 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -36,6 +36,11 @@ #define Z_PLUS 0 #define Z_MINUS 1 +/// 10000 = 1 mm/s +#define MAX_DELAY 10000 +#define Z_ACCEL 300 +#define XY_ACCEL 1000 + #define _PI 3.14159265F /// \returns positive value always @@ -360,8 +365,40 @@ int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t d } #endif //XYZCAL_MEASSURE_PINDA_HYSTEREZIS -uint8_t slow_down_z(uint16_t delay_us){ - sm4_do_step(Z_AXIS_MASK); +void accelerate(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ + sm4_do_step(axis); + + if (acc > 0 && delay_us == min_delay_us){ + delayMicroseconds(delay_us); + return; + } + + // v1 = v0 + a * t + // 0.01 = length of a step + const float d0 = delay_us * 0.000001f; + const float v1 = (0.01f / d0 + acc * d0); + uint16_t d1; + if (v1 <= 0.1f){ + d1 = MAX_DELAY; ///< already too slow so it wants to move back + } else { + d1 = MAX(min_delay_us, round_to_u16(0.01f / v1)); + } + + /// make sure delay has changed a bit at least + if (d1 == delay_us && acc != 0){ + if (acc > 0) + d1--; + else + d1++; + } + + delayMicroseconds(d1); + delay_us = d1; +} + + +uint8_t slow_down_z(uint8_t axis, uint16_t delay_us){ + sm4_do_step(axis); delayMicroseconds(delay_us / 3 * 4); sm4_do_step(Z_AXIS_MASK); delayMicroseconds(delay_us * 2); @@ -370,7 +407,7 @@ uint8_t slow_down_z(uint16_t delay_us){ return 3; } -uint8_t speed_up_z(int16_t &z, uint8_t direction, uint16_t delay_us){ +uint8_t speed_up_z(uint8_t axis, uint16_t delay_us){ sm4_do_step(Z_AXIS_MASK); delayMicroseconds(delay_us * 4); sm4_do_step(Z_AXIS_MASK); @@ -386,6 +423,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ int16_t z = _Z; int16_t z_trig; uint16_t line_buffer[32]; + uint16_t current_delay_us = MAX_DELAY; xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); @@ -398,10 +436,9 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ /// move up to un-trigger (surpress hysteresis) sm4_set_dir(Z_AXIS, Z_PLUS); - z += speed_up_z(delay_us); + current_delay_us = MAX_DELAY; while (z < max_z && _PINDA){ - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us); + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, delay_us); z++; } int16_t last_top_z = z; From 9b55ff9de1599ebf81cfb3f9853b00f950351e7f Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 13:05:26 +0100 Subject: [PATCH 074/218] Acceleration up and down --- Firmware/xyzcal.cpp | 163 +++++++++++++++++++++++++++++--------------- 1 file changed, 107 insertions(+), 56 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 1c03c4c3f..fc7597b2f 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -36,8 +36,11 @@ #define Z_PLUS 0 #define Z_MINUS 1 -/// 10000 = 1 mm/s +/// Max. jerk in PrusaSlicer, 10000 = 1 mm/s #define MAX_DELAY 10000 +#define MIN_SPEED (0.01f / (MAX_DELAY * 0.000001f)) +/// 200 = 50 mm/s +#define Z_MIN_DELAY 200 #define Z_ACCEL 300 #define XY_ACCEL 1000 @@ -76,6 +79,11 @@ __typeof__ (max) max_ = (max); \ ( a_ < min_ ? min_ : (a_ <= max_ ? a_ : max_)); }) +/// \returns square of the value +#define SQR(a) \ + ({ __typeof__ (a) a_ = (a); \ + (a_ * a_); }) + /// position types typedef int16_t pos_i16_t; typedef long pos_i32_t; @@ -365,9 +373,11 @@ int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t d } #endif //XYZCAL_MEASSURE_PINDA_HYSTEREZIS +/// Accelerate up to max.speed (defined by @min_delay_us) void accelerate(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ sm4_do_step(axis); + /// keep max speed (avoid extra computation) if (acc > 0 && delay_us == min_delay_us){ delayMicroseconds(delay_us); return; @@ -375,47 +385,66 @@ void accelerate(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_dela // v1 = v0 + a * t // 0.01 = length of a step - const float d0 = delay_us * 0.000001f; - const float v1 = (0.01f / d0 + acc * d0); - uint16_t d1; - if (v1 <= 0.1f){ - d1 = MAX_DELAY; ///< already too slow so it wants to move back + const float t0 = delay_us * 0.000001f; + const float v1 = (0.01f / t0 + acc * t0); + uint16_t t1; + if (v1 <= 0.16f){ ///< slowest speed convertible to uint16_t delay + t1 = MAX_DELAY; ///< already too slow so it wants to move back } else { - d1 = MAX(min_delay_us, round_to_u16(0.01f / v1)); + /// don't exceed max.speed + t1 = MAX(min_delay_us, round_to_u16(0.01f / v1 * 1000000.f)); } /// make sure delay has changed a bit at least - if (d1 == delay_us && acc != 0){ + if (t1 == delay_us && acc != 0){ if (acc > 0) - d1--; + t1--; else - d1++; + t1++; } - delayMicroseconds(d1); - delay_us = d1; + //DBG(_n("%d "), t1); + + delayMicroseconds(t1); + delay_us = t1; } +void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps){ + if (steps <= 0 || dec <= 0) + return; -uint8_t slow_down_z(uint8_t axis, uint16_t delay_us){ - sm4_do_step(axis); - delayMicroseconds(delay_us / 3 * 4); - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us * 2); - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us * 4); - return 3; + /// deceleration distance in steps, s = 1/2 v^2 / a + uint16_t s = round_to_u16(100 * 0.5f * SQR(0.01f) / (SQR((float)delay_us) * dec)); + if (steps > s){ + /// go steady + sm4_do_step(axis) + delayMicroseconds(delay_us); + } else { + /// decelerate + accelerate(axis, -dec, &delay_us, min_delay_us); + } + --steps; } -uint8_t speed_up_z(uint8_t axis, uint16_t delay_us){ - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us * 4); - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us * 2); - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us / 3 * 4); - return 3; -} +// uint8_t slow_down_z(uint8_t axis, uint16_t delay_us){ +// sm4_do_step(axis); +// delayMicroseconds(delay_us / 3 * 4); +// sm4_do_step(Z_AXIS_MASK); +// delayMicroseconds(delay_us * 2); +// sm4_do_step(Z_AXIS_MASK); +// delayMicroseconds(delay_us * 4); +// return 3; +// } + +// uint8_t speed_up_z(uint8_t axis, uint16_t delay_us){ +// sm4_do_step(Z_AXIS_MASK); +// delayMicroseconds(delay_us * 4); +// sm4_do_step(Z_AXIS_MASK); +// delayMicroseconds(delay_us * 2); +// sm4_do_step(Z_AXIS_MASK); +// delayMicroseconds(delay_us / 3 * 4); +// return 3; +// } void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ if(!pixels) @@ -423,8 +452,12 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ int16_t z = _Z; int16_t z_trig; uint16_t line_buffer[32]; - uint16_t current_delay_us = MAX_DELAY; + uint16_t current_delay_us = MAX_DELAY; ///< defines current speed xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); + uint16_t min_decel_z; + int16_t start_z; + int16_t last_top_z; + for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); for (int8_t d = 0; d < 2; ++d){ ///< direction @@ -433,40 +466,58 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ z = _Z; sm4_set_dir(X_AXIS, d); for (uint8_t c = 0; c < 32; c++){ ///< X axis - + /// move up to un-trigger (surpress hysteresis) sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up from stop, go half the way current_delay_us = MAX_DELAY; - while (z < max_z && _PINDA){ - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, delay_us); - z++; + for (start_z = z; z < (max_z + start_z) / 2; ++z){ + if (!_PINDA){ + last_top_z = z; + break; + } + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } + + if(_PINDA){ + uint16_t steps_to_go = MAX(0, max_z - z); + while (_PINDA && z < max_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + ++z; + } + last_top_z = z; + } + /// slow down to stop + while (current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + ++z; } - int16_t last_top_z = z; - z += slow_down_z(delay_us); /// move down to trigger sm4_set_dir(Z_AXIS, Z_MINUS); - /// speed up - do (){ - if (z <= min_z || _PINDA) break; - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us * 4); - if (z <= min_z || _PINDA) break; - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us * 2); - if (z <= min_z || _PINDA) break; - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us / 3 * 4); - } while (0); - - while (z > min_z && !_PINDA){ - sm4_do_step(Z_AXIS_MASK); - delayMicroseconds(delay_us); - z--; + current_delay_us = MAX_DELAY; + for (start_z = z; z > (min_z + start_z) / 2; --z){ + if (_PINDA){ + z_trig = z; + break; + } + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } + /// slow down + if(!_PINDA){ + uint16_t steps_to_go = MAX(0, z - min_z); + while (!_PINDA && z > min_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + --z; + } + z_trig = z; + } + /// slow down to stop + while (z > min_z && current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + --z; } - z_trig = z; - z -= slow_down_z(delay_us); count_position[2] = z; if (d == 0){ @@ -735,7 +786,7 @@ bool xyzcal_scan_and_process(void){ uint8_t *matrix32 = (uint8_t *)block_buffer; uint16_t *pattern = (uint16_t *)(matrix32 + 32 * 32); - xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 300, matrix32); + xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 600, matrix32); print_image(matrix32); for (uint8_t i = 0; i < 12; i++){ From 27ff6b0057380e467f67867851a5ebcba23961f9 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 13:11:48 +0100 Subject: [PATCH 075/218] Fix build --- Firmware/xyzcal.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index fc7597b2f..18b4de9e1 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -417,11 +417,11 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) uint16_t s = round_to_u16(100 * 0.5f * SQR(0.01f) / (SQR((float)delay_us) * dec)); if (steps > s){ /// go steady - sm4_do_step(axis) + sm4_do_step(axis); delayMicroseconds(delay_us); } else { /// decelerate - accelerate(axis, -dec, &delay_us, min_delay_us); + accelerate(axis, -dec, delay_us, delay_us); } --steps; } @@ -454,7 +454,6 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ uint16_t line_buffer[32]; uint16_t current_delay_us = MAX_DELAY; ///< defines current speed xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); - uint16_t min_decel_z; int16_t start_z; int16_t last_top_z; @@ -467,6 +466,9 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ sm4_set_dir(X_AXIS, d); for (uint8_t c = 0; c < 32; c++){ ///< X axis + z_trig = min_z; + last_top_z = max_z; + /// move up to un-trigger (surpress hysteresis) sm4_set_dir(Z_AXIS, Z_PLUS); /// speed up from stop, go half the way From 9a59369c77b28ad45dcd7ee82e57e014413545b9 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 15:32:09 +0100 Subject: [PATCH 076/218] Diagonal acceleration --- Firmware/xyzcal.cpp | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 18b4de9e1..d82877d8a 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -455,7 +455,8 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ uint16_t current_delay_us = MAX_DELAY; ///< defines current speed xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; - int16_t last_top_z; + // int16_t last_top_z; + uint16_t steps_to_go; for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); @@ -475,7 +476,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ current_delay_us = MAX_DELAY; for (start_z = z; z < (max_z + start_z) / 2; ++z){ if (!_PINDA){ - last_top_z = z; + // last_top_z = z; break; } accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); @@ -487,7 +488,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); ++z; } - last_top_z = z; + // last_top_z = z; } /// slow down to stop while (current_delay_us < MAX_DELAY){ @@ -508,7 +509,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ } /// slow down if(!_PINDA){ - uint16_t steps_to_go = MAX(0, z - min_z); + steps_to_go = MAX(0, z - min_z); while (!_PINDA && z > min_z){ go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); --z; @@ -531,9 +532,30 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } - /// move to the next point - xyzcal_lineXYZ_to(((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx, _Y, (last_top_z + z) / 2, delay_us, 0); - z = _Z; + /// move to the next point and move Z up diagonally + current_delay_us = MAX_DELAY; + // const int8_t dir = (d & 1) ? -1 : 1; + const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; + const int16_t length_x = ABS(end_x - _X); + const int16_t half_x = length_x / 2; + int16_t x = 0; + + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up + for (x = 0; x <= half_x; ++x, ++z){ + accelerate(X_AXIS_MASK | Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } + /// slow down + steps_to_go = length_x - x; + for (; x < length_x; ++x, ++z){ + go_and_stop(X_AXIS_MASK | Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + } + + count_position[0] = end_x; + count_position[2] = z; + + // xyzcal_lineXYZ_to(((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx, _Y, (last_top_z + z) / 2, delay_us, 0); + // z = _Z; } } // DBG(_n("\n\n")); From 3c9168f8f6c5c27c73b8b8442c4a7922b748d737 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 15:52:25 +0100 Subject: [PATCH 077/218] Optimize diagonal --- Firmware/xyzcal.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index d82877d8a..b25be9711 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -539,16 +539,18 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ const int16_t length_x = ABS(end_x - _X); const int16_t half_x = length_x / 2; int16_t x = 0; - + /// don't go up if PINDA not triggered + int8_t axis = _PINDA ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + sm4_set_dir(Z_AXIS, Z_PLUS); /// speed up for (x = 0; x <= half_x; ++x, ++z){ - accelerate(X_AXIS_MASK | Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); } /// slow down steps_to_go = length_x - x; for (; x < length_x; ++x, ++z){ - go_and_stop(X_AXIS_MASK | Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); } count_position[0] = end_x; From de23a845b44d89f803d6a048254095fe27cd5354 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 15:53:51 +0100 Subject: [PATCH 078/218] Remove unused --- Firmware/xyzcal.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index b25be9711..af68ea229 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -455,7 +455,6 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ uint16_t current_delay_us = MAX_DELAY; ///< defines current speed xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; - // int16_t last_top_z; uint16_t steps_to_go; for (uint8_t r = 0; r < 32; r++){ ///< Y axis @@ -468,7 +467,6 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ for (uint8_t c = 0; c < 32; c++){ ///< X axis z_trig = min_z; - last_top_z = max_z; /// move up to un-trigger (surpress hysteresis) sm4_set_dir(Z_AXIS, Z_PLUS); @@ -476,7 +474,6 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ current_delay_us = MAX_DELAY; for (start_z = z; z < (max_z + start_z) / 2; ++z){ if (!_PINDA){ - // last_top_z = z; break; } accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); @@ -488,7 +485,6 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); ++z; } - // last_top_z = z; } /// slow down to stop while (current_delay_us < MAX_DELAY){ @@ -552,12 +548,8 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ for (; x < length_x; ++x, ++z){ go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); } - count_position[0] = end_x; count_position[2] = z; - - // xyzcal_lineXYZ_to(((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx, _Y, (last_top_z + z) / 2, delay_us, 0); - // z = _Z; } } // DBG(_n("\n\n")); From 744763f0a9f1f20546d09eda6560553497ce434f Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 17:34:54 +0100 Subject: [PATCH 079/218] Fix diagonal movement --- Firmware/xyzcal.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index af68ea229..df6f12b30 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -41,7 +41,7 @@ #define MIN_SPEED (0.01f / (MAX_DELAY * 0.000001f)) /// 200 = 50 mm/s #define Z_MIN_DELAY 200 -#define Z_ACCEL 300 +#define Z_ACCEL 5000 #define XY_ACCEL 1000 #define _PI 3.14159265F @@ -536,17 +536,22 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ const int16_t half_x = length_x / 2; int16_t x = 0; /// don't go up if PINDA not triggered - int8_t axis = _PINDA ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + const bool up = _PINDA; + int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; sm4_set_dir(Z_AXIS, Z_PLUS); /// speed up - for (x = 0; x <= half_x; ++x, ++z){ + for (x = 0; x <= half_x; ++x){ accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + if (up) + ++z; } /// slow down steps_to_go = length_x - x; - for (; x < length_x; ++x, ++z){ + for (; x < length_x; ++x){ go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); + if (up) + ++z; } count_position[0] = end_x; count_position[2] = z; @@ -600,7 +605,7 @@ uint8_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, u } // DBG(_n("\n")); } - DBG(_n("max_c=%f max_r=%f max_match=%d pixel\n"), max_c, max_r, max_match); + DBG(_n("max_c=%d max_r=%d max_match=%d pixel\n"), max_c, max_r, max_match); *pc = max_c; *pr = max_r; From 1610c96fc4d49f9d34f3ab6ead9b1b30b176c1e8 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 18:05:52 +0100 Subject: [PATCH 080/218] Fix and report circle divergence --- Firmware/mesh_bed_calibration.cpp | 2 +- Firmware/xyzcal.cpp | 27 ++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 12fca582e..897e3a9e6 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -2271,7 +2271,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level /*} else { // if first iteration failed, count corrected point coordinates as initial - // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). current_position[X_AXIS] = vec_x[0] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[0] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[0]; current_position[Y_AXIS] = vec_x[1] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[1] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[1]; diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index df6f12b30..4e55996a3 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -37,7 +37,7 @@ #define Z_MINUS 1 /// Max. jerk in PrusaSlicer, 10000 = 1 mm/s -#define MAX_DELAY 10000 +#define MAX_DELAY 1000 #define MIN_SPEED (0.01f / (MAX_DELAY * 0.000001f)) /// 200 = 50 mm/s #define Z_MIN_DELAY 200 @@ -426,26 +426,6 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) --steps; } -// uint8_t slow_down_z(uint8_t axis, uint16_t delay_us){ -// sm4_do_step(axis); -// delayMicroseconds(delay_us / 3 * 4); -// sm4_do_step(Z_AXIS_MASK); -// delayMicroseconds(delay_us * 2); -// sm4_do_step(Z_AXIS_MASK); -// delayMicroseconds(delay_us * 4); -// return 3; -// } - -// uint8_t speed_up_z(uint8_t axis, uint16_t delay_us){ -// sm4_do_step(Z_AXIS_MASK); -// delayMicroseconds(delay_us * 4); -// sm4_do_step(Z_AXIS_MASK); -// delayMicroseconds(delay_us * 2); -// sm4_do_step(Z_AXIS_MASK); -// delayMicroseconds(delay_us / 3 * 4); -// return 3; -// } - void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ if(!pixels) return; @@ -528,7 +508,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } - /// move to the next point and move Z up diagonally + /// move to the next point and move Z up diagonally (if needed) current_delay_us = MAX_DELAY; // const int8_t dir = (d & 1) ? -1 : 1; const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; @@ -829,7 +809,8 @@ bool xyzcal_scan_and_process(void){ float radius = 5; ///< default radius const uint8_t iterations = 20; dynamic_circle(matrix32, xf, yf, radius, iterations); - if (ABS(xf - uc + 5.5f) > 3 || ABS(yf - ur + 5.5f) > 3 || ABS(radius - 5) > 3){ + if (ABS(xf - (uc + 5.5f)) > 3 || ABS(yf - (ur + 5.5f)) > 3 || ABS(radius - 5) > 3){ + DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); /// dynamic algorithm diverged, use original position instead xf = uc + 5.5f; yf = ur + 5.5f; From c397e9249ae8aa7239d172be7d2194718c4c4c74 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 21 Dec 2020 19:33:36 +0100 Subject: [PATCH 081/218] Restart scanning --- Firmware/xyzcal.cpp | 217 ++++++++++++++++++++++++++------------------ 1 file changed, 131 insertions(+), 86 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 4e55996a3..d68bfbc1a 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -426,8 +426,41 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) --steps; } +/// Count number of zeros on the 32 byte array +/// If the number is less than 16, it changes @min_z so it will be next time +bool more_zeros(uint8_t* pixels, int16_t &min_z){ + uint8_t hist[256]; + uint8_t i = 0; + + /// clear + do { + hist[i] = 0; + } while (i++ < 255); + + /// fill + for (i = 0; i < 32; ++i){ + ++hist[pixels[i]]; + } + + /// already more zeros on the line + if (hist[0] >= 16) + return true; + + /// find threshold + uint8_t sum = 0; + i = 0; + do { + sum += hist[i]; + if (sum >= 16) + break; + } while (i++ < 255); + + min_z += i; + return false; +} + void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ - if(!pixels) + if (!pixels) return; int16_t z = _Z; int16_t z_trig; @@ -436,109 +469,121 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; uint16_t steps_to_go; + uint8_t restart = 0; ///< restart if needed but just once + int16_t corr_min_z = min_z; ///< shifted min_z if it's too low - for (uint8_t r = 0; r < 32; r++){ ///< Y axis - xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); - for (int8_t d = 0; d < 2; ++d){ ///< direction - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + do { + if (restart == 1) + restart = 2; + for (uint8_t r = 0; r < 32; r++){ ///< Y axis + xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); + for (int8_t d = 0; d < 2; ++d){ ///< direction + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, corr_min_z, delay_us, 0); - z = _Z; - sm4_set_dir(X_AXIS, d); - for (uint8_t c = 0; c < 32; c++){ ///< X axis + z = _Z; + sm4_set_dir(X_AXIS, d); + for (uint8_t c = 0; c < 32; c++){ ///< X axis - z_trig = min_z; + z_trig = corr_min_z; - /// move up to un-trigger (surpress hysteresis) - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up from stop, go half the way - current_delay_us = MAX_DELAY; - for (start_z = z; z < (max_z + start_z) / 2; ++z){ - if (!_PINDA){ - break; + /// move up to un-trigger (surpress hysteresis) + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up from stop, go half the way + current_delay_us = MAX_DELAY; + for (start_z = z; z < (max_z + start_z) / 2; ++z){ + if (!_PINDA){ + break; + } + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - } - if(_PINDA){ - uint16_t steps_to_go = MAX(0, max_z - z); - while (_PINDA && z < max_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + if(_PINDA){ + uint16_t steps_to_go = MAX(0, max_z - z); + while (_PINDA && z < max_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + ++z; + } + } + /// slow down to stop + while (current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); ++z; } - } - /// slow down to stop - while (current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); - ++z; - } - /// move down to trigger - sm4_set_dir(Z_AXIS, Z_MINUS); - /// speed up - current_delay_us = MAX_DELAY; - for (start_z = z; z > (min_z + start_z) / 2; --z){ - if (_PINDA){ - z_trig = z; - break; + /// move down to trigger + sm4_set_dir(Z_AXIS, Z_MINUS); + /// speed up + current_delay_us = MAX_DELAY; + for (start_z = z; z > (corr_min_z + start_z) / 2; --z){ + if (_PINDA){ + z_trig = z; + break; + } + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - } - /// slow down - if(!_PINDA){ - steps_to_go = MAX(0, z - min_z); - while (!_PINDA && z > min_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + /// slow down + if(!_PINDA){ + steps_to_go = MAX(0, z - corr_min_z); + while (!_PINDA && z > corr_min_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + --z; + } + z_trig = z; + } + /// slow down to stop + while (z > corr_min_z && current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); --z; } - z_trig = z; - } - /// slow down to stop - while (z > min_z && current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); - --z; - } - count_position[2] = z; - if (d == 0){ - line_buffer[c] = (uint16_t)(z_trig - min_z); - } else { - /// data reversed in X - // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); - /// save average of both directions - pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); - } + count_position[2] = z; + if (d == 0){ + line_buffer[c] = (uint16_t)(z_trig - corr_min_z); + } else { + /// data reversed in X + // DBG(_n("%04x"), (line_buffer[31 - c] + (z - corr_min_z)) / 2); + /// save average of both directions + pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - corr_min_z)) / 2); + } - /// move to the next point and move Z up diagonally (if needed) - current_delay_us = MAX_DELAY; - // const int8_t dir = (d & 1) ? -1 : 1; - const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; - const int16_t length_x = ABS(end_x - _X); - const int16_t half_x = length_x / 2; - int16_t x = 0; - /// don't go up if PINDA not triggered - const bool up = _PINDA; - int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + /// move to the next point and move Z up diagonally (if needed) + current_delay_us = MAX_DELAY; + // const int8_t dir = (d & 1) ? -1 : 1; + const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; + const int16_t length_x = ABS(end_x - _X); + const int16_t half_x = length_x / 2; + int16_t x = 0; + /// don't go up if PINDA not triggered + const bool up = _PINDA; + int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up - for (x = 0; x <= half_x; ++x){ - accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - if (up) - ++z; + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up + for (x = 0; x <= half_x; ++x){ + accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + if (up) + ++z; + } + /// slow down + steps_to_go = length_x - x; + for (; x < length_x; ++x){ + go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); + if (up) + ++z; + } + count_position[0] = end_x; + count_position[2] = z; } - /// slow down - steps_to_go = length_x - x; - for (; x < length_x; ++x){ - go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); - if (up) - ++z; - } - count_position[0] = end_x; - count_position[2] = z; } + if (r == 0 && restart == 0){ + if (!more_zeros(pixels, corr_min_z)) + restart = 1; + } + if (restart == 1) + break; + // DBG(_n("\n\n")); } - // DBG(_n("\n\n")); - } + } while (restart == 1); } /// Returns rate of match From 20659ec818ca3964f7276651781c20b943a1a616 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 12:51:22 +0100 Subject: [PATCH 082/218] Add debug output --- Firmware/xyzcal.cpp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index d68bfbc1a..86a2440b3 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -427,7 +427,7 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) } /// Count number of zeros on the 32 byte array -/// If the number is less than 16, it changes @min_z so it will be next time +/// If the number is less than 16, it moves @min_z up bool more_zeros(uint8_t* pixels, int16_t &min_z){ uint8_t hist[256]; uint8_t i = 0; @@ -441,11 +441,22 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ for (i = 0; i < 32; ++i){ ++hist[pixels[i]]; } - + + /// print histogram + i = 0; + DBG(_n("hist: ")); + do { + DBG(_n("%d "), hist[i]); + } while (i++ < 255); + DBG(_n("\n")); + + /// already more zeros on the line - if (hist[0] >= 16) + if (hist[0] >= 16){ + DBG(_n("zeros: %d\n"), hist[0]); return true; - + } + /// find threshold uint8_t sum = 0; i = 0; @@ -455,7 +466,14 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ break; } while (i++ < 255); + /// avoid too much zeros + if (sum >= 24) + --i; + + DBG(_n("sum %d, index %d\n"), sum, i); + DBG(_n("min_z %d\n"), min_z); min_z += i; + DBG(_n("min_z %d\n"), min_z); return false; } From 90c8045f7dc0a98e50f7cc95255bc661ed364acc Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 13:59:50 +0100 Subject: [PATCH 083/218] Clean the code --- Firmware/xyzcal.cpp | 62 +++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 86a2440b3..f99c0c9b3 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -442,13 +442,13 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ ++hist[pixels[i]]; } - /// print histogram - i = 0; - DBG(_n("hist: ")); - do { - DBG(_n("%d "), hist[i]); - } while (i++ < 255); - DBG(_n("\n")); + // /// print histogram + // i = 0; + // DBG(_n("hist: ")); + // do { + // DBG(_n("%d "), hist[i]); + // } while (i++ < 255); + // DBG(_n("\n")); /// already more zeros on the line @@ -471,12 +471,18 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ --i; DBG(_n("sum %d, index %d\n"), sum, i); - DBG(_n("min_z %d\n"), min_z); + // DBG(_n("min_z %d\n"), min_z); min_z += i; - DBG(_n("min_z %d\n"), min_z); + // DBG(_n("min_z %d\n"), min_z); return false; } +enum { + RESTART_INIT, + DO_RESTART, + WAS_RESTARTED +}; + void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ if (!pixels) return; @@ -487,22 +493,23 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; uint16_t steps_to_go; - uint8_t restart = 0; ///< restart if needed but just once - int16_t corr_min_z = min_z; ///< shifted min_z if it's too low + /// restart if needed but just once + /// 0 = init, 1 = do restart, 2 = restart was done, don't restart any more + uint8_t restart = RESTART_INIT; do { - if (restart == 1) - restart = 2; + if (restart == DO_RESTART) + restart = WAS_RESTARTED; for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); for (int8_t d = 0; d < 2; ++d){ ///< direction - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, corr_min_z, delay_us, 0); + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); z = _Z; sm4_set_dir(X_AXIS, d); for (uint8_t c = 0; c < 32; c++){ ///< X axis - z_trig = corr_min_z; + z_trig = min_z; /// move up to un-trigger (surpress hysteresis) sm4_set_dir(Z_AXIS, Z_PLUS); @@ -532,7 +539,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ sm4_set_dir(Z_AXIS, Z_MINUS); /// speed up current_delay_us = MAX_DELAY; - for (start_z = z; z > (corr_min_z + start_z) / 2; --z){ + for (start_z = z; z > (min_z + start_z) / 2; --z){ if (_PINDA){ z_trig = z; break; @@ -541,27 +548,27 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ } /// slow down if(!_PINDA){ - steps_to_go = MAX(0, z - corr_min_z); - while (!_PINDA && z > corr_min_z){ + steps_to_go = MAX(0, z - min_z); + while (!_PINDA && z > min_z){ go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); --z; } z_trig = z; } /// slow down to stop - while (z > corr_min_z && current_delay_us < MAX_DELAY){ + while (z > min_z && current_delay_us < MAX_DELAY){ accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); --z; } count_position[2] = z; if (d == 0){ - line_buffer[c] = (uint16_t)(z_trig - corr_min_z); + line_buffer[c] = (uint16_t)(z_trig - min_z); } else { /// data reversed in X - // DBG(_n("%04x"), (line_buffer[31 - c] + (z - corr_min_z)) / 2); + // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); /// save average of both directions - pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - corr_min_z)) / 2); + pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } /// move to the next point and move Z up diagonally (if needed) @@ -593,15 +600,16 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ count_position[2] = z; } } - if (r == 0 && restart == 0){ - if (!more_zeros(pixels, corr_min_z)) - restart = 1; + /// do this in the first row only + if (r == 0 && restart == RESTART_INIT){ + if (!more_zeros(pixels, min_z)) + restart = DO_RESTART; } - if (restart == 1) + if (restart == DO_RESTART) break; // DBG(_n("\n\n")); } - } while (restart == 1); + } while (restart == DO_RESTART); } /// Returns rate of match From 25d6e247781d6c3590bf0f2721e87941bfe4c7cb Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 14:16:20 +0100 Subject: [PATCH 084/218] Add comments --- Firmware/xyzcal.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index f99c0c9b3..22cec6184 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -426,8 +426,9 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) --steps; } -/// Count number of zeros on the 32 byte array +/// Count number of zeros in the 32 byte array /// If the number is less than 16, it moves @min_z up +/// Zeros make measuring faster but there cannot be too much bool more_zeros(uint8_t* pixels, int16_t &min_z){ uint8_t hist[256]; uint8_t i = 0; From 8df2eccf45f0d03c5e2baaa3ecf0ed354db75cd6 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 14:36:37 +0100 Subject: [PATCH 085/218] Remove defines and unused vars --- Firmware/xyzcal.cpp | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 22cec6184..8c7a3f53b 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -29,22 +29,19 @@ #define _Z ((int16_t)count_position[Z_AXIS]) #define _E ((int16_t)count_position[E_AXIS]) -#define X_PLUS 0 -#define X_MINUS 1 -#define Y_PLUS 0 -#define Y_MINUS 1 -#define Z_PLUS 0 -#define Z_MINUS 1 +const constexpr uint8_t X_PLUS = 0; +const constexpr uint8_t X_MINUS = 1; +const constexpr uint8_t Y_PLUS = 0; +const constexpr uint8_t Y_MINUS = 1; +const constexpr uint8_t Z_PLUS = 0; +const constexpr uint8_t Z_MINUS = 1; /// Max. jerk in PrusaSlicer, 10000 = 1 mm/s -#define MAX_DELAY 1000 -#define MIN_SPEED (0.01f / (MAX_DELAY * 0.000001f)) +const constexpr uint16_t MAX_DELAY = 1000; +const constexpr float MIN_SPEED = 0.01f / (MAX_DELAY * 0.000001f); /// 200 = 50 mm/s -#define Z_MIN_DELAY 200 -#define Z_ACCEL 5000 -#define XY_ACCEL 1000 - -#define _PI 3.14159265F +const constexpr uint16_t Z_MIN_DELAY = 200; +const constexpr uint16_t Z_ACCEL = 5000; /// \returns positive value always #define ABS(a) \ @@ -250,7 +247,6 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi { bool ret = false; float r = 0; //radius - uint8_t n = 0; //point number uint16_t ad = 0; //angle [deg] float ar; //angle [rad] uint8_t dad = 0; //delta angle [deg] @@ -278,11 +274,9 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi dad = dad_max - ((719 - ad) / k); r = (float)(((uint32_t)(719 - ad)) * (-radius)) / 720; } - ar = (ad + rotation)* (float)_PI / 180; - float _cos = cos(ar); - float _sin = sin(ar); - int x = (int)(cx + (_cos * r)); - int y = (int)(cy + (_sin * r)); + ar = (ad + rotation)* (float)M_PI / 180; + int x = (int)(cx + (cos(ar) * r)); + int y = (int)(cy + (sin(ar) * r)); int z = (int)(z0 - ((float)((int32_t)dz * ad) / 720)); if (xyzcal_lineXYZ_to(x, y, z, delay_us, check_pinda)) { @@ -290,7 +284,6 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi ret = true; break; } - n++; ad += dad; } if (pad) *pad = ad; From e24a763e46b1b62c2fd76d8d2bfcc50a98875b14 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 14:45:55 +0100 Subject: [PATCH 086/218] Cleanup --- Firmware/xyzcal.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 8c7a3f53b..3c2a6bb2d 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -29,6 +29,10 @@ #define _Z ((int16_t)count_position[Z_AXIS]) #define _E ((int16_t)count_position[E_AXIS]) +#ifndef M_PI +const constexpr float M_PI = 3.1415926535897932384626433832795f; +#endif + const constexpr uint8_t X_PLUS = 0; const constexpr uint8_t X_MINUS = 1; const constexpr uint8_t Y_PLUS = 0; @@ -447,7 +451,7 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ /// already more zeros on the line if (hist[0] >= 16){ - DBG(_n("zeros: %d\n"), hist[0]); + DBG(_n("zeros %d\n"), hist[0]); return true; } @@ -464,7 +468,7 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ if (sum >= 24) --i; - DBG(_n("sum %d, index %d\n"), sum, i); + DBG(_n("zeros %d, index %d\n"), sum, i); // DBG(_n("min_z %d\n"), min_z); min_z += i; // DBG(_n("min_z %d\n"), min_z); From 25d138d198d5a532634bbb6ea60133c1570ba48b Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 15:10:01 +0100 Subject: [PATCH 087/218] Revert max.speed --- Firmware/xyzcal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 3c2a6bb2d..783740e1d 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -858,7 +858,7 @@ bool xyzcal_scan_and_process(void){ uint8_t *matrix32 = (uint8_t *)block_buffer; uint16_t *pattern = (uint16_t *)(matrix32 + 32 * 32); - xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 600, matrix32); + xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 200, matrix32); print_image(matrix32); for (uint8_t i = 0; i < 12; i++){ From 979525f0283dad989b356eecb56d9078a2696498 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 22 Dec 2020 19:34:12 +0100 Subject: [PATCH 088/218] Add more restarts --- Firmware/xyzcal.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 783740e1d..5c21b4fbb 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -475,12 +475,6 @@ bool more_zeros(uint8_t* pixels, int16_t &min_z){ return false; } -enum { - RESTART_INIT, - DO_RESTART, - WAS_RESTARTED -}; - void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ if (!pixels) return; @@ -491,13 +485,10 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; uint16_t steps_to_go; - /// restart if needed but just once - /// 0 = init, 1 = do restart, 2 = restart was done, don't restart any more - uint8_t restart = RESTART_INIT; + /// available restarts (if needed) + uint8_t restarts = 2; do { - if (restart == DO_RESTART) - restart = WAS_RESTARTED; for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); for (int8_t d = 0; d < 2; ++d){ ///< direction @@ -598,16 +589,16 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ count_position[2] = z; } } - /// do this in the first row only - if (r == 0 && restart == RESTART_INIT){ - if (!more_zeros(pixels, min_z)) - restart = DO_RESTART; + /// do the min_z addjusting in the first row only + if (r == 0 && restarts){ + if (more_zeros(pixels, min_z)) + restarts = 0; } - if (restart == DO_RESTART) + if (restarts) break; // DBG(_n("\n\n")); } - } while (restart == DO_RESTART); + } while (restarts--); } /// Returns rate of match From e6eb3be2472538694827301d516a757be5be7924 Mon Sep 17 00:00:00 2001 From: espr14 Date: Wed, 23 Dec 2020 16:56:04 +0100 Subject: [PATCH 089/218] Set jerk = 1, accel. = 1000 --- Firmware/xyzcal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 5c21b4fbb..25863ae8e 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -41,11 +41,11 @@ const constexpr uint8_t Z_PLUS = 0; const constexpr uint8_t Z_MINUS = 1; /// Max. jerk in PrusaSlicer, 10000 = 1 mm/s -const constexpr uint16_t MAX_DELAY = 1000; +const constexpr uint16_t MAX_DELAY = 10000; const constexpr float MIN_SPEED = 0.01f / (MAX_DELAY * 0.000001f); /// 200 = 50 mm/s const constexpr uint16_t Z_MIN_DELAY = 200; -const constexpr uint16_t Z_ACCEL = 5000; +const constexpr uint16_t Z_ACCEL = 1000; /// \returns positive value always #define ABS(a) \ From 62c36f718b30037095ab43aa4da680bed9f3480c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 7 Dec 2020 15:32:19 +0100 Subject: [PATCH 090/218] =?UTF-8?q?Add=20SuperPINDA=20support=20for=20MK2.?= =?UTF-8?q?5/S=20-=20Changed=20DETECT=5FSUPERPINDA=20to=20SUPERPINDA=5FSUP?= =?UTF-8?q?PORT=20as=20on=20miniRAMo=20the=20thermistor=20readings=20below?= =?UTF-8?q?=2030=C2=B0C=20=20=20aren't=20accurate=20egnough=20to=20determi?= =?UTF-8?q?ne=20if=20SUPERPINDA=20is=20connected=20or=20not=20-=20Add=20LC?= =?UTF-8?q?D=20toggle=20menu=20Settings=20->=20HW=20Setup=20->=20SuperPIND?= =?UTF-8?q?A=20[Yes/No]=20to=20overwrite=20SuperPINDA=20detection=20=20=20?= =?UTF-8?q?-=20If=20EEPROM=5FPINDA=5FTEMP=5FCOMPENSTATION=20is=20empty=20?= =?UTF-8?q?=3D=200xff=20then=20detect=20SuperPINDA=20by=20checking=20therm?= =?UTF-8?q?istor=20=20=20-=20If=20EEPROM=5FPINDA=5FTEMP=5FCOMPENSTAION=20i?= =?UTF-8?q?s=200=20then=20forec=20enable=20for=20temperature=20compensatio?= =?UTF-8?q?n=20menues=20and=20functions=20=20=20-=20If=20EEPROM=5FPINDA=5F?= =?UTF-8?q?TEMP=5FCOMPENSATION=20is=201=20then=20force=20disable=20for=20t?= =?UTF-8?q?emperature=20compensation=20menues=20and=20functions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Firmware/Marlin_main.cpp | 8 ++++---- Firmware/eeprom.h | 7 +++++-- Firmware/temperature.cpp | 14 ++++++++++++-- Firmware/ultralcd.cpp | 19 +++++++++++++++++++ Firmware/ultralcd.h | 2 ++ .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 ++ .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 ++ .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 ++ .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 ++ .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 11 files changed, 52 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a83d64b82..f6509cdcb 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4572,7 +4572,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) The Original i3 Prusa MK2/s uses PINDAv1 and this calibration improves the temperature drift, but not as good as the PINDAv2. superPINDA sensor has internal temperature compensation and no thermistor output. There is no point of doing temperature calibration in such case. - If PINDA_THERMISTOR and DETECT_SUPERPINDA is defined during compilation, calibration is skipped with serial message "No PINDA thermistor". + If PINDA_THERMISTOR and SUPERPINDA_SUPPORT is defined during compilation, calibration is skipped with serial message "No PINDA thermistor". This can be caused also if PINDA thermistor connection is broken or PINDA temperature is lower than PINDA_MINTEMP. #### Example @@ -10502,9 +10502,9 @@ float temp_comp_interpolation(float inp_temperature) { #ifdef PINDA_THERMISTOR constexpr int start_compensating_temp = 35; temp_C[i] = start_compensating_temp + i * 5; //temperature in degrees C -#ifdef DETECT_SUPERPINDA - static_assert(start_compensating_temp >= PINDA_MINTEMP, "Temperature compensation start point is lower than PINDA_MINTEMP."); -#endif //DETECT_SUPERPINDA +#ifdef SUPERPINDA_SUPPORT + static_assert(start_compensating_temp >= PINDA_MINTEMP, "Temperature compensation start point is lower than PINDA_MINTEMP."); +#endif //SUPERPINDA_SUPPORT #else temp_C[i] = 50 + i * 10; //temperature in C #endif diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 5cb7ddb85..f234bb715 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -365,6 +365,9 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0D2A 3370 | uint8 | EEPROM_EXPERIMENTAL_VISIBILITY | ffh 255 | ffh 255 | Experimental menu visibility unknown state | LCD menu | D3 Ax0d2a C1 | ^ | ^ | ^ | 00h 0 | ^ | Experimental menu visibility hidden | ^ | ^ | ^ | ^ | ^ | 01h 1 | ^ | Experimental menu visibility visible | ^ | ^ +| 0x0D29 3369 | uint8 | EEPROM_PINDA_TEMP_COMPENSATION | ffh 255 | ffh 255 | PINDA temp compensation unknown state | LCD menu | D3 Ax0d29 C1 +| ^ | ^ | ^ | 00h 0 | ^ | PINDA has no temp compensation PINDA v1/2 | ^ | ^ +| ^ | ^ | ^ | 01h 1 | ^ | PINDA has temp compensation aka SuperPINDA | ^ | ^ | Address begin | Bit/Type | Name | Valid values | Default/FactoryReset | Description | Gcode/Function| Debug code @@ -569,9 +572,9 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_ALTFAN_OVERRIDE (EEPROM_UVLO_LA_K-1) //uint8 #define EEPROM_EXPERIMENTAL_VISIBILITY (EEPROM_ALTFAN_OVERRIDE-1) //uint8 - +#define EEPROM_PINDA_TEMP_COMPENSATION (EEPROM_EXPERIMENTAL_VISIBILITY-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_EXPERIMENTAL_VISIBILITY +#define EEPROM_LAST_ITEM EEPROM_PINDA_TEMP_COMPENSATION // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index cb4fc8aee..a7ff4dff3 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2325,11 +2325,21 @@ float unscalePID_d(float d) //! //! @retval true firmware should do temperature compensation and allow calibration //! @retval false PINDA thermistor is not detected, disable temperature compensation and calibration +//! @retval true/false when overwritten in LCD menu Settings->HW Setup->SuperPINDA //! bool has_temperature_compensation() { -#ifdef DETECT_SUPERPINDA - return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false; +#ifdef SUPERPINDA_SUPPORT + uint8_t pinda_temp_compensation = eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION); + if (pinda_temp_compensation == EEPROM_EMPTY_VALUE) //Unkown PINDA temp compenstation, so check it. + { + //SERIAL_ECHOLNPGM("Current PINDATEMP:"); + //SERIAL_ECHO(current_temperature_pinda); + //SERIAL_ECHOLN(PINDA_MINTEMP); + return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false; + } + else if (pinda_temp_compensation == 0) return true; //Overwritten via LCD menu SuperPINDA [No] + else return false; //Overwritten via LCD menu SuperPINDA [YES] #else return true; #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 44c2dff77..e20180b6d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5753,6 +5753,15 @@ void lcd_hw_setup_menu(void) // can not be "static" MENU_ITEM_SUBMENU_P(PSTR("Experimental"), lcd_experimental_menu);////MSG_MENU_EXPERIMENTAL c=18 } +#ifdef SUPERPINDA_SUPPORT + //! The SuperPINDA is detected when the PINDA temp is below its defined limit. + //! This works well on the EINSY board but not on the miniRAMBo board as + //! as a disconnected SuperPINDA will show higher temps compared to an EINSY board. + //! + //! This menu allows the user to en-/disable the SuperPINDA manualy + MENU_ITEM_TOGGLE_P(_N("SuperPINDA"), eeprom_read_byte((unsigned char *)EEPROM_PINDA_TEMP_COMPENSATION) ? _T(MSG_YES) : _T(MSG_NO), lcd_pinda_temp_compensation_toggle); +#endif //SUPERPINDA_SUPPORT + MENU_END(); } @@ -9235,3 +9244,13 @@ void lcd_experimental_menu() MENU_END(); } + +void lcd_pinda_temp_compensation_toggle() +{ + uint8_t pinda_temp_compensation = eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION); + if (pinda_temp_compensation == EEPROM_EMPTY_VALUE) + pinda_temp_compensation = 1; + else + pinda_temp_compensation = !pinda_temp_compensation; + eeprom_update_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION, pinda_temp_compensation); +} \ No newline at end of file diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 7c3613328..e45daaa15 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -262,4 +262,6 @@ void lcd_wizard(WizState state); extern void lcd_experimental_toggle(); extern void lcd_experimental_menu(); +extern void lcd_pinda_temp_compensation_toggle(); + #endif //ULTRALCD_H diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index f2ef69e99..19f54b48a 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -175,6 +175,8 @@ #if BED_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 7eaba3d6c..42f604541 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -176,6 +176,8 @@ #if BED_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index ee245bd4b..2e5fc6381 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -175,6 +175,8 @@ #if BED_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 6bf30f192..55b899a4a 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -176,6 +176,8 @@ #if BED_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 04b4c5266..4f8bacf24 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -294,7 +294,7 @@ #if BED_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif -#define DETECT_SUPERPINDA +#define SUPERPINDA_SUPPORT #define PINDA_MINTEMP BED_MINTEMP #define AMBIENT_MINTEMP -30 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index c869ec517..f4a53be12 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -296,7 +296,7 @@ #if BED_MINTEMP_DELAY>USHRT_MAX #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif -#define DETECT_SUPERPINDA +#define SUPERPINDA_SUPPORT #define PINDA_MINTEMP BED_MINTEMP #define AMBIENT_MINTEMP -30 From 732b6e0cad10fe2d05fe642078bce3406dd2e40e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 7 Dec 2020 15:44:49 +0100 Subject: [PATCH 091/218] Cleanup --- Firmware/temperature.cpp | 5 +---- Firmware/ultralcd.cpp | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index a7ff4dff3..dbd5fd9d3 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2325,7 +2325,7 @@ float unscalePID_d(float d) //! //! @retval true firmware should do temperature compensation and allow calibration //! @retval false PINDA thermistor is not detected, disable temperature compensation and calibration -//! @retval true/false when overwritten in LCD menu Settings->HW Setup->SuperPINDA +//! @retval true/false when forced via LCD menu Settings->HW Setup->SuperPINDA //! bool has_temperature_compensation() { @@ -2333,9 +2333,6 @@ bool has_temperature_compensation() uint8_t pinda_temp_compensation = eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION); if (pinda_temp_compensation == EEPROM_EMPTY_VALUE) //Unkown PINDA temp compenstation, so check it. { - //SERIAL_ECHOLNPGM("Current PINDATEMP:"); - //SERIAL_ECHO(current_temperature_pinda); - //SERIAL_ECHOLN(PINDA_MINTEMP); return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false; } else if (pinda_temp_compensation == 0) return true; //Overwritten via LCD menu SuperPINDA [No] diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e20180b6d..d721e0442 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -9253,4 +9253,6 @@ void lcd_pinda_temp_compensation_toggle() else pinda_temp_compensation = !pinda_temp_compensation; eeprom_update_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION, pinda_temp_compensation); -} \ No newline at end of file + SERIAL_ECHOLNPGM("LCD U SuperPINDA:"); + SERIAL_ECHOLN(pinda_temp_compensation); +} From a97587f373eda83e862a70e14f85a2ae3a7b6baf Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 8 Dec 2020 17:27:00 +0100 Subject: [PATCH 092/218] Changed PINDA_MINTEMP having own value Prevent bad readings/issues if someone changes the bed thermistor that is "better" with lower min values and creates a custom firmware. The firmware will now be in the range of the PINDAv2 thermistor independant from the bed thermistor (which may change and need adjustments) --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 19f54b48a..fedb1c047 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -176,7 +176,7 @@ #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif #define SUPERPINDA_SUPPORT -#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 42f604541..314aaf6ec 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -177,7 +177,7 @@ #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif #define SUPERPINDA_SUPPORT -#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 2e5fc6381..ba05843dd 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -176,7 +176,7 @@ #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif #define SUPERPINDA_SUPPORT -#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 55b899a4a..857acbab9 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -177,7 +177,7 @@ #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif #define SUPERPINDA_SUPPORT -#define PINDA_MINTEMP BED_MINTEMP //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 4f8bacf24..f2b302aef 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -295,7 +295,7 @@ #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif #define SUPERPINDA_SUPPORT -#define PINDA_MINTEMP BED_MINTEMP +#define PINDA_MINTEMP 10 #define AMBIENT_MINTEMP -30 // Maxtemps diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index f4a53be12..668f30002 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -297,7 +297,7 @@ #error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" #endif #define SUPERPINDA_SUPPORT -#define PINDA_MINTEMP BED_MINTEMP +#define PINDA_MINTEMP 10 #define AMBIENT_MINTEMP -30 // Maxtemps From 4b510fef0aec47b9eb5cae97bd5a16a117201b0e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 8 Dec 2020 17:50:04 +0100 Subject: [PATCH 093/218] Add PINDA_TEMP_COMP variable to enable SuperPINDA toggle menu/function --- Firmware/temperature.cpp | 4 ++++ Firmware/ultralcd.cpp | 8 +++++--- Firmware/ultralcd.h | 2 ++ Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 1 + Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 1 + Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 1 + Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 1 + Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 + Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 + 9 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index dbd5fd9d3..d429bb88b 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2330,13 +2330,17 @@ float unscalePID_d(float d) bool has_temperature_compensation() { #ifdef SUPERPINDA_SUPPORT +#ifdef PINDA_TEMP_COMP uint8_t pinda_temp_compensation = eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION); if (pinda_temp_compensation == EEPROM_EMPTY_VALUE) //Unkown PINDA temp compenstation, so check it. { +#endif //PINDA_TEMP_COMP return (current_temperature_pinda >= PINDA_MINTEMP) ? true : false; +#ifdef PINDA_TEMP_COMP } else if (pinda_temp_compensation == 0) return true; //Overwritten via LCD menu SuperPINDA [No] else return false; //Overwritten via LCD menu SuperPINDA [YES] +#endif //PINDA_TEMP_COMP #else return true; #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d721e0442..7dca76bef 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5753,14 +5753,14 @@ void lcd_hw_setup_menu(void) // can not be "static" MENU_ITEM_SUBMENU_P(PSTR("Experimental"), lcd_experimental_menu);////MSG_MENU_EXPERIMENTAL c=18 } -#ifdef SUPERPINDA_SUPPORT +#ifdef PINDA_TEMP_COMP //! The SuperPINDA is detected when the PINDA temp is below its defined limit. //! This works well on the EINSY board but not on the miniRAMBo board as //! as a disconnected SuperPINDA will show higher temps compared to an EINSY board. //! //! This menu allows the user to en-/disable the SuperPINDA manualy MENU_ITEM_TOGGLE_P(_N("SuperPINDA"), eeprom_read_byte((unsigned char *)EEPROM_PINDA_TEMP_COMPENSATION) ? _T(MSG_YES) : _T(MSG_NO), lcd_pinda_temp_compensation_toggle); -#endif //SUPERPINDA_SUPPORT +#endif //PINDA_TEMP_COMP MENU_END(); } @@ -9245,6 +9245,7 @@ void lcd_experimental_menu() MENU_END(); } +#ifdef PINDA_TEMP_COMP void lcd_pinda_temp_compensation_toggle() { uint8_t pinda_temp_compensation = eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION); @@ -9253,6 +9254,7 @@ void lcd_pinda_temp_compensation_toggle() else pinda_temp_compensation = !pinda_temp_compensation; eeprom_update_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION, pinda_temp_compensation); - SERIAL_ECHOLNPGM("LCD U SuperPINDA:"); + SERIAL_ECHOLNPGM("SuperPINDA:"); SERIAL_ECHOLN(pinda_temp_compensation); } +#endif //PINDA_TEMP_COMP diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index e45daaa15..cca4eced3 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -262,6 +262,8 @@ void lcd_wizard(WizState state); extern void lcd_experimental_toggle(); extern void lcd_experimental_menu(); +#ifdef PINDA_TEMP_COMP extern void lcd_pinda_temp_compensation_toggle(); +#endif //PINDA_TEMP_COMP #endif //ULTRALCD_H diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index fedb1c047..1e77dce81 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -177,6 +177,7 @@ #endif #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 314aaf6ec..2d4d73c24 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -178,6 +178,7 @@ #endif #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index ba05843dd..4670d2188 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -177,6 +177,7 @@ #endif #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 857acbab9..22af43416 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -178,6 +178,7 @@ #endif #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 30 //The miniRAMBo thermistor readings below 30°C aren't very accurate +#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index f2b302aef..b7c5d54cd 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -297,6 +297,7 @@ #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 10 #define AMBIENT_MINTEMP -30 +//#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 668f30002..b278ab00e 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -299,6 +299,7 @@ #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 10 #define AMBIENT_MINTEMP -30 +//#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) From 76eb7431392aa509ec9668509dc2f209c7697914 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 8 Dec 2020 18:39:54 +0100 Subject: [PATCH 094/218] Set default SuperPINDA toggle on MK2.5/S to NO --- Firmware/eeprom.cpp | 4 ++++ Firmware/ultralcd.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index 93098e93b..4f519cae5 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -93,6 +93,10 @@ void eeprom_init() eeprom_switch_to_next_sheet(); } check_babystep(); + +#ifdef PINDA_TEMP_COMP +if (eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION) == 0xff) eeprom_update_byte((uint8_t *)EEPROM_PINDA_TEMP_COMPENSATION, 0); +#endif //PINDA_TEMP_COMP } //! @brief Get default sheet name for index diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7dca76bef..27466d0d1 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5759,7 +5759,7 @@ void lcd_hw_setup_menu(void) // can not be "static" //! as a disconnected SuperPINDA will show higher temps compared to an EINSY board. //! //! This menu allows the user to en-/disable the SuperPINDA manualy - MENU_ITEM_TOGGLE_P(_N("SuperPINDA"), eeprom_read_byte((unsigned char *)EEPROM_PINDA_TEMP_COMPENSATION) ? _T(MSG_YES) : _T(MSG_NO), lcd_pinda_temp_compensation_toggle); + MENU_ITEM_TOGGLE_P(_N("SuperPINDA"), eeprom_read_byte((uint8_t *)EEPROM_PINDA_TEMP_COMPENSATION) ? _T(MSG_YES) : _T(MSG_NO), lcd_pinda_temp_compensation_toggle); #endif //PINDA_TEMP_COMP MENU_END(); @@ -9249,8 +9249,8 @@ void lcd_experimental_menu() void lcd_pinda_temp_compensation_toggle() { uint8_t pinda_temp_compensation = eeprom_read_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION); - if (pinda_temp_compensation == EEPROM_EMPTY_VALUE) - pinda_temp_compensation = 1; + if (pinda_temp_compensation == EEPROM_EMPTY_VALUE) // On MK2.5/S the EEPROM_EMPTY_VALUE will be set to 0 during eeprom_init. + pinda_temp_compensation = 1; // But for MK3/S it should be 1 so SuperPINDA is "active" else pinda_temp_compensation = !pinda_temp_compensation; eeprom_update_byte((uint8_t*)EEPROM_PINDA_TEMP_COMPENSATION, pinda_temp_compensation); From 12f41022720a84b2ef6d5286669f4b6e42503fd3 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 8 Dec 2020 18:45:34 +0100 Subject: [PATCH 095/218] Group PINDA defines --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index b7c5d54cd..7bd7be43e 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -296,8 +296,8 @@ #endif #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 10 -#define AMBIENT_MINTEMP -30 //#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function +#define AMBIENT_MINTEMP -30 // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index b278ab00e..3056c4366 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -298,8 +298,8 @@ #endif #define SUPERPINDA_SUPPORT #define PINDA_MINTEMP 10 -#define AMBIENT_MINTEMP -30 //#define PINDA_TEMP_COMP //Used to enable SuperPINDA toggle menu/function +#define AMBIENT_MINTEMP -30 // Maxtemps #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) From 80e32ce1a5213dd7731f0aaa16a180201bd29e80 Mon Sep 17 00:00:00 2001 From: espr14 Date: Fri, 25 Dec 2020 15:27:42 +0100 Subject: [PATCH 096/218] Turn off speed optimization due to MK2.5 --- Firmware/xyzcal.cpp | 237 ++++++++++++++++---------------------------- 1 file changed, 87 insertions(+), 150 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 25863ae8e..7ad6dd757 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -423,58 +423,6 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) --steps; } -/// Count number of zeros in the 32 byte array -/// If the number is less than 16, it moves @min_z up -/// Zeros make measuring faster but there cannot be too much -bool more_zeros(uint8_t* pixels, int16_t &min_z){ - uint8_t hist[256]; - uint8_t i = 0; - - /// clear - do { - hist[i] = 0; - } while (i++ < 255); - - /// fill - for (i = 0; i < 32; ++i){ - ++hist[pixels[i]]; - } - - // /// print histogram - // i = 0; - // DBG(_n("hist: ")); - // do { - // DBG(_n("%d "), hist[i]); - // } while (i++ < 255); - // DBG(_n("\n")); - - - /// already more zeros on the line - if (hist[0] >= 16){ - DBG(_n("zeros %d\n"), hist[0]); - return true; - } - - /// find threshold - uint8_t sum = 0; - i = 0; - do { - sum += hist[i]; - if (sum >= 16) - break; - } while (i++ < 255); - - /// avoid too much zeros - if (sum >= 24) - --i; - - DBG(_n("zeros %d, index %d\n"), sum, i); - // DBG(_n("min_z %d\n"), min_z); - min_z += i; - // DBG(_n("min_z %d\n"), min_z); - return false; -} - void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ if (!pixels) return; @@ -485,120 +433,109 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; uint16_t steps_to_go; - /// available restarts (if needed) - uint8_t restarts = 2; - do { - for (uint8_t r = 0; r < 32; r++){ ///< Y axis - xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); - for (int8_t d = 0; d < 2; ++d){ ///< direction - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + for (uint8_t r = 0; r < 32; r++){ ///< Y axis + xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); + for (int8_t d = 0; d < 2; ++d){ ///< direction + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); - z = _Z; - sm4_set_dir(X_AXIS, d); - for (uint8_t c = 0; c < 32; c++){ ///< X axis + z = _Z; + sm4_set_dir(X_AXIS, d); + for (uint8_t c = 0; c < 32; c++){ ///< X axis - z_trig = min_z; + z_trig = min_z; - /// move up to un-trigger (surpress hysteresis) - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up from stop, go half the way - current_delay_us = MAX_DELAY; - for (start_z = z; z < (max_z + start_z) / 2; ++z){ - if (!_PINDA){ - break; - } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + /// move up to un-trigger (surpress hysteresis) + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up from stop, go half the way + current_delay_us = MAX_DELAY; + for (start_z = z; z < (max_z + start_z) / 2; ++z){ + if (!_PINDA){ + break; } + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } - if(_PINDA){ - uint16_t steps_to_go = MAX(0, max_z - z); - while (_PINDA && z < max_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); - ++z; - } - } - /// slow down to stop - while (current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + if(_PINDA){ + uint16_t steps_to_go = MAX(0, max_z - z); + while (_PINDA && z < max_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); ++z; } + } + /// slow down to stop + while (current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + ++z; + } - /// move down to trigger - sm4_set_dir(Z_AXIS, Z_MINUS); - /// speed up - current_delay_us = MAX_DELAY; - for (start_z = z; z > (min_z + start_z) / 2; --z){ - if (_PINDA){ - z_trig = z; - break; - } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - } - /// slow down - if(!_PINDA){ - steps_to_go = MAX(0, z - min_z); - while (!_PINDA && z > min_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); - --z; - } + /// move down to trigger + sm4_set_dir(Z_AXIS, Z_MINUS); + /// speed up + current_delay_us = MAX_DELAY; + for (start_z = z; z > (min_z + start_z) / 2; --z){ + if (_PINDA){ z_trig = z; + break; } - /// slow down to stop - while (z > min_z && current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } + /// slow down + if(!_PINDA){ + steps_to_go = MAX(0, z - min_z); + while (!_PINDA && z > min_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); --z; } - - count_position[2] = z; - if (d == 0){ - line_buffer[c] = (uint16_t)(z_trig - min_z); - } else { - /// data reversed in X - // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); - /// save average of both directions - pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); - } - - /// move to the next point and move Z up diagonally (if needed) - current_delay_us = MAX_DELAY; - // const int8_t dir = (d & 1) ? -1 : 1; - const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; - const int16_t length_x = ABS(end_x - _X); - const int16_t half_x = length_x / 2; - int16_t x = 0; - /// don't go up if PINDA not triggered - const bool up = _PINDA; - int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; - - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up - for (x = 0; x <= half_x; ++x){ - accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - if (up) - ++z; - } - /// slow down - steps_to_go = length_x - x; - for (; x < length_x; ++x){ - go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); - if (up) - ++z; - } - count_position[0] = end_x; - count_position[2] = z; + z_trig = z; } + /// slow down to stop + while (z > min_z && current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + --z; + } + + count_position[2] = z; + if (d == 0){ + line_buffer[c] = (uint16_t)(z_trig - min_z); + } else { + /// data reversed in X + // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); + /// save average of both directions + pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); + } + + /// move to the next point and move Z up diagonally (if needed) + current_delay_us = MAX_DELAY; + // const int8_t dir = (d & 1) ? -1 : 1; + const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; + const int16_t length_x = ABS(end_x - _X); + const int16_t half_x = length_x / 2; + int16_t x = 0; + /// don't go up if PINDA not triggered + const bool up = _PINDA; + int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up + for (x = 0; x <= half_x; ++x){ + accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + if (up) + ++z; + } + /// slow down + steps_to_go = length_x - x; + for (; x < length_x; ++x){ + go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); + if (up) + ++z; + } + count_position[0] = end_x; + count_position[2] = z; } - /// do the min_z addjusting in the first row only - if (r == 0 && restarts){ - if (more_zeros(pixels, min_z)) - restarts = 0; - } - if (restarts) - break; - // DBG(_n("\n\n")); } - } while (restarts--); + // DBG(_n("\n\n")); + } } /// Returns rate of match From 7e02a7f118cad642f7526d4a87565c0d04545630 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Sat, 26 Dec 2020 15:45:34 +0100 Subject: [PATCH 097/218] Version changed (3.9.3-RC1 build 3555) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 45874e317..fda3bc9e8 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.9.2" -#define FW_COMMIT_NR 3524 +#define FW_VERSION "3.9.3-RC1" +#define FW_COMMIT_NR 3555 // 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 From e86ba5e26d8d15a28cdd7c9d96b908cb0fdf4cfd Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 28 Dec 2020 16:45:39 +0100 Subject: [PATCH 098/218] Scan only once --- Firmware/xyzcal.cpp | 209 +++++++++++++++++++++++++------------------- 1 file changed, 121 insertions(+), 88 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 7ad6dd757..75d358b5e 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -226,6 +226,9 @@ uint16_t xyzcal_calc_delay(uint16_t, uint16_t) #endif //SM4_ACCEL_TEST /// Moves printer to absolute position [x,y,z] defined in integer position system +/// check_pinda == 0: ordinary move +/// check_pinda == 1: stop when PINDA triggered +/// check_pinda == -1: stop when PINDA untriggered bool xyzcal_lineXYZ_to(int16_t x, int16_t y, int16_t z, uint16_t delay_us, int8_t check_pinda) { // DBG(_n("xyzcal_lineXYZ_to x=%d y=%d z=%d check=%d\n"), x, y, z, check_pinda); @@ -370,6 +373,26 @@ int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t d } #endif //XYZCAL_MEASSURE_PINDA_HYSTEREZIS +void print_hysterezis(int16_t min_z, int16_t max_z, int16_t step){ + int16_t delay_us = 600; + int16_t trigger = 0; + int16_t untrigger = 0; + DBG(_n("Hysterezis\n")); + + xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 0); + + for (int16_t z = min_z; z <= max_z; z += step){ + xyzcal_lineXYZ_to(_X, _Y, z, delay_us, -1); + untrigger = _Z; + xyzcal_lineXYZ_to(_X, _Y, z, delay_us, 0); + xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 1); + trigger = _Z; + //xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 0); + + DBG(_n("min, trigger, untrigger, max: [%d %d %d %d]\n"), _Z, trigger, untrigger, z); + } +} + /// Accelerate up to max.speed (defined by @min_delay_us) void accelerate(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ sm4_do_step(axis); @@ -423,7 +446,19 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) --steps; } -void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t* pixels){ +/// \returns steps done +uint16_t stop_smoothly(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t min_delay_us){ + if (dec <= 0) + return 0; + uint16_t steps = 0; + while (delay_us < MAX_DELAY){ + accelerate(axis, -dec, delay_us, min_delay_us); + ++steps; + } + return steps; +} + +void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t *pixels){ if (!pixels) return; int16_t z = _Z; @@ -436,104 +471,103 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ for (uint8_t r = 0; r < 32; r++){ ///< Y axis xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); - for (int8_t d = 0; d < 2; ++d){ ///< direction - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + int8_t d = r % 2 ? 1 : 0; + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); - z = _Z; - sm4_set_dir(X_AXIS, d); - for (uint8_t c = 0; c < 32; c++){ ///< X axis + z = _Z; + sm4_set_dir(X_AXIS, d); + for (uint8_t c = 0; c < 32; c++){ ///< X axis - z_trig = min_z; + z_trig = min_z; - /// move up to un-trigger (surpress hysteresis) - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up from stop, go half the way - current_delay_us = MAX_DELAY; - for (start_z = z; z < (max_z + start_z) / 2; ++z){ - if (!_PINDA){ - break; - } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + /// move up to un-trigger (surpress hysteresis) + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up from stop, go half the way + current_delay_us = MAX_DELAY; + for (start_z = z; z < (max_z + start_z) / 2; ++z){ + if (!_PINDA){ + break; } + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } - if(_PINDA){ - uint16_t steps_to_go = MAX(0, max_z - z); - while (_PINDA && z < max_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); - ++z; - } - } - /// slow down to stop - while (current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + if (_PINDA){ + steps_to_go = MAX(0, max_z - z); + while (_PINDA && z < max_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); ++z; } + } + z += stop_smoothly(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - /// move down to trigger - sm4_set_dir(Z_AXIS, Z_MINUS); - /// speed up - current_delay_us = MAX_DELAY; - for (start_z = z; z > (min_z + start_z) / 2; --z){ - if (_PINDA){ - z_trig = z; - break; - } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - } - /// slow down - if(!_PINDA){ - steps_to_go = MAX(0, z - min_z); - while (!_PINDA && z > min_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); - --z; - } + /// move down to trigger + sm4_set_dir(Z_AXIS, Z_MINUS); + /// speed up + current_delay_us = MAX_DELAY; + for (start_z = z; z > (min_z + start_z) / 2; --z){ + if (_PINDA){ z_trig = z; + break; } - /// slow down to stop - while (z > min_z && current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } + /// slow down + if (!_PINDA){ + steps_to_go = MAX(0, z - min_z); + while (!_PINDA && z > min_z){ + go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); --z; } - - count_position[2] = z; - if (d == 0){ - line_buffer[c] = (uint16_t)(z_trig - min_z); - } else { - /// data reversed in X - // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); - /// save average of both directions - pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); - } - - /// move to the next point and move Z up diagonally (if needed) - current_delay_us = MAX_DELAY; - // const int8_t dir = (d & 1) ? -1 : 1; - const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; - const int16_t length_x = ABS(end_x - _X); - const int16_t half_x = length_x / 2; - int16_t x = 0; - /// don't go up if PINDA not triggered - const bool up = _PINDA; - int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; - - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up - for (x = 0; x <= half_x; ++x){ - accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - if (up) - ++z; - } - /// slow down - steps_to_go = length_x - x; - for (; x < length_x; ++x){ - go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); - if (up) - ++z; - } - count_position[0] = end_x; - count_position[2] = z; + z_trig = z; } - } + /// slow down to stop but not lower than min_z + while (z > min_z && current_delay_us < MAX_DELAY){ + accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + --z; + } + + count_position[2] = z; + + // if (d == 0){ + // line_buffer[c] = (uint16_t)(z_trig - min_z); + // } else { + // /// data reversed in X + // // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); + // /// save average of both directions + // pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); + // } + + pixels[(uint16_t)r * 32 + (r % 2 ? (31 - c) : c)] = (uint8_t)MIN((uint32_t)255, (uint32_t)z_trig - min_z); + + /// move to the next point and move Z up diagonally (if needed) + current_delay_us = MAX_DELAY; + // const int8_t dir = (d & 1) ? -1 : 1; + const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; + const int16_t length_x = ABS(end_x - _X); + const int16_t half_x = length_x / 2; + int16_t x = 0; + /// don't go up if PINDA not triggered + const bool up = _PINDA; + int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up + for (x = 0; x <= half_x; ++x){ + accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + if (up) + ++z; + } + /// slow down + steps_to_go = length_x - x; + for (; x < length_x; ++x){ + go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); + if (up) + ++z; + } + count_position[0] = end_x; + count_position[2] = z; + } + // } // DBG(_n("\n\n")); } } @@ -846,8 +880,7 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ xyzcal_lineXYZ_to(x, y, z, 200, 0); if (xyzcal_searchZ()){ - int16_t z = _Z; - xyzcal_lineXYZ_to(x, y, z, 200, 0); + xyzcal_lineXYZ_to(x, y, _Z, 200, 0); ret = xyzcal_scan_and_process(); } xyzcal_meassure_leave(); From c11e8654daa24e1935df85a4aa738ad6fcf4a854 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 12:39:35 +0100 Subject: [PATCH 099/218] Revert both directions, refactor code --- Firmware/xyzcal.cpp | 258 +++++++++++++++++++++++++++----------------- 1 file changed, 157 insertions(+), 101 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 75d358b5e..5563d34b5 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -29,6 +29,11 @@ #define _Z ((int16_t)count_position[Z_AXIS]) #define _E ((int16_t)count_position[E_AXIS]) +#define _X_ (count_position[X_AXIS]) +#define _Y_ (count_position[Y_AXIS]) +#define _Z_ (count_position[Z_AXIS]) +#define _E_ (count_position[E_AXIS]) + #ifndef M_PI const constexpr float M_PI = 3.1415926535897932384626433832795f; #endif @@ -40,6 +45,13 @@ const constexpr uint8_t Y_MINUS = 1; const constexpr uint8_t Z_PLUS = 0; const constexpr uint8_t Z_MINUS = 1; +const constexpr uint8_t X_PLUS_MASK = 0; +const constexpr uint8_t X_MINUS_MASK = X_AXIS_MASK; +const constexpr uint8_t Y_PLUS_MASK = 0; +const constexpr uint8_t Y_MINUS_MASK = Y_AXIS_MASK; +const constexpr uint8_t Z_PLUS_MASK = 0; +const constexpr uint8_t Z_MINUS_MASK = Z_AXIS_MASK; + /// Max. jerk in PrusaSlicer, 10000 = 1 mm/s const constexpr uint16_t MAX_DELAY = 10000; const constexpr float MIN_SPEED = 0.01f / (MAX_DELAY * 0.000001f); @@ -393,8 +405,28 @@ void print_hysterezis(int16_t min_z, int16_t max_z, int16_t step){ } } +void update_position_1_step(uint8_t axis, uint8_t dir){ + int8_t add = dir ? -1 : 1; + if (axis & X_AXIS_MASK) + _X_ += dir & X_AXIS_MASK ? -1 : 1; + if (axis & Y_AXIS_MASK) + _Y_ += dir & Y_AXIS_MASK ? -1 : 1; + if (axis & Z_AXIS_MASK) + _Z_ += dir & Z_AXIS_MASK ? -1 : 1; +} + +void set_axis_dir(uint8_t axis, uint8_t dir){ + if (axis & X_AXIS_MASK) + sm4_set_dir(X_AXIS_MASK, dir & X_AXIS_MASK); + if (axis & Y_AXIS_MASK) + sm4_set_dir(Y_AXIS_MASK, dir & Y_AXIS_MASK); + if (axis & Z_AXIS_MASK) + sm4_set_dir(Z_AXIS_MASK, dir & Z_AXIS_MASK); +} + /// Accelerate up to max.speed (defined by @min_delay_us) -void accelerate(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ +/// does not update global positions +void accelerate_1_step(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ sm4_do_step(axis); /// keep max speed (avoid extra computation) @@ -429,9 +461,24 @@ void accelerate(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_dela delay_us = t1; } -void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps){ +/// Goes defined number of steps while accelerating +/// updates global positions +void accelerate(uint8_t axis, uint8_t dir, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us, uint16_t steps){ + set_axis_dir(axis, dir); + while (steps--){ + accelerate_1_step(axis, acc, delay_us, min_delay_us); + update_position_1_step(axis, dir); + } +} + +/// keeps speed and then it decelerates to a complete stop (if possible) +/// it goes defined number of steps +/// returns after each step +/// \returns true if step was done +/// does not update global positions +bool go_and_stop_1_step(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps){ if (steps <= 0 || dec <= 0) - return; + return false; /// deceleration distance in steps, s = 1/2 v^2 / a uint16_t s = round_to_u16(100 * 0.5f * SQR(0.01f) / (SQR((float)delay_us) * dec)); @@ -441,27 +488,37 @@ void go_and_stop(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps) delayMicroseconds(delay_us); } else { /// decelerate - accelerate(axis, -dec, delay_us, delay_us); + accelerate_1_step(axis, -dec, delay_us, delay_us); } --steps; + return true; } -/// \returns steps done -uint16_t stop_smoothly(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t min_delay_us){ - if (dec <= 0) - return 0; - uint16_t steps = 0; - while (delay_us < MAX_DELAY){ - accelerate(axis, -dec, delay_us, min_delay_us); - ++steps; +/// \param dir sets direction of movement +/// updates global positions +void go_and_stop(uint8_t axis, uint8_t dir, int16_t dec, uint16_t &delay_us, uint16_t steps){ + set_axis_dir(axis, dir); + while (go_and_stop_1_step(axis, dec, delay_us, steps)){ + update_position_1_step(axis, dir); + } +} + +/// goes all the way to stop +/// \returns steps done +/// updates global positions +void stop_smoothly(uint8_t axis, uint8_t dir, int16_t dec, uint16_t &delay_us){ + if (dec <= 0) + return; + set_axis_dir(axis, dir); + while (delay_us < MAX_DELAY){ + accelerate_1_step(axis, -dec, delay_us, delay_us); + update_position_1_step(axis, dir); } - return steps; } void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t *pixels){ if (!pixels) return; - int16_t z = _Z; int16_t z_trig; uint16_t line_buffer[32]; uint16_t current_delay_us = MAX_DELAY; ///< defines current speed @@ -470,104 +527,103 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ uint16_t steps_to_go; for (uint8_t r = 0; r < 32; r++){ ///< Y axis - xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, z, delay_us, 0); - int8_t d = r % 2 ? 1 : 0; - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, _Z, delay_us, 0); + for (uint8_t d = 0; d < 2; ++d){ + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + sm4_set_dir(X_AXIS, d); + for (uint8_t c = 0; c < 32; c++){ ///< X axis + z_trig = min_z; - z = _Z; - sm4_set_dir(X_AXIS, d); - for (uint8_t c = 0; c < 32; c++){ ///< X axis - - z_trig = min_z; - - /// move up to un-trigger (surpress hysteresis) - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up from stop, go half the way - current_delay_us = MAX_DELAY; - for (start_z = z; z < (max_z + start_z) / 2; ++z){ - if (!_PINDA){ - break; + /// move up to un-trigger (surpress hysteresis) + sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up from stop, go half the way + current_delay_us = MAX_DELAY; + for (start_z = _Z; _Z < (max_z + start_z) / 2; ++_Z_){ + if (!_PINDA){ + break; + } + accelerate_1_step(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - } - if (_PINDA){ - steps_to_go = MAX(0, max_z - z); - while (_PINDA && z < max_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); - ++z; - } - } - z += stop_smoothly(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - - /// move down to trigger - sm4_set_dir(Z_AXIS, Z_MINUS); - /// speed up - current_delay_us = MAX_DELAY; - for (start_z = z; z > (min_z + start_z) / 2; --z){ if (_PINDA){ - z_trig = z; - break; + steps_to_go = MAX(0, max_z - _Z); + while (_PINDA && _Z < max_z){ + go_and_stop_1_step(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + ++_Z_; + } } - accelerate(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - } - /// slow down - if (!_PINDA){ - steps_to_go = MAX(0, z - min_z); - while (!_PINDA && z > min_z){ - go_and_stop(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); - --z; + stop_smoothly(Z_AXIS_MASK, Z_PLUS_MASK, Z_ACCEL, current_delay_us); + + /// move down to trigger + sm4_set_dir(Z_AXIS, Z_MINUS); + /// speed up + current_delay_us = MAX_DELAY; + for (start_z = _Z; _Z > (min_z + start_z) / 2; --_Z_){ + if (_PINDA){ + z_trig = _Z; + break; + } + accelerate_1_step(Z_AXIS_MASK, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + } + /// slow down + if (!_PINDA){ + steps_to_go = MAX(0, _Z - min_z); + while (!_PINDA && _Z > min_z){ + go_and_stop_1_step(Z_AXIS_MASK, Z_ACCEL, current_delay_us, steps_to_go); + --_Z_; + } + z_trig = _Z; + } + /// slow down to stop but not lower than min_z + while (_Z > min_z && current_delay_us < MAX_DELAY){ + accelerate_1_step(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); + --_Z_; } - z_trig = z; - } - /// slow down to stop but not lower than min_z - while (z > min_z && current_delay_us < MAX_DELAY){ - accelerate(Z_AXIS_MASK, -Z_ACCEL, current_delay_us, Z_MIN_DELAY); - --z; - } - count_position[2] = z; + if (d == 0){ + line_buffer[c] = (uint16_t)(z_trig - min_z); + } else { + /// data reversed in X + // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); + /// save average of both directions + pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); + } - // if (d == 0){ - // line_buffer[c] = (uint16_t)(z_trig - min_z); - // } else { - // /// data reversed in X - // // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); - // /// save average of both directions - // pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); - // } + /// move to the next point and move Z up diagonally (if needed) + current_delay_us = MAX_DELAY; + // const int8_t dir = (d & 1) ? -1 : 1; + const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; + const int16_t length_x = ABS(end_x - _X); + const int16_t half_x = length_x / 2; + int16_t x = 0; + /// don't go up if PINDA not triggered + const bool up = _PINDA; + int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); - pixels[(uint16_t)r * 32 + (r % 2 ? (31 - c) : c)] = (uint8_t)MIN((uint32_t)255, (uint32_t)z_trig - min_z); + // sm4_set_dir(Z_AXIS, Z_PLUS); + /// speed up + accelerate(axis, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); + + // for (x = 0; x <= half_x; ++x) + // { + // accelerate_1_step(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); + // if (up) + // ++_Z_; + // } + + /// slow down + go_and_stop(axis, dir, Z_ACCEL, current_delay_us, length_x - half_x); - /// move to the next point and move Z up diagonally (if needed) - current_delay_us = MAX_DELAY; - // const int8_t dir = (d & 1) ? -1 : 1; - const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; - const int16_t length_x = ABS(end_x - _X); - const int16_t half_x = length_x / 2; - int16_t x = 0; - /// don't go up if PINDA not triggered - const bool up = _PINDA; - int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; - - sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up - for (x = 0; x <= half_x; ++x){ - accelerate(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - if (up) - ++z; + // steps_to_go = length_x - x; + // for (; x < length_x; ++x){ + // go_and_stop_1_step(axis, Z_ACCEL, current_delay_us, steps_to_go); + // if (up) + // ++_Z_; + // } + // count_position[0] = end_x; } - /// slow down - steps_to_go = length_x - x; - for (; x < length_x; ++x){ - go_and_stop(axis, Z_ACCEL, current_delay_us, steps_to_go); - if (up) - ++z; - } - count_position[0] = end_x; - count_position[2] = z; - } - // } + } // DBG(_n("\n\n")); } } From b6e78bf900277763cfe4fd635f3f3769b9dcb0b7 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 14:08:30 +0100 Subject: [PATCH 100/218] Fix direction --- Firmware/xyzcal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 5563d34b5..8d5519d28 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -601,7 +601,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); - // sm4_set_dir(Z_AXIS, Z_PLUS); + sm4_set_dir(Z_AXIS, Z_PLUS); /// speed up accelerate(axis, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); @@ -615,7 +615,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ /// slow down go_and_stop(axis, dir, Z_ACCEL, current_delay_us, length_x - half_x); - // steps_to_go = length_x - x; + // steps_to_go = length_x - half_x; // for (; x < length_x; ++x){ // go_and_stop_1_step(axis, Z_ACCEL, current_delay_us, steps_to_go); // if (up) From 6461206e08bc776ecfc79b355d409e681923b990 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 14:19:05 +0100 Subject: [PATCH 101/218] Fix direction setting --- Firmware/xyzcal.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 8d5519d28..bc4e8dc86 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -417,11 +417,11 @@ void update_position_1_step(uint8_t axis, uint8_t dir){ void set_axis_dir(uint8_t axis, uint8_t dir){ if (axis & X_AXIS_MASK) - sm4_set_dir(X_AXIS_MASK, dir & X_AXIS_MASK); + sm4_set_dir(X_AXIS, dir & X_AXIS_MASK); if (axis & Y_AXIS_MASK) - sm4_set_dir(Y_AXIS_MASK, dir & Y_AXIS_MASK); + sm4_set_dir(Y_AXIS, dir & Y_AXIS_MASK); if (axis & Z_AXIS_MASK) - sm4_set_dir(Z_AXIS_MASK, dir & Z_AXIS_MASK); + sm4_set_dir(Z_AXIS, dir & Z_AXIS_MASK); } /// Accelerate up to max.speed (defined by @min_delay_us) @@ -601,7 +601,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); - sm4_set_dir(Z_AXIS, Z_PLUS); + // sm4_set_dir(Z_AXIS, Z_PLUS); /// speed up accelerate(axis, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); From a01dfe26fe8fad4f1b7f11d441639ecf01d7f66f Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 17:13:11 +0100 Subject: [PATCH 102/218] Add Manhattan movement --- Firmware/xyzcal.cpp | 74 ++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index bc4e8dc86..8c749aaf5 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -406,7 +406,6 @@ void print_hysterezis(int16_t min_z, int16_t max_z, int16_t step){ } void update_position_1_step(uint8_t axis, uint8_t dir){ - int8_t add = dir ? -1 : 1; if (axis & X_AXIS_MASK) _X_ += dir & X_AXIS_MASK ? -1 : 1; if (axis & Y_AXIS_MASK) @@ -424,10 +423,19 @@ void set_axis_dir(uint8_t axis, uint8_t dir){ sm4_set_dir(Z_AXIS, dir & Z_AXIS_MASK); } +void go_step(uint8_t axis){ + if (axis & X_AXIS_MASK) + sm4_do_step(X_AXIS); + if (axis & Y_AXIS_MASK) + sm4_do_step(Y_AXIS); + if (axis & Z_AXIS_MASK) + sm4_do_step(Z_AXIS); +} + /// Accelerate up to max.speed (defined by @min_delay_us) /// does not update global positions void accelerate_1_step(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ - sm4_do_step(axis); + go_step(axis); /// keep max speed (avoid extra computation) if (acc > 0 && delay_us == min_delay_us){ @@ -484,7 +492,7 @@ bool go_and_stop_1_step(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t uint16_t s = round_to_u16(100 * 0.5f * SQR(0.01f) / (SQR((float)delay_us) * dec)); if (steps > s){ /// go steady - sm4_do_step(axis); + go_step(axis); delayMicroseconds(delay_us); } else { /// decelerate @@ -516,20 +524,44 @@ void stop_smoothly(uint8_t axis, uint8_t dir, int16_t dec, uint16_t &delay_us){ } } +void go_start_stop(uint8_t axis, uint8_t dir, int16_t acc, uint16_t min_delay_us, uint16_t steps){ + uint16_t current_delay_us = MAX_DELAY; + const uint16_t half = steps / 2; + accelerate(axis, dir, acc, current_delay_us, min_delay_us, half); + go_and_stop(axis, dir, -acc, current_delay_us, steps - half); +} + +/// moves X, Y, Z one after each other +/// starts and ends at 0 speed +void go_manhattan(int16_t x, int16_t y, int16_t z, int16_t acc, uint16_t min_delay_us){ + int32_t length; + + DBG(_n("x %d -> %d\n"), x, _X); + length = x - _X; + go_start_stop(X_AXIS_MASK, length < 0 ? X_MINUS_MASK : X_PLUS_MASK, acc, min_delay_us, ABS(length)); + + DBG(_n("y %d -> %d\n"), y, _Y); + length = y - _Y; + go_start_stop(Y_AXIS_MASK, length < 0 ? Y_MINUS_MASK : Y_PLUS_MASK, acc, min_delay_us, ABS(length)); + + DBG(_n("z %d -> %d\n"), z, _Z); + length = z - _Z; + go_start_stop(Z_AXIS_MASK, length < 0 ? Z_MINUS_MASK : Z_PLUS_MASK, acc, min_delay_us, ABS(length)); +} + void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t *pixels){ if (!pixels) return; int16_t z_trig; uint16_t line_buffer[32]; uint16_t current_delay_us = MAX_DELAY; ///< defines current speed - xyzcal_lineXYZ_to(cx - 1024, cy - 1024, min_z, delay_us, 0); int16_t start_z; uint16_t steps_to_go; for (uint8_t r = 0; r < 32; r++){ ///< Y axis - xyzcal_lineXYZ_to(_X, cy - 1024 + r * 64, _Z, delay_us, 0); for (uint8_t d = 0; d < 2; ++d){ - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), _Y, min_z, delay_us, 0); + go_manhattan((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); + // xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, delay_us, 0); sm4_set_dir(X_AXIS, d); for (uint8_t c = 0; c < 32; c++){ ///< X axis z_trig = min_z; @@ -585,7 +617,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ } else { /// data reversed in X // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); - /// save average of both directions + /// save average of both directions (filters effect of hysteresis) pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } @@ -595,33 +627,13 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; const int16_t length_x = ABS(end_x - _X); const int16_t half_x = length_x / 2; - int16_t x = 0; - /// don't go up if PINDA not triggered + /// don't go up if PINDA not triggered (optimization) const bool up = _PINDA; - int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; - uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); + const int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + const uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); - // sm4_set_dir(Z_AXIS, Z_PLUS); - /// speed up - accelerate(axis, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); - - // for (x = 0; x <= half_x; ++x) - // { - // accelerate_1_step(axis, Z_ACCEL, current_delay_us, Z_MIN_DELAY); - // if (up) - // ++_Z_; - // } - - /// slow down + accelerate(axis, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); go_and_stop(axis, dir, Z_ACCEL, current_delay_us, length_x - half_x); - - // steps_to_go = length_x - half_x; - // for (; x < length_x; ++x){ - // go_and_stop_1_step(axis, Z_ACCEL, current_delay_us, steps_to_go); - // if (up) - // ++_Z_; - // } - // count_position[0] = end_x; } } // DBG(_n("\n\n")); From 922769cefb64ab2b6afaba4991abbe86a18bc9d9 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 17:14:18 +0100 Subject: [PATCH 103/218] axis -> axes --- Firmware/xyzcal.cpp | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 8c749aaf5..411b48908 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -414,28 +414,28 @@ void update_position_1_step(uint8_t axis, uint8_t dir){ _Z_ += dir & Z_AXIS_MASK ? -1 : 1; } -void set_axis_dir(uint8_t axis, uint8_t dir){ - if (axis & X_AXIS_MASK) +void set_axes_dir(uint8_t axes, uint8_t dir){ + if (axes & X_AXIS_MASK) sm4_set_dir(X_AXIS, dir & X_AXIS_MASK); - if (axis & Y_AXIS_MASK) + if (axes & Y_AXIS_MASK) sm4_set_dir(Y_AXIS, dir & Y_AXIS_MASK); - if (axis & Z_AXIS_MASK) + if (axes & Z_AXIS_MASK) sm4_set_dir(Z_AXIS, dir & Z_AXIS_MASK); } -void go_step(uint8_t axis){ - if (axis & X_AXIS_MASK) +void go_step(uint8_t axes){ + if (axes & X_AXIS_MASK) sm4_do_step(X_AXIS); - if (axis & Y_AXIS_MASK) + if (axes & Y_AXIS_MASK) sm4_do_step(Y_AXIS); - if (axis & Z_AXIS_MASK) + if (axes & Z_AXIS_MASK) sm4_do_step(Z_AXIS); } /// Accelerate up to max.speed (defined by @min_delay_us) /// does not update global positions -void accelerate_1_step(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ - go_step(axis); +void accelerate_1_step(uint8_t axes, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ + go_step(axes); /// keep max speed (avoid extra computation) if (acc > 0 && delay_us == min_delay_us){ @@ -471,11 +471,11 @@ void accelerate_1_step(uint8_t axis, int16_t acc, uint16_t &delay_us, uint16_t m /// Goes defined number of steps while accelerating /// updates global positions -void accelerate(uint8_t axis, uint8_t dir, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us, uint16_t steps){ - set_axis_dir(axis, dir); +void accelerate(uint8_t axes, uint8_t dir, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us, uint16_t steps){ + set_axes_dir(axes, dir); while (steps--){ - accelerate_1_step(axis, acc, delay_us, min_delay_us); - update_position_1_step(axis, dir); + accelerate_1_step(axes, acc, delay_us, min_delay_us); + update_position_1_step(axes, dir); } } @@ -484,7 +484,7 @@ void accelerate(uint8_t axis, uint8_t dir, int16_t acc, uint16_t &delay_us, uint /// returns after each step /// \returns true if step was done /// does not update global positions -bool go_and_stop_1_step(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t &steps){ +bool go_and_stop_1_step(uint8_t axes, int16_t dec, uint16_t &delay_us, uint16_t &steps){ if (steps <= 0 || dec <= 0) return false; @@ -492,11 +492,11 @@ bool go_and_stop_1_step(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t uint16_t s = round_to_u16(100 * 0.5f * SQR(0.01f) / (SQR((float)delay_us) * dec)); if (steps > s){ /// go steady - go_step(axis); + go_step(axes); delayMicroseconds(delay_us); } else { /// decelerate - accelerate_1_step(axis, -dec, delay_us, delay_us); + accelerate_1_step(axes, -dec, delay_us, delay_us); } --steps; return true; @@ -504,31 +504,31 @@ bool go_and_stop_1_step(uint8_t axis, int16_t dec, uint16_t &delay_us, uint16_t /// \param dir sets direction of movement /// updates global positions -void go_and_stop(uint8_t axis, uint8_t dir, int16_t dec, uint16_t &delay_us, uint16_t steps){ - set_axis_dir(axis, dir); - while (go_and_stop_1_step(axis, dec, delay_us, steps)){ - update_position_1_step(axis, dir); +void go_and_stop(uint8_t axes, uint8_t dir, int16_t dec, uint16_t &delay_us, uint16_t steps){ + set_axes_dir(axes, dir); + while (go_and_stop_1_step(axes, dec, delay_us, steps)){ + update_position_1_step(axes, dir); } } /// goes all the way to stop /// \returns steps done /// updates global positions -void stop_smoothly(uint8_t axis, uint8_t dir, int16_t dec, uint16_t &delay_us){ +void stop_smoothly(uint8_t axes, uint8_t dir, int16_t dec, uint16_t &delay_us){ if (dec <= 0) return; - set_axis_dir(axis, dir); + set_axes_dir(axes, dir); while (delay_us < MAX_DELAY){ - accelerate_1_step(axis, -dec, delay_us, delay_us); - update_position_1_step(axis, dir); + accelerate_1_step(axes, -dec, delay_us, delay_us); + update_position_1_step(axes, dir); } } -void go_start_stop(uint8_t axis, uint8_t dir, int16_t acc, uint16_t min_delay_us, uint16_t steps){ +void go_start_stop(uint8_t axes, uint8_t dir, int16_t acc, uint16_t min_delay_us, uint16_t steps){ uint16_t current_delay_us = MAX_DELAY; const uint16_t half = steps / 2; - accelerate(axis, dir, acc, current_delay_us, min_delay_us, half); - go_and_stop(axis, dir, -acc, current_delay_us, steps - half); + accelerate(axes, dir, acc, current_delay_us, min_delay_us, half); + go_and_stop(axes, dir, -acc, current_delay_us, steps - half); } /// moves X, Y, Z one after each other From c1e6567461b53fdd064e0614aaab2cb14e2e9629 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 17:17:32 +0100 Subject: [PATCH 104/218] Fix step axis coding --- Firmware/xyzcal.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 411b48908..8c563f5f8 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -423,19 +423,10 @@ void set_axes_dir(uint8_t axes, uint8_t dir){ sm4_set_dir(Z_AXIS, dir & Z_AXIS_MASK); } -void go_step(uint8_t axes){ - if (axes & X_AXIS_MASK) - sm4_do_step(X_AXIS); - if (axes & Y_AXIS_MASK) - sm4_do_step(Y_AXIS); - if (axes & Z_AXIS_MASK) - sm4_do_step(Z_AXIS); -} - /// Accelerate up to max.speed (defined by @min_delay_us) /// does not update global positions void accelerate_1_step(uint8_t axes, int16_t acc, uint16_t &delay_us, uint16_t min_delay_us){ - go_step(axes); + sm4_do_step(axes); /// keep max speed (avoid extra computation) if (acc > 0 && delay_us == min_delay_us){ @@ -492,7 +483,7 @@ bool go_and_stop_1_step(uint8_t axes, int16_t dec, uint16_t &delay_us, uint16_t uint16_t s = round_to_u16(100 * 0.5f * SQR(0.01f) / (SQR((float)delay_us) * dec)); if (steps > s){ /// go steady - go_step(axes); + sm4_do_step(axes); delayMicroseconds(delay_us); } else { /// decelerate From c2ab8785f4a8d67a0927ad686bd9b8fd78ff536a Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 17:31:34 +0100 Subject: [PATCH 105/218] Revert Manhattan --- Firmware/xyzcal.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 8c563f5f8..bb49e1cc0 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -551,8 +551,8 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ for (uint8_t r = 0; r < 32; r++){ ///< Y axis for (uint8_t d = 0; d < 2; ++d){ - go_manhattan((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); - // xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, delay_us, 0); + // go_manhattan((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); + xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, delay_us, 0); sm4_set_dir(X_AXIS, d); for (uint8_t c = 0; c < 32; c++){ ///< X axis z_trig = min_z; @@ -620,11 +620,11 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ const int16_t half_x = length_x / 2; /// don't go up if PINDA not triggered (optimization) const bool up = _PINDA; - const int8_t axis = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + const uint8_t axes = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; const uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); - accelerate(axis, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); - go_and_stop(axis, dir, Z_ACCEL, current_delay_us, length_x - half_x); + accelerate(axes, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); + go_and_stop(axes, dir, Z_ACCEL, current_delay_us, length_x - half_x); } } // DBG(_n("\n\n")); From c14e7255746f2ad0d68674246813d61b9a387c42 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 29 Dec 2020 18:27:33 +0100 Subject: [PATCH 106/218] Fix moves --- Firmware/xyzcal.cpp | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index bb49e1cc0..fb7b1f5a2 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -516,6 +516,8 @@ void stop_smoothly(uint8_t axes, uint8_t dir, int16_t dec, uint16_t &delay_us){ } void go_start_stop(uint8_t axes, uint8_t dir, int16_t acc, uint16_t min_delay_us, uint16_t steps){ + if (steps == 0) + return; uint16_t current_delay_us = MAX_DELAY; const uint16_t half = steps / 2; accelerate(axes, dir, acc, current_delay_us, min_delay_us, half); @@ -527,17 +529,18 @@ void go_start_stop(uint8_t axes, uint8_t dir, int16_t acc, uint16_t min_delay_us void go_manhattan(int16_t x, int16_t y, int16_t z, int16_t acc, uint16_t min_delay_us){ int32_t length; - DBG(_n("x %d -> %d\n"), x, _X); + // DBG(_n("x %d -> %d, "), x, _X); length = x - _X; go_start_stop(X_AXIS_MASK, length < 0 ? X_MINUS_MASK : X_PLUS_MASK, acc, min_delay_us, ABS(length)); - DBG(_n("y %d -> %d\n"), y, _Y); + // DBG(_n("y %d -> %d, "), y, _Y); length = y - _Y; go_start_stop(Y_AXIS_MASK, length < 0 ? Y_MINUS_MASK : Y_PLUS_MASK, acc, min_delay_us, ABS(length)); - DBG(_n("z %d -> %d\n"), z, _Z); + // DBG(_n("z %d -> %d\n"), z, _Z); length = z - _Z; go_start_stop(Z_AXIS_MASK, length < 0 ? Z_MINUS_MASK : Z_PLUS_MASK, acc, min_delay_us, ABS(length)); + // DBG(_n("\n")); } void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_t max_z, uint16_t delay_us, uint8_t *pixels){ @@ -551,10 +554,25 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ for (uint8_t r = 0; r < 32; r++){ ///< Y axis for (uint8_t d = 0; d < 2; ++d){ - // go_manhattan((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); - xyzcal_lineXYZ_to((d & 1) ? (cx + 1024) : (cx - 1024), cy - 1024 + r * 64, _Z, delay_us, 0); + go_manhattan((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); + xyzcal_lineXYZ_to((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, delay_us, 0); sm4_set_dir(X_AXIS, d); for (uint8_t c = 0; c < 32; c++){ ///< X axis + + /// move to the next point and move Z up diagonally (if needed) + current_delay_us = MAX_DELAY; + const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; + const int16_t length_x = ABS(end_x - _X); + const int16_t half_x = length_x / 2; + /// don't go up if PINDA not triggered (optimization) + const bool up = _PINDA; + const uint8_t axes = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; + const uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); + + accelerate(axes, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); + go_and_stop(axes, dir, Z_ACCEL, current_delay_us, length_x - half_x); + + z_trig = min_z; /// move up to un-trigger (surpress hysteresis) @@ -611,20 +629,6 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ /// save average of both directions (filters effect of hysteresis) pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } - - /// move to the next point and move Z up diagonally (if needed) - current_delay_us = MAX_DELAY; - // const int8_t dir = (d & 1) ? -1 : 1; - const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; - const int16_t length_x = ABS(end_x - _X); - const int16_t half_x = length_x / 2; - /// don't go up if PINDA not triggered (optimization) - const bool up = _PINDA; - const uint8_t axes = up ? X_AXIS_MASK | Z_AXIS_MASK : X_AXIS_MASK; - const uint8_t dir = Z_PLUS_MASK | (d & 1 ? X_MINUS_MASK : X_PLUS_MASK); - - accelerate(axes, dir, Z_ACCEL, current_delay_us, Z_MIN_DELAY, half_x); - go_and_stop(axes, dir, Z_ACCEL, current_delay_us, length_x - half_x); } } // DBG(_n("\n\n")); From 03b87ae68bb0eec0c1ab9a3cf32b0d2340ad6e01 Mon Sep 17 00:00:00 2001 From: espr14 Date: Wed, 30 Dec 2020 13:08:47 +0100 Subject: [PATCH 107/218] Add 8 pixel circle pattern --- Firmware/xyzcal.cpp | 48 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index fb7b1f5a2..7e81602cb 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -552,13 +552,16 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ int16_t start_z; uint16_t steps_to_go; + DBG(_n("Scan countdown: ")); + for (uint8_t r = 0; r < 32; r++){ ///< Y axis for (uint8_t d = 0; d < 2; ++d){ go_manhattan((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); xyzcal_lineXYZ_to((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, delay_us, 0); sm4_set_dir(X_AXIS, d); + DBG(_n("%d "), 64 - (r * 2 + d)); ///< to keep OctoPrint connection alive + for (uint8_t c = 0; c < 32; c++){ ///< X axis - /// move to the next point and move Z up diagonally (if needed) current_delay_us = MAX_DELAY; const int16_t end_x = ((d & 1) ? 1 : -1) * (64 * (16 - c) - 32) + cx; @@ -631,8 +634,8 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ } } } - // DBG(_n("\n\n")); } + DBG(_n("\n")); } /// Returns rate of match @@ -705,7 +708,8 @@ const int16_t xyzcal_point_xcoords[4] PROGMEM = {1200, 22000, 22000, 1200}; const int16_t xyzcal_point_ycoords[4] PROGMEM = {700, 700, 19800, 19800}; #endif //((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3)) -const uint16_t xyzcal_point_pattern[12] PROGMEM = {0x000, 0x0f0, 0x1f8, 0x3fc, 0x7fe, 0x7fe, 0x7fe, 0x7fe, 0x3fc, 0x1f8, 0x0f0, 0x000}; +const uint16_t xyzcal_point_pattern_10[12] PROGMEM = {0x000, 0x0f0, 0x1f8, 0x3fc, 0x7fe, 0x7fe, 0x7fe, 0x7fe, 0x3fc, 0x1f8, 0x0f0, 0x000}; +const uint16_t xyzcal_point_pattern_08[12] PROGMEM = {0x000, 0x000, 0x0f0, 0x1f8, 0x3fc, 0x3fc, 0x3fc, 0x3fc, 0x1f8, 0x0f0, 0x000, 0x000}; bool xyzcal_searchZ(void) { @@ -814,6 +818,8 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t float shifts_y[blocks]; float shifts_r[blocks]; + DBG(_n(" [%f, %f][%f] start circle\n"), x, y, r); + for (int8_t i = iterations; i > 0; --i){ // DBG(_n(" [%f, %f][%f] circle\n"), x, y, r); @@ -871,6 +877,30 @@ void print_image(uint8_t *matrix_32x32){ DBG(_n("\n")); } +/// Takes two patterns and searches them in matrix32 +/// \returns best match +uint8_t find_patterns(uint8_t *matrix32, uint16_t *pattern08, uint16_t *pattern10, uint8_t &col, uint8_t &row){ + uint8_t c08 = 0; + uint8_t r08 = 0; + uint8_t match08 = 0; + uint8_t c10 = 0; + uint8_t r10 = 0; + uint8_t match10 = 0; + + match08 = xyzcal_find_pattern_12x12_in_32x32(matrix32, pattern08, &c08, &r08); + match10 = xyzcal_find_pattern_12x12_in_32x32(matrix32, pattern10, &c10, &r10); + + if (match08 > match10){ + col = c08; + row = r08; + return match08; + } + + col = c10; + row = r10; + return match10; +} + /// scans area around the current head location and /// searches for the center of the calibration pin bool xyzcal_scan_and_process(void){ @@ -881,21 +911,25 @@ bool xyzcal_scan_and_process(void){ int16_t z = _Z; uint8_t *matrix32 = (uint8_t *)block_buffer; - uint16_t *pattern = (uint16_t *)(matrix32 + 32 * 32); + uint16_t *pattern08 = (uint16_t *)(matrix32 + 32 * 32); + uint16_t *pattern10 = (uint16_t *)(pattern08 + 12); xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 200, matrix32); print_image(matrix32); for (uint8_t i = 0; i < 12; i++){ - pattern[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern + i)); -// DBG(_n(" pattern[%d]=%d\n"), i, pattern[i]); + pattern08[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_08 + i)); + pattern10[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_10 + i)); + // DBG(_n(" pattern[%d]=%d\n"), i, pattern[i]); } /// SEARCH FOR BINARY CIRCLE uint8_t uc = 0; uint8_t ur = 0; + + /// max match = 132, 1/2 good = 66, 2/3 good = 88 - if (xyzcal_find_pattern_12x12_in_32x32(matrix32, pattern, &uc, &ur) >= 88){ + if (find_patterns(matrix32, pattern08, pattern10, uc, ur) >= 88){ /// find precise circle /// move to the center of the pattern (+5.5) float xf = uc + 5.5f; From 13fefaa1bff902c919ced316bee589de885be16d Mon Sep 17 00:00:00 2001 From: espr14 Date: Wed, 30 Dec 2020 15:01:32 +0100 Subject: [PATCH 108/218] Fix typo --- Firmware/xyzcal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 7e81602cb..636c6b9cd 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -385,11 +385,11 @@ int8_t xyzcal_meassure_pinda_hysterezis(int16_t min_z, int16_t max_z, uint16_t d } #endif //XYZCAL_MEASSURE_PINDA_HYSTEREZIS -void print_hysterezis(int16_t min_z, int16_t max_z, int16_t step){ +void print_hysteresis(int16_t min_z, int16_t max_z, int16_t step){ int16_t delay_us = 600; int16_t trigger = 0; int16_t untrigger = 0; - DBG(_n("Hysterezis\n")); + DBG(_n("Hysteresis\n")); xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 0); From a9fd09ca3f06b2f775c3ab35a9ccd02e6ed7b119 Mon Sep 17 00:00:00 2001 From: espr14 Date: Wed, 30 Dec 2020 15:15:17 +0100 Subject: [PATCH 109/218] Implement median --- Firmware/xyzcal.cpp | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 636c6b9cd..89bb1cc52 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -800,6 +800,24 @@ float highest(float *points, const uint8_t num_points){ return max; } +/// slow bubble sort but short +void sort(float *points, const uint8_t num_points){ + /// one direction bubble sort + for (uint8_t i = 0; i < num_points; ++i){ + for (uint8_t j = 0; j < num_points - i - 1; ++j){ + if (points[j] > points[j + 1]) + SWAP(points[j], points[j + 1]); + } + } +} + +/// sort array and returns median value +/// don't send empty array or nullptr +float median(float *points, const uint8_t num_points){ + sort(points, num_points); + return points[num_points / 2]; +} + /// Searches for circle iteratively /// Uses points on the perimeter. If point is high it pushes circle out of the center (shift or change of radius), /// otherwise to the center. @@ -846,18 +864,11 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t } } - /// remove extreme values (slow but simple) - for (uint8_t j = 0; j < blocks / 2; ++j){ - remove_highest(shifts_x, blocks); - remove_highest(shifts_y, blocks); - remove_highest(shifts_r, blocks); - } - /// median is the highest now norm = 1.f / (32.f * (num_points * 3 / 4)); - x += CLAMP(highest(shifts_x, blocks) * norm, -max_val, max_val); - y += CLAMP(highest(shifts_y, blocks) * norm, -max_val, max_val); - r += CLAMP(highest(shifts_r, blocks) * norm, -max_val, max_val); + x += CLAMP(median(shifts_x, blocks) * norm, -max_val, max_val); + y += CLAMP(median(shifts_y, blocks) * norm, -max_val, max_val); + r += CLAMP(median(shifts_r, blocks) * norm, -max_val, max_val); r = MAX(2, r); From 49d57ed6216748e68ac07711ba33c9d5090a993b Mon Sep 17 00:00:00 2001 From: espr14 Date: Wed, 30 Dec 2020 17:02:31 +0100 Subject: [PATCH 110/218] Median dynamic circle --- Firmware/xyzcal.cpp | 50 ++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 89bb1cc52..f5d6bc0ee 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -809,8 +809,14 @@ void sort(float *points, const uint8_t num_points){ SWAP(points[j], points[j + 1]); } } + + // DBG(_n("Sorted: ")); + // for (uint8_t i = 0; i < num_points; ++i) + // DBG(_n("%f "), points[i]); + // DBG(_n("\n")); } + /// sort array and returns median value /// don't send empty array or nullptr float median(float *points, const uint8_t num_points){ @@ -828,10 +834,9 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t float points[num_points]; float pi_2_div_num_points = 2 * M_PI / num_points; const constexpr uint8_t target_z = 32; ///< target z height of the circle - float norm; float angle; - float max_val = 0.5f; - const uint8_t blocks = 7; + float max_change = 0.5f; ///< avoids too fast changes (could cause oscillation) + const uint8_t blocks = num_points; float shifts_x[blocks]; float shifts_y[blocks]; float shifts_r[blocks]; @@ -840,35 +845,38 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t for (int8_t i = iterations; i > 0; --i){ - // DBG(_n(" [%f, %f][%f] circle\n"), x, y, r); + DBG(_n(" [%f, %f][%f] circle\n"), x, y, r); /// read points on the circle for (uint8_t p = 0; p < num_points; ++p){ angle = p * pi_2_div_num_points; points[p] = get_value(matrix_32x32, r * cos(angle) + x, r * sin(angle) + y) - target_z; // DBG(_n("%f "), points[p]); + + shifts_x[p] = cos(angle) * points[p]; + shifts_y[p] = sin(angle) * points[p]; + shifts_r[p] = points[p]; } // DBG(_n(" points\n")); - /// sum blocks - for (uint8_t j = 0; j < blocks; ++j){ - shifts_x[j] = shifts_y[j] = shifts_r[j] = 0; - /// first part - for (uint8_t p = 0; p < num_points * 3 / 4; ++p){ - uint8_t idx = (p + j * num_points / blocks) % num_points; + // /// sum blocks + // for (uint8_t j = 0; j < blocks; ++j){ + // shifts_x[j] = shifts_y[j] = shifts_r[j] = 0; + // /// first part + // for (uint8_t p = 0; p < num_points * 3 / 4; ++p){ + // uint8_t idx = (p + j * num_points / blocks) % num_points; - angle = idx * pi_2_div_num_points; - shifts_x[j] += cos(angle) * points[idx]; - shifts_y[j] += sin(angle) * points[idx]; - shifts_r[j] += points[idx]; - } - } + // angle = idx * pi_2_div_num_points; + // shifts_x[j] += cos(angle) * points[idx]; + // shifts_y[j] += sin(angle) * points[idx]; + // shifts_r[j] += points[idx]; + // } + // } - /// median is the highest now - norm = 1.f / (32.f * (num_points * 3 / 4)); - x += CLAMP(median(shifts_x, blocks) * norm, -max_val, max_val); - y += CLAMP(median(shifts_y, blocks) * norm, -max_val, max_val); - r += CLAMP(median(shifts_r, blocks) * norm, -max_val, max_val); + const float norm = 1.f / 32.f; + x += CLAMP(median(shifts_x, blocks) * norm, -max_change, max_change); + y += CLAMP(median(shifts_y, blocks) * norm, -max_change, max_change); + r += CLAMP(median(shifts_r, blocks) * norm * .5f, -max_change, max_change); r = MAX(2, r); From cc9e7b9376dac9ef40bd4c1cbc42e419ed1ee549 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 4 Jan 2021 13:01:06 +0100 Subject: [PATCH 111/218] Fix comments, remove unused --- Firmware/xyzcal.cpp | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index f5d6bc0ee..d36244941 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -627,8 +627,8 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ if (d == 0){ line_buffer[c] = (uint16_t)(z_trig - min_z); } else { - /// data reversed in X - // DBG(_n("%04x"), (line_buffer[31 - c] + (z - min_z)) / 2); + /// !!! data reversed in X + // DBG(_n("%04x"), ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); /// save average of both directions (filters effect of hysteresis) pixels[(uint16_t)r * 32 + (31 - c)] = (uint8_t)MIN((uint32_t)255, ((uint32_t)line_buffer[31 - c] + (z_trig - min_z)) / 2); } @@ -831,11 +831,10 @@ float median(float *points, const uint8_t num_points){ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t iterations){ /// circle of 10.5 diameter has 33 in circumference, don't go much above const constexpr uint8_t num_points = 33; - float points[num_points]; float pi_2_div_num_points = 2 * M_PI / num_points; const constexpr uint8_t target_z = 32; ///< target z height of the circle float angle; - float max_change = 0.5f; ///< avoids too fast changes (could cause oscillation) + float max_change = 0.5f; ///< avoids too fast changes (avoid oscillation) const uint8_t blocks = num_points; float shifts_x[blocks]; float shifts_y[blocks]; @@ -850,29 +849,15 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t /// read points on the circle for (uint8_t p = 0; p < num_points; ++p){ angle = p * pi_2_div_num_points; - points[p] = get_value(matrix_32x32, r * cos(angle) + x, r * sin(angle) + y) - target_z; - // DBG(_n("%f "), points[p]); + const float height = get_value(matrix_32x32, r * cos(angle) + x, r * sin(angle) + y) - target_z; + // DBG(_n("%f "), point); - shifts_x[p] = cos(angle) * points[p]; - shifts_y[p] = sin(angle) * points[p]; - shifts_r[p] = points[p]; + shifts_x[p] = cos(angle) * height; + shifts_y[p] = sin(angle) * height; + shifts_r[p] = height; } // DBG(_n(" points\n")); - // /// sum blocks - // for (uint8_t j = 0; j < blocks; ++j){ - // shifts_x[j] = shifts_y[j] = shifts_r[j] = 0; - // /// first part - // for (uint8_t p = 0; p < num_points * 3 / 4; ++p){ - // uint8_t idx = (p + j * num_points / blocks) % num_points; - - // angle = idx * pi_2_div_num_points; - // shifts_x[j] += cos(angle) * points[idx]; - // shifts_y[j] += sin(angle) * points[idx]; - // shifts_r[j] += points[idx]; - // } - // } - const float norm = 1.f / 32.f; x += CLAMP(median(shifts_x, blocks) * norm, -max_change, max_change); y += CLAMP(median(shifts_y, blocks) * norm, -max_change, max_change); @@ -939,7 +924,6 @@ bool xyzcal_scan_and_process(void){ for (uint8_t i = 0; i < 12; i++){ pattern08[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_08 + i)); pattern10[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_10 + i)); - // DBG(_n(" pattern[%d]=%d\n"), i, pattern[i]); } /// SEARCH FOR BINARY CIRCLE From 2981b9e9c5d822a5e5ff4809f6f9eba818a25115 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 4 Jan 2021 14:59:12 +0100 Subject: [PATCH 112/218] OctoPrint needs new lines --- Firmware/xyzcal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index d36244941..c68804890 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -559,7 +559,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ go_manhattan((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); xyzcal_lineXYZ_to((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, delay_us, 0); sm4_set_dir(X_AXIS, d); - DBG(_n("%d "), 64 - (r * 2 + d)); ///< to keep OctoPrint connection alive + DBG(_n("%d\n"), 64 - (r * 2 + d)); ///< to keep OctoPrint connection alive for (uint8_t c = 0; c < 32; c++){ ///< X axis /// move to the next point and move Z up diagonally (if needed) From 603d704178d6742c175f537fdab242eeeeafedaf Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Thu, 7 Jan 2021 12:50:58 +0100 Subject: [PATCH 113/218] Version changed (3.9.3 build 3556) --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index fda3bc9e8..315f808a4 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.9.3-RC1" -#define FW_COMMIT_NR 3555 +#define FW_VERSION "3.9.3" +#define FW_COMMIT_NR 3556 // 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 From f7dbc70b9c5112afd9821b0bddb0d6462596c539 Mon Sep 17 00:00:00 2001 From: Mesa Komarevich Date: Thu, 17 Dec 2020 05:52:14 -0700 Subject: [PATCH 114/218] Added some specific instructions for building firmware with a Debian WSL install. Updated commands to use sudo to avoid permission errors. --- README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1562552bc..6cc123987 100644 --- a/README.md +++ b/README.md @@ -111,10 +111,14 @@ _notes: Script and instructions contributed by 3d-gussner. Use at your own risk. - follow the Microsoft guide https://docs.microsoft.com/en-us/windows/wsl/install-win10 You can also use the 'prepare_winbuild.ps1' powershell script with Administrator rights - Tested versions are at this moment - - Ubuntu other may different + - Ubuntu and Debian, other may different - After the installation and reboot please open your Ubuntu bash and do following steps - - run command `apt-get update` - - to install zip run `apt-get install zip` + - run command `sudo apt-get update` + - run command `sudo apt-get upgrade` + - to install zip run `sudo apt-get install zip` + - if using Debian: + - install dos2unix by running `sudo apt-get install dos2unix` + - run `dos2unix PF-build.sh` to convert the windows line endings to unix line endings - add few lines at the top of `~/.bashrc` by running `sudo nano ~/.bashrc` export OS="Linux" @@ -122,10 +126,10 @@ _notes: Script and instructions contributed by 3d-gussner. Use at your own risk. export GPG_TTY=$(tty) use `CRTL-X` to close nano and confirm to write the new entries - - restart Ubuntu bash -Now your Ubuntu subsystem is ready to use the automatic `PF-build.sh` script and compile your firmware correctly + - restart Ubuntu/Debian bash + - Now your Ubuntu/Debian subsystem is ready to use the automatic `PF-build.sh` script and compile your firmware correctly -#### Some Tips for Ubuntu +#### Some Tips for Ubuntu and Debian - Linux is case sensetive so please don't forget to use capital letters where needed, like changing to a directory - To change the path to your Prusa-Firmware location you downloaded and unzipped - Example: You files are under `C:\Users\\Downloads\Prusa-Firmware-MK3` @@ -137,7 +141,7 @@ Now your Ubuntu subsystem is ready to use the automatic `PF-build.sh` script and - If your Windows isn't in English the Paths may look different Example in other languages - English `/mnt/c/Users//Downloads/Prusa-Firmware-MK3` will be on a German Windows`/mnt/c/Anwender//Downloads/Prusa-Firmware-MK3` -#### Compile Prusa-firmware with Ubuntu Linux subsystem installed +#### Compile Prusa-firmware with Ubuntu/Debian Linux subsystem installed - open Ubuntu bash - change to your source code folder (case sensitive) - run `./PF-build.sh` From 2764b9455851e3c6fc83feac2b44c620589536e8 Mon Sep 17 00:00:00 2001 From: Mesa Komarevich Date: Tue, 22 Dec 2020 06:37:23 -0700 Subject: [PATCH 115/218] Updated the dos2unix instructions to no longer be specific to Debian, as unix based distro's being able to handle windows line endings should be considered an exception, and not the rule. Also fixed a few spelling mistakes in the README. --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6cc123987..108214c0d 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ _Note: Multi language build is not supported._ **c.** Modify compiler flags in `platform.txt` file -* The platform.txt file can be found in Arduino instalation directory, or after Arduino has been updated at: `"C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)"` If you can locate the file in both places, file from user profile is probably used. +* The platform.txt file can be found in Arduino installation directory, or after Arduino has been updated at: `"C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)"` If you can locate the file in both places, file from user profile is probably used. * Add `"-Wl,-u,vfprintf -lprintf_flt -lm"` to `"compiler.c.elf.flags="` before existing flag "-Wl,--gc-sections" @@ -116,9 +116,8 @@ _notes: Script and instructions contributed by 3d-gussner. Use at your own risk. - run command `sudo apt-get update` - run command `sudo apt-get upgrade` - to install zip run `sudo apt-get install zip` - - if using Debian: - - install dos2unix by running `sudo apt-get install dos2unix` - - run `dos2unix PF-build.sh` to convert the windows line endings to unix line endings + - to install dos2unix run `sudo apt-get install dos2unix` + - run `dos2unix PF-build.sh` to convert the windows line endings to unix line endings - add few lines at the top of `~/.bashrc` by running `sudo nano ~/.bashrc` export OS="Linux" @@ -130,7 +129,7 @@ _notes: Script and instructions contributed by 3d-gussner. Use at your own risk. - Now your Ubuntu/Debian subsystem is ready to use the automatic `PF-build.sh` script and compile your firmware correctly #### Some Tips for Ubuntu and Debian -- Linux is case sensetive so please don't forget to use capital letters where needed, like changing to a directory +- Linux is case sensitive so please don't forget to use capital letters where needed, like changing to a directory - To change the path to your Prusa-Firmware location you downloaded and unzipped - Example: You files are under `C:\Users\\Downloads\Prusa-Firmware-MK3` - use under Ubuntu the following command `cd /mnt/c/Users//Downloads/Prusa-Firmware-MK3` @@ -210,7 +209,7 @@ or visit https://prusa3d.github.io/Prusa-Firmware-Doc for doxygen generated outp # 5. FAQ Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface. -A:Step 1.c was ommited or you updated Arduino and now platform.txt located somewhere in your user profile is used. +A:Step 1.c was omitted or you updated Arduino and now platform.txt located somewhere in your user profile is used. Q:I built firmware using Arduino and printer now speaks Klingon (nonsense characters and symbols are displayed @^#$&*°;~ÿ) @@ -222,4 +221,4 @@ A:Our production builds are 99.9% equivalent to https://github.com/prusa3d/Prusa Q:Why are build instructions for Arduino mess. -Y:We are too lazy to ship proper board definition for Arduino. We plan to swich to cmake + ninja to be inherently multiplatform, easily integrate build tools, suport more IDEs, get 10 times shorter build times and be able to update compiler whenewer we want. +Y:We are too lazy to ship proper board definition for Arduino. We plan to switch to cmake + ninja to be inherently multiplatform, easily integrate build tools, suport more IDEs, get 10 times shorter build times and be able to update compiler whenever we want. From 3329d34ce4f0d4a71360fb5ec5df922dd86b8645 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 14 Dec 2020 10:37:34 +0100 Subject: [PATCH 116/218] Fix doxygen issue with "^" and "|" only in one line Doxygen 1.8.13 had no issues but newer doxygen version are failing to build tables, if a line only consists of "^" and "|" --- Firmware/eeprom.h | 56 ++--------------------------------------------- 1 file changed, 2 insertions(+), 54 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 5cb7ddb85..9de7d7f5b 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -98,19 +98,9 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0FF1h 4081 | uint32 | EEPROM_FILAMENTUSED | ??? | 00 00 00 00h 0 __S/P__| Filament used in meters | ??? | D3 Ax0ff1 C4 | 0x0FEDh 4077 | uint32 | EEPROM_TOTALTIME | ??? | 00 00 00 00h 0 __S/P__| Total print time | ??? | D3 Ax0fed C4 | 0x0FE5h 4069 | float | EEPROM_BED_CALIBRATION_CENTER | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fe5 C8 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0FDDh 4061 | float | EEPROM_BED_CALIBRATION_VEC_X | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fdd C8 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0FD5h 4053 | float | EEPROM_BED_CALIBRATION_VEC_Y | ??? | ff ff ff ffh | ??? | ??? | D3 Ax0fd5 C8 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0FC5h 4037 | int16 | EEPROM_BED_CALIBRATION_Z_JITTER | ??? | ff ffh 65535 | ??? | ??? | D3 Ax0fc5 C16 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0FC4h 4036 | bool | EEPROM_FARM_MODE | 00h 0 | ffh 255 __P__ | Prusa farm mode: __off__ | G99 | D3 Ax0fc4 C1 | ^ | ^ | ^ | 01h 1 | ^ | Prusa farm mode: __on__ | G98 | ^ | 0x0FC3h 4035 | free | _EEPROM_FREE_NR1_ | ??? | ffh 255 | _Free EEPROM space_ | _free space_ | D3 Ax0fc3 C1 @@ -129,10 +119,6 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 01h 1 | ^ | Toshiba Air: __on__ | ^ | ^ | 0x0FBAh 4026 | uchar | EEPROM_PRINT_FLAG | ??? | ??? | _unsued_ | ??? | D3 Ax0fba C1 | 0x0FB0h 4016 | int16 | EEPROM_PROBE_TEMP_SHIFT | ??? | ??? | ??? | ??? | D3 Ax0fb0 C10 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0FAFh 4015 | bool | EEPROM_TEMP_CAL_ACTIVE | 00h 0 | 00h 0 | PINDA Temp cal.: __inactive__ | LCD menu | D3 Ax0faf C1 | ^ | ^ | ^ | ffh 255 | ^ | PINDA Temp cal.: __active__ | ^ | ^ | 0x0FA7h 4007 | uint32 | EEPROM_BOWDEN_LENGTH | ??? | ff 00 00 00h | Bowden length | ??? | D3 Ax0fae C8 @@ -143,16 +129,8 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 01h 1 | ^ | Power Panic flag: __active__ | ^ | ^ | ^ | ^ | ^ | 02h 2 | ^ | Power Panic flag: __???__ | ^ | ^ | 0x0F9Dh 3997 | float | EEPROM_UVLO_CURRENT_POSITION | ??? | ffh 255 | Power Panic position | ??? | D3 Ax0f9d C8 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0F95h 3989 | char | EEPROM_FILENAME | ??? | ffh 255 | Power Panic Filename | ??? | D3 Ax0f95 C8 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| 0x0F91h 39851 | uint32 | EEPROM_FILE_POSITION | ??? | ff ff ff ffh | Power Panic File Position | ??? | D3 Ax0f91 C4 +| 0x0F91h 3985 | uint32 | EEPROM_FILE_POSITION | ??? | ff ff ff ffh | Power Panic File Position | ??? | D3 Ax0f91 C4 | 0x0F8Dh 3981 | float | EEPROM_UVLO_CURRENT_POSITION_Z | ??? | ff ff ff ffh | Power Panic Z Position | ^ | D3 Ax0f8d C4 | 0x0F8Ch 3980 | ??? | EEPROM_UVLO_UNUSED_001 | ??? | ffh 255 | Power Panic _unused_ | ^ | D3 Ax0f8c C1 | 0x0F8Bh 3979 | uint8 | EEPROM_UVLO_TARGET_BED | ??? | ffh 255 | Power Panic Bed temperature | ^ | D3 Ax0f8b C1 @@ -161,14 +139,6 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0F87h 3975 | uint8 | EEPROM_FAN_CHECK_ENABLED | 00h 0 | ??? | Fan Check __disabled__ | LCD menu | D3 Ax0f87 C1 | ^ | ^ | ^ | 01h 1 | ffh 255 | Fan Check __enabled__ | ^ | ^ | 0x0F75h 3957 | uint16 | EEPROM_UVLO_MESH_BED_LEVELING | ??? | ff ffh 65535 | Power Panic Mesh Bed Leveling | ??? | D3 Ax0f75 C18 -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ^ | ^ | ^ | ^ | ^ | 0x0F73h 3955 | uint16 | EEPROM_UVLO_Z_MICROSTEPS | ??? | ff ffh 65535 | Power Panic Z microsteps | ??? | D3 Ax0f73 C2 | 0x0F72h 3954 | uint8 | EEPROM_UVLO_E_ABS | ??? | ffh 255 | Power Panic ??? position | ??? | D3 Ax0f72 C1 | 0x0F6Eh 3950 | foat | EEPROM_UVLO_CURRENT_POSITION_E | ??? | ff ff ff ffh | Power Panic E position | ??? | D3 Ax0f6e C4 @@ -203,7 +173,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0F01h 3841 | uint16 | EEPROM_FERROR_COUNT_TOT | 0000-fffe | ff ffh __S/P__ | Total filament sensor errors | ??? | D3 Ax0f01 C2 | 0x0EFFh 3839 | uint16 | EEPROM_POWER_COUNT_TOT | 0000-fffe | ff ffh __S/P__ | Total power failures | ??? | D3 Ax0eff C2 | 0x0EFEh 3838 | uint8 | EEPROM_TMC2130_HOME_X_ORIGIN | ??? | ffh 255 | ??? | ??? | D3 Ax0efe C1 -| 0x0EFDh 3837 | uint8 | EEPROM MC2130_HOME_X_BSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efd C1 +| 0x0EFDh 3837 | uint8 | EEPROM MC2130_HOME_X_BSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efd C1 | 0x0EFCh 3836 | uint8 | EEPROM_TMC2130_HOME_X_FSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efc C1 | 0x0EFBh 3835 | uint8 | EEPROM_TMC2130_HOME_Y_ORIGIN | ??? | ffh 255 | ??? | ??? | D3 Ax0efb C1 | 0x0EFAh 3834 | uint8 | EEPROM_TMC2130_HOME_Y_BSTEPS | ??? | ffh 255 | ??? | ??? | D3 Ax0efa C1 @@ -257,28 +227,6 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 01h 1 | ^ | MMU2/s cutter: __enabled__ | ^ | ^ | ^ | ^ | ^ | 02h 2 | ^ | MMU2/s cutter: __always__ | ^ | ^ | 0x0DAE 3502 | uint16 | EEPROM_UVLO_MESH_BED_LEVELING_FULL | ??? | ff ffh 65535 | Power panic Mesh bed leveling points | ??? | D3 Ax0dae C288 -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ -| ^ | ^ | ^ | ??? | ^ | ^ | ^ | ^ | 0x0DAD 3501 | uint8 | EEPROM_MBL_TYPE | ??? | ffh 255 | Mesh bed leveling precision _unused atm_ | ??? | D3 Ax0dad C1 | 0x0DAC 3500 | bool | EEPROM_MBL_MAGNET_ELIMINATION | 01h 1 | ffh 255 | Mesh bed leveling does: __ignores__ magnets | LCD menu | D3 Ax0dac C1 | ^ | ^ | ^ | 00h 0 | ^ | Mesh bed leveling does: __NOT ignores__ magnets | ^ | ^ From 584177e8fdb311b5a1b4ece7b51fd03a6a8f72c2 Mon Sep 17 00:00:00 2001 From: espr14 Date: Fri, 18 Dec 2020 20:05:18 +0100 Subject: [PATCH 117/218] Fix E mask --- Firmware/sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/sm4.c b/Firmware/sm4.c index 34cf8a3c9..dab47042f 100644 --- a/Firmware/sm4.c +++ b/Firmware/sm4.c @@ -173,7 +173,7 @@ uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de) } if (ce <= de) { - sm |= 4; + sm |= 8; ce += dd; e++; } From 007e59d23c1adaaea42ee2fb6c183c148cbc263b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 8 Jan 2021 11:37:47 +0100 Subject: [PATCH 118/218] Comment out 'sudo' auto installation Add '-?' '-h' help output --- PF-build.sh | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 5a174c9ca..afd7fda1f 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_32 +# Version: 1.0.6-Build_33 # 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 @@ -133,6 +133,8 @@ # 02 Nov 2020, 3d-gussner, Check for "gawk" on Linux # Add argument to change build number automatically to current commit or define own number # Update exit numbers 1-13 for prepare build env 21-29 for prepare compiling 30-36 compiling +# 08 Jan 2021, 3d-gussner, Comment out 'sudo' auto installation +# Add '-?' '-h' help option #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -208,7 +210,7 @@ if ! type zip > /dev/null; then elif [ $TARGET_OS == "linux" ]; then echo "$(tput setaf 1)Missing 'zip' which is important to run this script" echo "install it with the command $(tput setaf 2)'sudo apt-get install zip'$(tput sgr0)" - sudo apt-get update && apt-get install zip + #sudo apt-get update && apt-get install zip exit 3 fi fi @@ -223,7 +225,7 @@ if ! type python > /dev/null; then echo "install it with the command $(tput setaf 2)'sudo apt-get install python3'." echo "Check which version of Python3 has been installed using 'ls /usr/bin/python3*'" echo "Use 'sudo ln -sf /usr/bin/python3.x /usr/bin/python' (where 'x' is your version number) to make it default.$(tput sgr0)" - sudo apt-get update && apt-get install python3 && ln -sf /usr/bin/python3 /usr/bin/python + #sudo apt-get update && apt-get install python3 && ln -sf /usr/bin/python3 /usr/bin/python exit 4 fi fi @@ -233,7 +235,7 @@ if ! type gawk > /dev/null; then if [ $TARGET_OS == "linux" ]; then echo "$(tput setaf 1)Missing 'gawk' which is important to run this script" echo "install it with the command $(tput setaf 2)'sudo apt-get install gawk'." - sudo apt-get update && apt-get install gawk + #sudo apt-get update && apt-get install gawk exit 4 fi fi @@ -449,13 +451,7 @@ if type git > /dev/null; then git_availible="1" fi -#arguments -#'-v' Variant "All" or variant file name -#'-l' Languages "ALL" for multi language or "EN_ONLY" for english only -#'-d' Devel build "GOLD", "RC", "BETA", "ALPHA", "DEBUG", "DEVEL" and "UNKNOWN" -#'-b' Build/commit number "Auto" needs git or a number -#'-o' Output "1" force or "0" block output and delays -while getopts v:l:d:b:o: flag +while getopts v:l:d:b:o:?h flag do case "${flag}" in v) variant_flag=${OPTARG};; @@ -463,6 +459,8 @@ while getopts v:l:d:b:o: flag d) devel_flag=${OPTARG};; b) build_flag=${OPTARG};; o) output_flag=${OPTARG};; + ?) help_flag=1;; + h) help_flag=1;; esac done #echo "variant_flag: $variant_flag"; @@ -470,6 +468,37 @@ while getopts v:l:d:b:o: flag #echo "devel_flag: $devel_flag"; #echo "build_flag: $build_flag"; #echo "output_flag: $output_flag"; +#echo "help_flag: $help_flag" + +# +# '?' 'h' argument usage and help +if [ "$help_flag" == "1" ] ; then +echo "***************************************" +echo "* PF-build.sh Version: 1.0.6-Build_33 *" +echo "***************************************" +echo "Arguments:" +echo "$(tput setaf 2)-v$(tput sgr0) Variant '$(tput setaf 2)All$(tput sgr0)' or variant file name" +echo "$(tput setaf 2)-l$(tput sgr0) Languages '$(tput setaf 2)ALL$(tput sgr0)' for multi language or '$(tput setaf 2)EN_ONLY$(tput sgr0)' for english only" +echo "$(tput setaf 2)-d$(tput sgr0) Devel build '$(tput setaf 2)GOLD$(tput sgr0)', '$(tput setaf 2)RC$(tput sgr0)', '$(tput setaf 2)BETA$(tput sgr0)', '$(tput setaf 2)ALPHA$(tput sgr0)', '$(tput setaf 2)DEBUG$(tput sgr0)', '$(tput setaf 2)DEVEL$(tput sgr0)' and '$(tput setaf 2)UNKNOWN$(tput sgr0)'" +echo "$(tput setaf 2)-b$(tput sgr0) Build/commit number '$(tput setaf 2)Auto$(tput sgr0)' needs git or a number" +echo "$(tput setaf 2)-o$(tput sgr0) Output '$(tput setaf 2)1$(tput sgr0)' force or '$(tput setaf 2)0$(tput sgr0)' block output and delays" +echo "$(tput setaf 2)-?$(tput sgr0) Help" +echo "$(tput setaf 2)-h$(tput sgr0) Help" +echo +echo "Brief USAGE:" +echo " $(tput setaf 2)./PF-build.sh$(tput sgr0) [-v] [-l] [-d] [-b] [-o]" +echo +echo "Example:" +echo " $(tput setaf 2)./PF-build.sh -v All -l ALL -d GOLD$(tput sgr0)" +echo " Will build all variants as multi language and final GOLD version" +echo +echo " $(tput setaf 2) ./PF-build.sh -v 1_75mm_MK3S-EINSy10a-E3Dv6full.h -b Auto -l ALL -d GOLD -o 1$(tput sgr0)" +echo " Will build MK3S multi language final GOLD firmware " +echo " with current commit count number and output extra information" +echo +exit + +fi # # '-v' argument defines which variant of the Prusa Firmware will be compiled From 67ff9b6b48535e2bb6c4491957f0f9bd497a47e2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 8 Jan 2021 11:01:17 +0100 Subject: [PATCH 119/218] Fix typos --- PF-build.sh | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index afd7fda1f..b75395782 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -15,7 +15,7 @@ # 3. Install zip with 'apt-get install zip' # 4. Install python3 with 'apt-get install python3' # 5. Add command 'ln -sf /usr/bin/python3.5 /usr/bin/python' to link python3 to python. -# Donnot istall 'python' as python 2.x has end of life see https://pythonclock.org/ +# Do not install 'python' as python 2.x has end of life see https://pythonclock.org/ # 6. Add at top of ~/.bashrc following lines by using 'sudo nano ~/.bashrc' # # export OS="Linux" @@ -37,7 +37,7 @@ # 2. Another great tool to compare your custom mod and stock firmware is WinMerge http://winmerge.org/downloads/?lang=en # # Example for MK3: open git bash and change to your Firmware directory -# @ MINGW64 //path +# @ MINGW64 //path # bash build.sh 1_75mm_MK3-EINSy10a-E3Dv6full # # Example for MK25: open git bash and change to your directory @@ -63,8 +63,8 @@ # 17 Jan 2019, 3d-gussner, Build_3, Check for OS Windows or Linux and use the right build environment # 10 Feb 2019, ropaha, Pull Request, Select variant from list while using build.sh # 10 Feb 2019, ropaha, change FW_DEV_VERSION automatically depending on FW_VERSION RC/BETA/ALPHA -# 10 Feb 2019, 3d-gussner, 1st tests with english only -# 10 Feb 2019, ropaha, added compiling of all variants and english only +# 10 Feb 2019, 3d-gussner, 1st tests with English only +# 10 Feb 2019, ropaha, added compiling of all variants and English only # 10 Feb 2019, 3d-gussner, Set OUTPUT_FOLDER for hex files # 11 Feb 2019, 3d-gussner/ropaha, Minor changes and fixes # 11 Feb 2019, 3d-gussner, Ready for RC @@ -80,52 +80,52 @@ # Configuration_prusa.h # language build files # multi language firmware files exist and clean them up -# 15 Feb 2019, 3d-gussner, Fixed selction GOLD/UNKNOWN DEV_STATUS for ALL variants builds, so you have to choose only once +# 15 Feb 2019, 3d-gussner, Fixed selection GOLD/UNKNOWN DEV_STATUS for ALL variants builds, so you have to choose only once # 15 Feb 2019, 3d-gussner, Added some colored output # 15 Feb 2019, 3d-gussner, troubleshooting and minor fixes # 16 Feb 2019, 3d-gussner, Script can be run using arguments # $1 = variant, example "1_75mm_MK3-EINSy10a-E3Dv6full.h" at this moment it is not possible to use ALL -# $2 = multi language OR english only [ALL/EN_ONLY] +# $2 = multi language OR English only [ALL/EN_ONLY] # $3 = development status [GOLD/RC/BETA/ALPHA/DEVEL/DEBUG] # If one argument is wrong a list of valid one will be shown -# 13 Mar 2019, 3d-gussner, MKbel updated the linux build environment to version 1.0.2 with an Fix maximum firmware flash size. +# 13 Mar 2019, 3d-gussner, MKbel updated the Linux build environment to version 1.0.2 with an Fix maximum firmware flash size. # So did I # 11 Jul 2019, deliopoulos,Updated to v1.0.6 as Prusa needs a new board definition for Firmware 3.8.x86_64 -# - Splitted the Download of Windows Arduino IDE 1.8.5 and Prusa specific part +# - Split the Download of Windows Arduino IDE 1.8.5 and Prusa specific part # --> less download volume needed and saves some time # -# 13 Jul 2019, deliopoulos,Splitting of Ardunio IDE and Prusa parts also for Linux64 +# 13 Jul 2019, deliopoulos,Splitting of Arduino IDE and Prusa parts also for Linux64 # 13 Jul 2019, 3d-gussner, Added Linux 32-bit version (untested yet) # MacOS could be added in future if needs # 14 Jul 2019, 3d-gussner, Update preferences and make it really portable -# 15 Jul 2019, 3d-gussner, New PF-build-env gihub branch -# 16 Jul 2019, 3d-gussner, New Arduino_boards github fork +# 15 Jul 2019, 3d-gussner, New PF-build-env GitHub branch +# 16 Jul 2019, 3d-gussner, New Arduino_boards GitHub fork # 17 Jul 2019, 3d-gussner, Final tests under Windows 10 and Linux Subsystem for Windows # 18 Jul 2019, 3d-gussner, Added python check # 18 Jul 2019, deliopoulos, No need more for changing 'platform.txt' file as it comes with the Arduino Boards. # 18 Jul 2019, deliopoulos, Modified 'PF_BUILD_FILE_URL' to use 'BUILD_ENV' variable -# 22 Jul 2019, 3d-gussner, Modiffied checks to check folder and/or installation output exists. +# 22 Jul 2019, 3d-gussner, Modified checks to check folder and/or installation output exists. # 22 Jul 2019, 3d-gussner, Added check if Arduino IDE 1.8.5 boards have been updated # 22 Jul 2019, 3d-gussner, Changed exit numbers 1-13 for prepare build env 21-28 for prepare compiling 31-36 compiling -# 22 Jul 2019, 3d-gussner, Changed BOARD_URL to DRracers respository after he pulled my PR https://github.com/DRracer/Arduino_Boards/pull/1 +# 22 Jul 2019, 3d-gussner, Changed BOARD_URL to DRracers repository after he pulled my PR https://github.com/DRracer/Arduino_Boards/pull/1 # 23 Jul 2019, 3d-gussner, Changed Build-env path to "PF-build-dl" as requested in PR https://github.com/prusa3d/Prusa-Firmware/pull/2028 # 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 -# 17 Oct 2019, 3d-gussner, Changed folder and check file names to have seperated build enviroments depening on Arduino IDE version and +# 23 Sep 2019, 3d-gussner, Prepare PF-build.sh for coming Prusa3d/Arduino_Boards version 1.0.2 Pull Request +# 17 Oct 2019, 3d-gussner, Changed folder and check file names to have separated build environments depending on Arduino IDE version and # board-versions. # 15 Dec 2019, 3d-gussner, Prepare for switch to Prusa3d/PF-build-env repository -# 15 Dec 2019, 3d-gussner, Fix Audrino user preferences for the chosen board. +# 15 Dec 2019, 3d-gussner, Fix Arduino user preferences for the chosen board. # 17 Dec 2019, 3d-gussner, Fix "timer0_fract = 0" warning by using Arduino_boards v1.0.3 # 28 Apr 2020, 3d-gussner, Added RC3 detection # 03 May 2020, deliopoulos, Accept all RCx as RC versions # 05 May 2020, 3d-gussner, Make a copy of `not_tran.txt`and `not_used.txt` as `not_tran_$VARIANT.txt`and `not_used_$VARIANT.txt` -# After compiling All multilanguage vairants it makes it easier to find missing or unused transltions. +# After compiling All multi-language variants it makes it easier to find missing or unused translations. # 12 May 2020, DRracer , Cleanup double MK2/s MK25/s `not_tran` and `not_used` files # 13 May 2020, leptun , If cleanup files do not exist don't try to. # 01 Oct 2020, 3d-gussner, Bug fix if using argument EN_ONLY. Thank to @leptun for pointing out. -# Change Build number to scrpit commits 'git rev-list --count HEAD PF-build.sh' +# Change Build number to script commits 'git rev-list --count HEAD PF-build.sh' # 02 Oct 2020, 3d-gussner, Add UNKNOWN as argument option # 05 Oct 2020, 3d-gussner, Disable pause and warnings using command line with all needed arguments # Install needed apps under linux if needed. @@ -265,7 +265,7 @@ echo "Script path :" $SCRIPT_PATH echo "OS :" $OS echo "OS type :" $TARGET_OS echo "" -echo "Ardunio IDE :" $ARDUINO_ENV +echo "Arduino IDE :" $ARDUINO_ENV echo "Build env :" $BUILD_ENV echo "Board :" $BOARD echo "Package name:" $BOARD_PACKAGE_NAME @@ -446,9 +446,9 @@ fi #### Start cd $SCRIPT_PATH -# Check if git is availible +# Check if git is available if type git > /dev/null; then - git_availible="1" + git_available="1" fi while getopts v:l:d:b:o:?h flag @@ -478,7 +478,7 @@ echo "* PF-build.sh Version: 1.0.6-Build_33 *" echo "***************************************" echo "Arguments:" echo "$(tput setaf 2)-v$(tput sgr0) Variant '$(tput setaf 2)All$(tput sgr0)' or variant file name" -echo "$(tput setaf 2)-l$(tput sgr0) Languages '$(tput setaf 2)ALL$(tput sgr0)' for multi language or '$(tput setaf 2)EN_ONLY$(tput sgr0)' for english only" +echo "$(tput setaf 2)-l$(tput sgr0) Languages '$(tput setaf 2)ALL$(tput sgr0)' for multi language or '$(tput setaf 2)EN_ONLY$(tput sgr0)' for English only" echo "$(tput setaf 2)-d$(tput sgr0) Devel build '$(tput setaf 2)GOLD$(tput sgr0)', '$(tput setaf 2)RC$(tput sgr0)', '$(tput setaf 2)BETA$(tput sgr0)', '$(tput setaf 2)ALPHA$(tput sgr0)', '$(tput setaf 2)DEBUG$(tput sgr0)', '$(tput setaf 2)DEVEL$(tput sgr0)' and '$(tput setaf 2)UNKNOWN$(tput sgr0)'" echo "$(tput setaf 2)-b$(tput sgr0) Build/commit number '$(tput setaf 2)Auto$(tput sgr0)' needs git or a number" echo "$(tput setaf 2)-o$(tput sgr0) Output '$(tput setaf 2)1$(tput sgr0)' force or '$(tput setaf 2)0$(tput sgr0)' block output and delays" @@ -547,7 +547,7 @@ else fi fi -#'-l' argument defines if it is an english only version. Known values EN_ONLY / ALL +#'-l' argument defines if it is an English only version. Known values EN_ONLY / ALL #Check default language mode MULTI_LANGUAGE_CHECK=$(grep --max-count=1 "^#define LANG_MODE *" $SCRIPT_PATH/Firmware/config.h|sed -e's/ */ /g'|cut -d ' ' -f3) @@ -592,7 +592,7 @@ fi #Check if Build is selected via argument '-b' if [ ! -z "$build_flag" ] ; then - if [[ "$build_flag" == "Auto" && "$git_availible" == "1" ]] ; then + if [[ "$build_flag" == "Auto" && "$git_available" == "1" ]] ; then echo "Build changed to $build_flag" BUILD=$(git rev-list --count HEAD) elif [[ $build_flag =~ ^[0-9]+$ ]] ; then @@ -615,7 +615,7 @@ fi #echo "Output is:" $OUTPUT #Check git branch has changed -if [ ! -z "git_availible" ]; then +if [ ! -z "git_available" ]; then BRANCH="" CLEAN_PF_FW_BUILD=0 else @@ -772,7 +772,7 @@ do # set FW_REPOSITORY sed -i -- 's/#define FW_REPOSITORY "Unknown"/#define FW_REPOSITORY "Prusa3d"/g' $SCRIPT_PATH/Firmware/Configuration.h - #Prepare english only or multilanguage version to be build + #Prepare English only or multi-language version to be build if [ $LANGUAGES == "EN_ONLY" ]; then echo " " echo "English only language firmware will be built" From 8a083c99705f5927ff76daca9b62c9f230f5ddb0 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 8 Jan 2021 13:52:39 +0100 Subject: [PATCH 120/218] Add PVB preheat and 0.8mm nozzle presets minor features reflecting the latest announcement Needs some 300B of CPU flash though, after 3.9.3 we need to optimize code size again. --- Firmware/eeprom.h | 2 + Firmware/ultralcd.cpp | 59 +++++++++++-------- Firmware/util.h | 1 + .../variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 4 ++ .../variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 + .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 3 + .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 3 + .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 3 + .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 3 + .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 3 + .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 3 + 11 files changed, 62 insertions(+), 25 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 731db1da1..5445df4f7 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -242,9 +242,11 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 00h 0 | ^ | Check mode for nozzle is: __none__ | ^ | ^ | 0x0DA7 3495 | uint8 | EEPROM_NOZZLE_DIAMETER | 28h 40 | ffh 255 | Nozzle diameter is: __40 or 0.40mm__ | LCD menu | D3 Ax0da7 C1 | ^ | ^ | ^ | 3ch 60 | ^ | Nozzle diameter is: __60 or 0.60mm__ | ^ | ^ +| ^ | ^ | ^ | 3ch 80 | ^ | Nozzle diameter is: __80 or 0.80mm__ | ^ | ^ | ^ | ^ | ^ | 19h 25 | ^ | Nozzle diameter is: __25 or 0.25mm__ | ^ | ^ | 0x0DA5 3493 | uint16 | EEPROM_NOZZLE_DIAMETER_uM | 9001h | ff ffh 65535 | Nozzle diameter is: __400um__ | LCD menu | D3 Ax0da5 C2 | ^ | ^ | ^ | 5802h | ^ | Nozzle diameter is: __600um__ | ^ | ^ +| ^ | ^ | ^ | 2003h | ^ | Nozzle diameter is: __800um__ | ^ | ^ | ^ | ^ | ^ | fa00h | ^ | Nozzle diameter is: __250um__ | ^ | ^ | 0x0DA4 3492 | uint8 | EEPROM_CHECK_MODEL | 01h 1 | ffh 255 | Check mode for printer model is: __warn__ | LCD menu | D3 Ax0da4 C1 | ^ | ^ | ^ | 02h 0 | ^ | Check mode for printer model is: __strict__ | ^ | ^ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a12db7f48..731de9feb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2533,6 +2533,12 @@ static void mFilamentItem_FLEX() mFilamentItem(FLEX_PREHEAT_HOTEND_TEMP, FLEX_PREHEAT_HPB_TEMP); } +static void mFilamentItem_PVB() +{ + bFilamentPreheatState = false; + mFilamentItem(PVB_PREHEAT_HOTEND_TEMP, PVB_PREHEAT_HPB_TEMP); +} + void mFilamentBack() { menu_back(); @@ -2569,6 +2575,7 @@ void lcd_generic_preheat_menu() 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("PC - " STRINGIFY(PC_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PC_PREHEAT_HPB_TEMP)),mFilamentItem_PC); + MENU_ITEM_SUBMENU_P(PSTR("PVB - " STRINGIFY(PVB_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PVB_PREHEAT_HPB_TEMP)),mFilamentItem_PVB); 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); @@ -5488,30 +5495,31 @@ do\ }\ while (0) -static void lcd_nozzle_diameter_set(void) -{ -uint16_t nDiameter; - -switch(oNozzleDiameter) - { - case ClNozzleDiameter::_Diameter_250: - oNozzleDiameter=ClNozzleDiameter::_Diameter_400; - nDiameter=400; - break; - case ClNozzleDiameter::_Diameter_400: - oNozzleDiameter=ClNozzleDiameter::_Diameter_600; - nDiameter=600; - break; - case ClNozzleDiameter::_Diameter_600: - oNozzleDiameter=ClNozzleDiameter::_Diameter_250; - nDiameter=250; - break; - default: - oNozzleDiameter=ClNozzleDiameter::_Diameter_400; - nDiameter=400; - } -eeprom_update_byte((uint8_t*)EEPROM_NOZZLE_DIAMETER,(uint8_t)oNozzleDiameter); -eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,nDiameter); +static void lcd_nozzle_diameter_cycle(void) { + uint16_t nDiameter; + switch(oNozzleDiameter){ + case ClNozzleDiameter::_Diameter_250: + oNozzleDiameter=ClNozzleDiameter::_Diameter_400; + nDiameter=400; + break; + case ClNozzleDiameter::_Diameter_400: + oNozzleDiameter=ClNozzleDiameter::_Diameter_600; + nDiameter=600; + break; + case ClNozzleDiameter::_Diameter_600: + oNozzleDiameter=ClNozzleDiameter::_Diameter_800; + nDiameter=800; + break; + case ClNozzleDiameter::_Diameter_800: + oNozzleDiameter=ClNozzleDiameter::_Diameter_250; + nDiameter=250; + break; + default: + oNozzleDiameter=ClNozzleDiameter::_Diameter_400; + nDiameter=400; + } + eeprom_update_byte((uint8_t*)EEPROM_NOZZLE_DIAMETER,(uint8_t)oNozzleDiameter); + eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,nDiameter); } #define SETTINGS_NOZZLE \ @@ -5523,9 +5531,10 @@ do\ case ClNozzleDiameter::_Diameter_250: fNozzleDiam = 0.25f; break;\ case ClNozzleDiameter::_Diameter_400: fNozzleDiam = 0.4f; break;\ case ClNozzleDiameter::_Diameter_600: fNozzleDiam = 0.6f; break;\ + case ClNozzleDiameter::_Diameter_800: fNozzleDiam = 0.8f; break;\ default: fNozzleDiam = 0.4f; break;\ }\ - MENU_ITEM_TOGGLE(_T(MSG_NOZZLE_DIAMETER), ftostr12ns(fNozzleDiam), lcd_nozzle_diameter_set);\ + MENU_ITEM_TOGGLE(_T(MSG_NOZZLE_DIAMETER), ftostr12ns(fNozzleDiam), lcd_nozzle_diameter_cycle);\ }\ while (0) diff --git a/Firmware/util.h b/Firmware/util.h index 8f23cd5c3..f25749de0 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -51,6 +51,7 @@ enum class ClNozzleDiameter:uint_least8_t _Diameter_250=25, _Diameter_400=40, _Diameter_600=60, + _Diameter_800=80, _Diameter_Undef=EEPROM_EMPTY_VALUE }; diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 887a90a6f..a74b69482 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -326,6 +326,10 @@ PREHEAT SETTINGS #define PLA_PREHEAT_HPB_TEMP 55 #define PLA_PREHEAT_FAN_SPEED 0 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 +#define PVB_PREHEAT_FAN_SPEED 0 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 #define ASA_PREHEAT_FAN_SPEED 0 diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index c9c4ed6cd..72ac605fd 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -323,6 +323,9 @@ PREHEAT SETTINGS #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 55 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 1e77dce81..ba40e0468 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -384,6 +384,9 @@ #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 2d4d73c24..33bb47170 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -385,6 +385,9 @@ #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 4670d2188..19b2c76fd 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -384,6 +384,9 @@ #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 22af43416..cc02867dd 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -385,6 +385,9 @@ #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 7bd7be43e..ab9e6a2cf 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -498,6 +498,9 @@ #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 3056c4366..9e2d1c448 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -502,6 +502,9 @@ #define PLA_PREHEAT_HOTEND_TEMP 215 #define PLA_PREHEAT_HPB_TEMP 60 +#define PVB_PREHEAT_HOTEND_TEMP 215 +#define PVB_PREHEAT_HPB_TEMP 75 + #define ASA_PREHEAT_HOTEND_TEMP 260 #define ASA_PREHEAT_HPB_TEMP 105 From a064ce47221523fc6e44669622ba4ce80f260c98 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 10 Jan 2021 15:15:44 +0100 Subject: [PATCH 121/218] Add gcode `M123` Tachometer value --- Firmware/Marlin.h | 2 ++ Firmware/Marlin_main.cpp | 16 +++++++++++++++- Firmware/temperature.cpp | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 19635c178..07ed8594c 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -289,6 +289,7 @@ extern float min_pos[3]; extern float max_pos[3]; extern bool axis_known_position[3]; extern int fanSpeed; +extern uint8_t newFanSpeed; extern int8_t lcd_change_fil_state; extern float default_retraction; @@ -480,6 +481,7 @@ void force_high_power_mode(bool start_high_power_section); bool gcode_M45(bool onlyZ, int8_t verbosity_level); void gcode_M114(); +void gcode_M123(); void gcode_M701(); #define UVLO !(PINE & (1<<4)) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9da891d87..2a0df6bfd 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -270,6 +270,7 @@ float extruder_offset[NUM_EXTRUDER_OFFSETS][EXTRUDERS] = { uint8_t active_extruder = 0; int fanSpeed=0; +uint8_t newFanSpeed = 0; #ifdef FWRETRACT bool retracted[EXTRUDERS]={false @@ -3166,6 +3167,11 @@ void gcode_M114() SERIAL_PROTOCOLLN(""); } +void gcode_M123() +{ + printf_P(_N("E0:%d RPM PRN1:%d RPM E0@:%u PRN1@:%d\n"), 60*fan_speed[active_extruder], 60*fan_speed[1], newFanSpeed, fanSpeed); +} + //! extracted code to compute z_shift for M600 in case of filament change operation //! requested from fsensors. //! The function ensures, that the printhead lifts to at least 25mm above the heat bed @@ -3606,6 +3612,7 @@ extern uint8_t st_backlash_y; //!@n M115 - Capabilities string //!@n M117 - display message //!@n M119 - Output Endstop status to serial port +//!@n M123 - Tachometer value //!@n M126 - Solenoid Air Valve Open (BariCUDA support by jmil) //!@n M127 - Solenoid Air Valve Closed (BariCUDA vent to atmospheric pressure by jmil) //!@n M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil) @@ -6965,7 +6972,14 @@ Sigma_Exit: #endif break; //!@todo update for all axes, use for loop - + + /*! + ### M123 - Tachometer value M123: Tachometer value + */ + case 123: + gcode_M123(); + break; + #ifdef BLINKM /*! diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 3b38c25cc..29e5427c4 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -522,7 +522,7 @@ void setExtruderAutoFanState(uint8_t state) //the fan to either On or Off during certain tests/errors. fanState = state; - uint8_t newFanSpeed = 0; + newFanSpeed = 0; if (fanState & 0x01) { #ifdef EXTRUDER_ALTFAN_DETECT From 2e40a2746098fc7a989444bf37be9572a943b8fd Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 15:40:12 +0100 Subject: [PATCH 122/218] Alignment, comments --- Firmware/mesh_bed_calibration.cpp | 190 +++++++++++++++--------------- 1 file changed, 97 insertions(+), 93 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 897e3a9e6..8c2a49761 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -2226,104 +2226,104 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level } #endif // SUPPORT_VERBOSITY #ifdef MESH_BED_CALIBRATION_SHOW_LCD - uint8_t next_line; - lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1), next_line); - if (next_line > 3) - next_line = 3; + uint8_t next_line; + lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1), next_line); + if (next_line > 3) + next_line = 3; #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ - // Collect the rear 2x3 points. - current_position[Z_AXIS] = MESH_HOME_Z_SEARCH + FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP * iteration * 0.3; - for (int k = 0; k < 4; ++k) { - // Don't let the manage_inactivity() function remove power from the motors. - refresh_cmd_timeout(); + // Collect the rear 2x3 points. + current_position[Z_AXIS] = MESH_HOME_Z_SEARCH + FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP * iteration * 0.3; + for (int k = 0; k < 4; ++k) { + // Don't let the manage_inactivity() function remove power from the motors. + refresh_cmd_timeout(); #ifdef MESH_BED_CALIBRATION_SHOW_LCD - lcd_set_cursor(0, next_line); - lcd_print(k + 1); - lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2)); + lcd_set_cursor(0, next_line); + lcd_print(k + 1); + lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2)); - if (iteration > 0) { - lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 - lcd_print(int(iteration + 1)); - } + if (iteration > 0) { + lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 + lcd_print(int(iteration + 1)); + } #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ - float *pt = pts + k * 2; - // Go up to z_initial. + float *pt = pts + k * 2; + // Go up to z_initial. - go_to_current(homing_feedrate[Z_AXIS] / 60.f); - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 20) { - // Go to Y0, wait, then go to Y-4. - current_position[Y_AXIS] = 0.f; - go_to_current(homing_feedrate[X_AXIS] / 60.f); - SERIAL_ECHOLNPGM("At Y0"); - delay_keep_alive(5000); - current_position[Y_AXIS] = Y_MIN_POS; - go_to_current(homing_feedrate[X_AXIS] / 60.f); - SERIAL_ECHOLNPGM("At Y-4"); - delay_keep_alive(5000); - } - #endif // SUPPORT_VERBOSITY - // Go to the measurement point position. - //if (iteration == 0) { - current_position[X_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2); - current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2 + 1); - /*} - else { - // if first iteration failed, count corrected point coordinates as initial - // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). - - current_position[X_AXIS] = vec_x[0] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[0] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[0]; - current_position[Y_AXIS] = vec_x[1] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[1] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[1]; + go_to_current(homing_feedrate[Z_AXIS] / 60.f); + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 20) { + // Go to Y0, wait, then go to Y-4. + current_position[Y_AXIS] = 0.f; + go_to_current(homing_feedrate[X_AXIS] / 60.f); + SERIAL_ECHOLNPGM("At Y0"); + delay_keep_alive(5000); + current_position[Y_AXIS] = Y_MIN_POS; + go_to_current(homing_feedrate[X_AXIS] / 60.f); + SERIAL_ECHOLNPGM("At Y-4"); + delay_keep_alive(5000); + } + #endif // SUPPORT_VERBOSITY + // Go to the measurement point position. + //if (iteration == 0) { + current_position[X_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2); + current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2 + 1); + /*} + else { + // if first iteration failed, count corrected point coordinates as initial + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). + + current_position[X_AXIS] = vec_x[0] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[0] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[0]; + current_position[Y_AXIS] = vec_x[1] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[1] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[1]; - // The calibration points are very close to the min Y. - if (current_position[Y_AXIS] < Y_MIN_POS_FOR_BED_CALIBRATION) - current_position[Y_AXIS] = Y_MIN_POS_FOR_BED_CALIBRATION; + // The calibration points are very close to the min Y. + if (current_position[Y_AXIS] < Y_MIN_POS_FOR_BED_CALIBRATION) + current_position[Y_AXIS] = Y_MIN_POS_FOR_BED_CALIBRATION; - }*/ - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 20) { - SERIAL_ECHOPGM("current_position[X_AXIS]:"); - MYSERIAL.print(current_position[X_AXIS], 5); - SERIAL_ECHOLNPGM(""); - SERIAL_ECHOPGM("current_position[Y_AXIS]:"); - MYSERIAL.print(current_position[Y_AXIS], 5); - SERIAL_ECHOLNPGM(""); - SERIAL_ECHOPGM("current_position[Z_AXIS]:"); - MYSERIAL.print(current_position[Z_AXIS], 5); - SERIAL_ECHOLNPGM(""); - } - #endif // SUPPORT_VERBOSITY + }*/ + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 20) { + SERIAL_ECHOPGM("current_position[X_AXIS]:"); + MYSERIAL.print(current_position[X_AXIS], 5); + SERIAL_ECHOLNPGM(""); + SERIAL_ECHOPGM("current_position[Y_AXIS]:"); + MYSERIAL.print(current_position[Y_AXIS], 5); + SERIAL_ECHOLNPGM(""); + SERIAL_ECHOPGM("current_position[Z_AXIS]:"); + MYSERIAL.print(current_position[Z_AXIS], 5); + SERIAL_ECHOLNPGM(""); + } + #endif // SUPPORT_VERBOSITY - go_to_current(homing_feedrate[X_AXIS] / 60.f); - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 10) - delay_keep_alive(3000); - #endif // SUPPORT_VERBOSITY - if (!find_bed_induction_sensor_point_xy(verbosity_level)) - return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; + go_to_current(homing_feedrate[X_AXIS] / 60.f); + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 10) + delay_keep_alive(3000); + #endif // SUPPORT_VERBOSITY + if (!find_bed_induction_sensor_point_xy(verbosity_level)) + return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND #ifndef NEW_XYZCAL #ifndef HEATBED_V2 - if (k == 0 || k == 1) { - // Improve the position of the 1st row sensor points by a zig-zag movement. - find_bed_induction_sensor_point_z(); - int8_t i = 4; - for (;;) { - if (improve_bed_induction_sensor_point3(verbosity_level)) - break; - if (--i == 0) - return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; - // Try to move the Z axis down a bit to increase a chance of the sensor to trigger. - current_position[Z_AXIS] -= 0.025f; - enable_endstops(false); - enable_z_endstop(false); - go_to_current(homing_feedrate[Z_AXIS]); - } - if (i == 0) - // not found - return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; - } + if (k == 0 || k == 1) { + // Improve the position of the 1st row sensor points by a zig-zag movement. + find_bed_induction_sensor_point_z(); + int8_t i = 4; + for (;;) { + if (improve_bed_induction_sensor_point3(verbosity_level)) + break; + if (--i == 0) + return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; + // Try to move the Z axis down a bit to increase a chance of the sensor to trigger. + current_position[Z_AXIS] -= 0.025f; + enable_endstops(false); + enable_z_endstop(false); + go_to_current(homing_feedrate[Z_AXIS]); + } + if (i == 0) + // not found + return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; + } #endif //HEATBED_V2 #endif #ifdef SUPPORT_VERBOSITY @@ -2375,8 +2375,9 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level delay_keep_alive(3000); } #endif // SUPPORT_VERBOSITY - } - delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity + } + DBG(_n("All 4 calibration points found.\n")); + delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 20) { @@ -2386,7 +2387,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level // Don't let the manage_inactivity() function remove power from the motors. refresh_cmd_timeout(); // Go to the measurement point. - // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). current_position[X_AXIS] = pts[mesh_point * 2]; current_position[Y_AXIS] = pts[mesh_point * 2 + 1]; go_to_current(homing_feedrate[X_AXIS] / 60); @@ -2450,7 +2451,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level // Don't let the manage_inactivity() function remove power from the motors. refresh_cmd_timeout(); // Go to the measurement point. - // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). uint8_t ix = mesh_point % MESH_MEAS_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 uint8_t iy = mesh_point / MESH_MEAS_NUM_X_POINTS; if (iy & 1) ix = (MESH_MEAS_NUM_X_POINTS - 1) - ix; @@ -2462,9 +2463,12 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level } #endif // SUPPORT_VERBOSITY return result; - } - if (result == BED_SKEW_OFFSET_DETECTION_FITTING_FAILED && too_far_mask == 2) return result; //if fitting failed and front center point is out of reach, terminate calibration and inform user - iteration++; + } + if (result == BED_SKEW_OFFSET_DETECTION_FITTING_FAILED && too_far_mask == 2){ + DBG(_n("Calibration failed.\n")); + return result; //if fitting failed and front center point is out of reach, terminate calibration and inform user + } + iteration++; } return result; } From 904a23b69ebc3f6a53cfe8c8569892f9b7b43d00 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 17:02:41 +0100 Subject: [PATCH 123/218] Report calibration results --- Firmware/mesh_bed_calibration.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 8c2a49761..6ef990b16 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -369,7 +369,9 @@ BedSkewOffsetDetectionResultType calculate_machine_skew_and_offset_LS( BedSkewOffsetDetectionResultType result = BED_SKEW_OFFSET_DETECTION_PERFECT; { angleDiff = fabs(a2 - a1); - eeprom_update_float((float*)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later + DBG(_n("Measured XY skew: %f\n"), a2 - a1); + DBG(_n("Measured Y-bed skew: %f\n"), a2); + eeprom_update_float((float*)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later if (angleDiff > bed_skew_angle_mild) result = (angleDiff > bed_skew_angle_extreme) ? BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME : @@ -2407,6 +2409,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity if (result >= 0) { + DBG(_n("Calibration success.\n")); world2machine_update(vec_x, vec_y, cntr); #if 1 // Fearlessly store the calibration values into the eeprom. @@ -2465,7 +2468,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level return result; } if (result == BED_SKEW_OFFSET_DETECTION_FITTING_FAILED && too_far_mask == 2){ - DBG(_n("Calibration failed.\n")); + DBG(_n("Fitting failed => calibration failed.\n")); return result; //if fitting failed and front center point is out of reach, terminate calibration and inform user } iteration++; From 211e5f5f37df763e7bf744012a569c3c4636a61c Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 17:31:26 +0100 Subject: [PATCH 124/218] Define DBG output --- Firmware/mesh_bed_calibration.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 6ef990b16..f19c8c9c4 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -12,6 +12,8 @@ #include "tmc2130.h" #endif //TMC2130 +#define DBG(args...) printf_P(args) + uint8_t world2machine_correction_mode; float world2machine_rotation_and_skew[2][2]; float world2machine_rotation_and_skew_inv[2][2]; From 78f8f1e8f9e2f7abee18a4a7b7d78867880ab1e9 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Mon, 11 Jan 2021 18:31:20 +0100 Subject: [PATCH 125/218] Remove stray serial newlines in fsensor autoload messages --- Firmware/fsensor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index c81a5ac6f..b6ea77883 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -316,7 +316,7 @@ void fsensor_autoload_check_start(void) printf_P(ERRMSG_PAT9125_NOT_RESP, 3); return; } - puts_P(_N("fsensor_autoload_check_start - autoload ENABLED\n")); + puts_P(_N("fsensor_autoload_check_start - autoload ENABLED")); fsensor_autoload_y = pat9125_y; //save current y value fsensor_autoload_c = 0; //reset number of changes counter fsensor_autoload_sum = 0; @@ -334,7 +334,7 @@ void fsensor_autoload_check_stop(void) if (!fsensor_autoload_enabled) return; // puts_P(_N("fsensor_autoload_check_stop 2\n")); if (!fsensor_watch_autoload) return; - puts_P(_N("fsensor_autoload_check_stop - autoload DISABLED\n")); + puts_P(_N("fsensor_autoload_check_stop - autoload DISABLED")); fsensor_autoload_sum = 0; fsensor_watch_autoload = false; fsensor_watch_runout = true; From 09892bec52fd843e2a8bf40f89232fcafe0fbf1d Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 18:46:56 +0100 Subject: [PATCH 126/218] Reverse --- Firmware/mesh_bed_calibration.cpp | 181 +++++++++++++++--------------- 1 file changed, 90 insertions(+), 91 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index f19c8c9c4..dc13eaac4 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -2230,104 +2230,104 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level } #endif // SUPPORT_VERBOSITY #ifdef MESH_BED_CALIBRATION_SHOW_LCD - uint8_t next_line; - lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1), next_line); - if (next_line > 3) - next_line = 3; + uint8_t next_line; + lcd_display_message_fullscreen_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1), next_line); + if (next_line > 3) + next_line = 3; #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ - // Collect the rear 2x3 points. - current_position[Z_AXIS] = MESH_HOME_Z_SEARCH + FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP * iteration * 0.3; - for (int k = 0; k < 4; ++k) { - // Don't let the manage_inactivity() function remove power from the motors. - refresh_cmd_timeout(); + // Collect the rear 2x3 points. + current_position[Z_AXIS] = MESH_HOME_Z_SEARCH + FIND_BED_INDUCTION_SENSOR_POINT_Z_STEP * iteration * 0.3; + for (int k = 0; k < 4; ++k) { + // Don't let the manage_inactivity() function remove power from the motors. + refresh_cmd_timeout(); #ifdef MESH_BED_CALIBRATION_SHOW_LCD - lcd_set_cursor(0, next_line); - lcd_print(k + 1); - lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2)); + lcd_set_cursor(0, next_line); + lcd_print(k + 1); + lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2)); - if (iteration > 0) { - lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 - lcd_print(int(iteration + 1)); - } + if (iteration > 0) { + lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 + lcd_print(int(iteration + 1)); + } #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ - float *pt = pts + k * 2; - // Go up to z_initial. + float *pt = pts + k * 2; + // Go up to z_initial. - go_to_current(homing_feedrate[Z_AXIS] / 60.f); - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 20) { - // Go to Y0, wait, then go to Y-4. - current_position[Y_AXIS] = 0.f; - go_to_current(homing_feedrate[X_AXIS] / 60.f); - SERIAL_ECHOLNPGM("At Y0"); - delay_keep_alive(5000); - current_position[Y_AXIS] = Y_MIN_POS; - go_to_current(homing_feedrate[X_AXIS] / 60.f); - SERIAL_ECHOLNPGM("At Y-4"); - delay_keep_alive(5000); - } - #endif // SUPPORT_VERBOSITY - // Go to the measurement point position. - //if (iteration == 0) { - current_position[X_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2); - current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2 + 1); - /*} - else { - // if first iteration failed, count corrected point coordinates as initial - // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). - - current_position[X_AXIS] = vec_x[0] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[0] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[0]; - current_position[Y_AXIS] = vec_x[1] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[1] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[1]; + go_to_current(homing_feedrate[Z_AXIS] / 60.f); + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 20) { + // Go to Y0, wait, then go to Y-4. + current_position[Y_AXIS] = 0.f; + go_to_current(homing_feedrate[X_AXIS] / 60.f); + SERIAL_ECHOLNPGM("At Y0"); + delay_keep_alive(5000); + current_position[Y_AXIS] = Y_MIN_POS; + go_to_current(homing_feedrate[X_AXIS] / 60.f); + SERIAL_ECHOLNPGM("At Y-4"); + delay_keep_alive(5000); + } + #endif // SUPPORT_VERBOSITY + // Go to the measurement point position. + //if (iteration == 0) { + current_position[X_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2); + current_position[Y_AXIS] = pgm_read_float(bed_ref_points_4 + k * 2 + 1); + /*} + else { + // if first iteration failed, count corrected point coordinates as initial + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). + + current_position[X_AXIS] = vec_x[0] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[0] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[0]; + current_position[Y_AXIS] = vec_x[1] * pgm_read_float(bed_ref_points_4 + k * 2) + vec_y[1] * pgm_read_float(bed_ref_points_4 + k * 2 + 1) + cntr[1]; - // The calibration points are very close to the min Y. - if (current_position[Y_AXIS] < Y_MIN_POS_FOR_BED_CALIBRATION) - current_position[Y_AXIS] = Y_MIN_POS_FOR_BED_CALIBRATION; + // The calibration points are very close to the min Y. + if (current_position[Y_AXIS] < Y_MIN_POS_FOR_BED_CALIBRATION) + current_position[Y_AXIS] = Y_MIN_POS_FOR_BED_CALIBRATION; - }*/ - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 20) { - SERIAL_ECHOPGM("current_position[X_AXIS]:"); - MYSERIAL.print(current_position[X_AXIS], 5); - SERIAL_ECHOLNPGM(""); - SERIAL_ECHOPGM("current_position[Y_AXIS]:"); - MYSERIAL.print(current_position[Y_AXIS], 5); - SERIAL_ECHOLNPGM(""); - SERIAL_ECHOPGM("current_position[Z_AXIS]:"); - MYSERIAL.print(current_position[Z_AXIS], 5); - SERIAL_ECHOLNPGM(""); - } - #endif // SUPPORT_VERBOSITY + }*/ + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 20) { + SERIAL_ECHOPGM("current_position[X_AXIS]:"); + MYSERIAL.print(current_position[X_AXIS], 5); + SERIAL_ECHOLNPGM(""); + SERIAL_ECHOPGM("current_position[Y_AXIS]:"); + MYSERIAL.print(current_position[Y_AXIS], 5); + SERIAL_ECHOLNPGM(""); + SERIAL_ECHOPGM("current_position[Z_AXIS]:"); + MYSERIAL.print(current_position[Z_AXIS], 5); + SERIAL_ECHOLNPGM(""); + } + #endif // SUPPORT_VERBOSITY - go_to_current(homing_feedrate[X_AXIS] / 60.f); - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 10) - delay_keep_alive(3000); - #endif // SUPPORT_VERBOSITY - if (!find_bed_induction_sensor_point_xy(verbosity_level)) - return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND + go_to_current(homing_feedrate[X_AXIS] / 60.f); + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 10) + delay_keep_alive(3000); + #endif // SUPPORT_VERBOSITY + if (!find_bed_induction_sensor_point_xy(verbosity_level)) + return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; #ifndef NEW_XYZCAL #ifndef HEATBED_V2 - if (k == 0 || k == 1) { - // Improve the position of the 1st row sensor points by a zig-zag movement. - find_bed_induction_sensor_point_z(); - int8_t i = 4; - for (;;) { - if (improve_bed_induction_sensor_point3(verbosity_level)) - break; - if (--i == 0) - return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; - // Try to move the Z axis down a bit to increase a chance of the sensor to trigger. - current_position[Z_AXIS] -= 0.025f; - enable_endstops(false); - enable_z_endstop(false); - go_to_current(homing_feedrate[Z_AXIS]); - } - if (i == 0) - // not found - return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; - } + if (k == 0 || k == 1) { + // Improve the position of the 1st row sensor points by a zig-zag movement. + find_bed_induction_sensor_point_z(); + int8_t i = 4; + for (;;) { + if (improve_bed_induction_sensor_point3(verbosity_level)) + break; + if (--i == 0) + return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; + // Try to move the Z axis down a bit to increase a chance of the sensor to trigger. + current_position[Z_AXIS] -= 0.025f; + enable_endstops(false); + enable_z_endstop(false); + go_to_current(homing_feedrate[Z_AXIS]); + } + if (i == 0) + // not found + return BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND; + } #endif //HEATBED_V2 #endif #ifdef SUPPORT_VERBOSITY @@ -2379,9 +2379,8 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level delay_keep_alive(3000); } #endif // SUPPORT_VERBOSITY - } - DBG(_n("All 4 calibration points found.\n")); - delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity + } + delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 20) { @@ -2391,7 +2390,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level // Don't let the manage_inactivity() function remove power from the motors. refresh_cmd_timeout(); // Go to the measurement point. - // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). current_position[X_AXIS] = pts[mesh_point * 2]; current_position[Y_AXIS] = pts[mesh_point * 2 + 1]; go_to_current(homing_feedrate[X_AXIS] / 60); @@ -2456,7 +2455,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level // Don't let the manage_inactivity() function remove power from the motors. refresh_cmd_timeout(); // Go to the measurement point. - // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). uint8_t ix = mesh_point % MESH_MEAS_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 uint8_t iy = mesh_point / MESH_MEAS_NUM_X_POINTS; if (iy & 1) ix = (MESH_MEAS_NUM_X_POINTS - 1) - ix; From b8443b00ad3cee9406532561245d877c65766c6d Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 22:18:50 +0100 Subject: [PATCH 127/218] Reverse reverse --- Firmware/mesh_bed_calibration.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index dc13eaac4..594ac4bf6 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -2379,8 +2379,9 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level delay_keep_alive(3000); } #endif // SUPPORT_VERBOSITY - } - delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity + } + DBG(_n("All 4 calibration points found.\n")); + delay_keep_alive(0); //manage_heater, reset watchdog, manage inactivity #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 20) { @@ -2390,7 +2391,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level // Don't let the manage_inactivity() function remove power from the motors. refresh_cmd_timeout(); // Go to the measurement point. - // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). current_position[X_AXIS] = pts[mesh_point * 2]; current_position[Y_AXIS] = pts[mesh_point * 2 + 1]; go_to_current(homing_feedrate[X_AXIS] / 60); @@ -2455,7 +2456,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level // Don't let the manage_inactivity() function remove power from the motors. refresh_cmd_timeout(); // Go to the measurement point. - // Use the coorrected coordinate, which is a result of find_bed_offset_and_skew(). + // Use the corrected coordinate, which is a result of find_bed_offset_and_skew(). uint8_t ix = mesh_point % MESH_MEAS_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 uint8_t iy = mesh_point / MESH_MEAS_NUM_X_POINTS; if (iy & 1) ix = (MESH_MEAS_NUM_X_POINTS - 1) - ix; From e6e44fe18861b1cb63bb99e24514538f6474cfb8 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 23:13:08 +0100 Subject: [PATCH 128/218] Convert to degrees --- Firmware/mesh_bed_calibration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 594ac4bf6..6dc524226 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -371,9 +371,9 @@ BedSkewOffsetDetectionResultType calculate_machine_skew_and_offset_LS( BedSkewOffsetDetectionResultType result = BED_SKEW_OFFSET_DETECTION_PERFECT; { angleDiff = fabs(a2 - a1); - DBG(_n("Measured XY skew: %f\n"), a2 - a1); - DBG(_n("Measured Y-bed skew: %f\n"), a2); - eeprom_update_float((float*)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later + DBG(_n("Measured XY skew: %f°\n"), degrees(a2 - a1)); + DBG(_n("Measured Y-bed skew: %f°\n"), degrees(a2)); + eeprom_update_float((float *)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later if (angleDiff > bed_skew_angle_mild) result = (angleDiff > bed_skew_angle_extreme) ? BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME : @@ -1384,7 +1384,7 @@ inline bool find_bed_induction_sensor_point_xy(int verbosity_level) // go_xyz(current_position[X_AXIS], current_position[Y_AXIS], MESH_HOME_Z_SEARCH, homing_feedrate[Z_AXIS]/60); go_xyz(x0, y0, current_position[Z_AXIS], feedrate); - // Continously lower the Z axis. + // Continuously lower the Z axis. endstops_hit_on_purpose(); enable_z_endstop(true); while (current_position[Z_AXIS] > -10.f) { From 333526f65dde201982345aaa063b234bc7f94b00 Mon Sep 17 00:00:00 2001 From: espr14 Date: Mon, 11 Jan 2021 23:14:12 +0100 Subject: [PATCH 129/218] Single skew output --- Firmware/mesh_bed_calibration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 6dc524226..4f4261161 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -371,8 +371,8 @@ BedSkewOffsetDetectionResultType calculate_machine_skew_and_offset_LS( BedSkewOffsetDetectionResultType result = BED_SKEW_OFFSET_DETECTION_PERFECT; { angleDiff = fabs(a2 - a1); - DBG(_n("Measured XY skew: %f°\n"), degrees(a2 - a1)); - DBG(_n("Measured Y-bed skew: %f°\n"), degrees(a2)); + /// XY skew and Y-bed skew + DBG(_n("Measured skews: %f° %f°\n"), degrees(a2 - a1), degrees(a2)); eeprom_update_float((float *)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later if (angleDiff > bed_skew_angle_mild) result = (angleDiff > bed_skew_angle_extreme) ? From 180af46fe46947a21526655068948abcffef6636 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 12 Jan 2021 00:27:06 +0100 Subject: [PATCH 130/218] Try double height --- Firmware/mesh_bed_calibration.cpp | 2 +- Firmware/xyzcal.cpp | 79 ++++++++++++++++--------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 4f4261161..a0efc3aae 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -372,7 +372,7 @@ BedSkewOffsetDetectionResultType calculate_machine_skew_and_offset_LS( { angleDiff = fabs(a2 - a1); /// XY skew and Y-bed skew - DBG(_n("Measured skews: %f° %f°\n"), degrees(a2 - a1), degrees(a2)); + DBG(_n("Measured skews: %f %f\n"), degrees(a2 - a1), degrees(a2)); eeprom_update_float((float *)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later if (angleDiff > bed_skew_angle_mild) result = (angleDiff > bed_skew_angle_extreme) ? diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index c68804890..1370542bc 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -293,7 +293,7 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi dad = dad_max - ((719 - ad) / k); r = (float)(((uint32_t)(719 - ad)) * (-radius)) / 720; } - ar = (ad + rotation)* (float)M_PI / 180; + ar = radians(ad + rotation); int x = (int)(cx + (cos(ar) * r)); int y = (int)(cy + (sin(ar) * r)); int z = (int)(z0 - ((float)((int32_t)dz * ad) / 720)); @@ -831,9 +831,8 @@ float median(float *points, const uint8_t num_points){ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t iterations){ /// circle of 10.5 diameter has 33 in circumference, don't go much above const constexpr uint8_t num_points = 33; - float pi_2_div_num_points = 2 * M_PI / num_points; + const float pi_2_div_num_points = 2 * M_PI / num_points; const constexpr uint8_t target_z = 32; ///< target z height of the circle - float angle; float max_change = 0.5f; ///< avoids too fast changes (avoid oscillation) const uint8_t blocks = num_points; float shifts_x[blocks]; @@ -848,7 +847,7 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t /// read points on the circle for (uint8_t p = 0; p < num_points; ++p){ - angle = p * pi_2_div_num_points; + const float angle = p * pi_2_div_num_points; const float height = get_value(matrix_32x32, r * cos(angle) + x, r * sin(angle) + y) - target_z; // DBG(_n("%f "), point); @@ -858,7 +857,8 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t } // DBG(_n(" points\n")); - const float norm = 1.f / 32.f; + const float reducer = 32.f; ///< reduces speed of convergency to avoid oscillation + const float norm = 1.f / reducer; x += CLAMP(median(shifts_x, blocks) * norm, -max_change, max_change); y += CLAMP(median(shifts_y, blocks) * norm, -max_change, max_change); r += CLAMP(median(shifts_r, blocks) * norm * .5f, -max_change, max_change); @@ -912,49 +912,52 @@ bool xyzcal_scan_and_process(void){ bool ret = false; int16_t x = _X; int16_t y = _Y; - int16_t z = _Z; + const int16_t z = _Z; uint8_t *matrix32 = (uint8_t *)block_buffer; uint16_t *pattern08 = (uint16_t *)(matrix32 + 32 * 32); uint16_t *pattern10 = (uint16_t *)(pattern08 + 12); - xyzcal_scan_pixels_32x32_Zhop(x, y, z - 72, 2400, 200, matrix32); - print_image(matrix32); - for (uint8_t i = 0; i < 12; i++){ pattern08[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_08 + i)); pattern10[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_10 + i)); } - - /// SEARCH FOR BINARY CIRCLE - uint8_t uc = 0; - uint8_t ur = 0; - - - /// max match = 132, 1/2 good = 66, 2/3 good = 88 - if (find_patterns(matrix32, pattern08, pattern10, uc, ur) >= 88){ - /// find precise circle - /// move to the center of the pattern (+5.5) - float xf = uc + 5.5f; - float yf = ur + 5.5f; - float radius = 5; ///< default radius - const uint8_t iterations = 20; - dynamic_circle(matrix32, xf, yf, radius, iterations); - if (ABS(xf - (uc + 5.5f)) > 3 || ABS(yf - (ur + 5.5f)) > 3 || ABS(radius - 5) > 3){ - DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); - /// dynamic algorithm diverged, use original position instead - xf = uc + 5.5f; - yf = ur + 5.5f; - } - /// move to the center of area and convert to position - xf = (float)x + (xf - 15.5f) * 64; - yf = (float)y + (yf - 15.5f) * 64; - DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); - x = round_to_i16(xf); - y = round_to_i16(yf); - xyzcal_lineXYZ_to(x, y, z, 200, 0); - ret = true; + /// Lower z if pattern not found + for (int8_t lower = 0; lower < 60; lower += 50){ + xyzcal_scan_pixels_32x32_Zhop(x, y, z - lower, 2400, 200, matrix32); + print_image(matrix32); + + /// SEARCH FOR BINARY CIRCLE + uint8_t uc = 0; + uint8_t ur = 0; + + /// max match = 132, 1/2 good = 66, 2/3 good = 88 + if (find_patterns(matrix32, pattern08, pattern10, uc, ur) >= 88){ + /// find precise circle + /// move to the center of the pattern (+5.5) + float xf = uc + 5.5f; + float yf = ur + 5.5f; + float radius = 4.5f; ///< default radius + const uint8_t iterations = 20; + dynamic_circle(matrix32, xf, yf, radius, iterations); + if (ABS(xf - (uc + 5.5f)) > 3 || ABS(yf - (ur + 5.5f)) > 3 || ABS(radius - 5) > 3){ + DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); + /// dynamic algorithm diverged, use original position instead + xf = uc + 5.5f; + yf = ur + 5.5f; + } + + /// move to the center of area and convert to position + xf = (float)x + (xf - 15.5f) * 64; + yf = (float)y + (yf - 15.5f) * 64; + DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); + x = round_to_i16(xf); + y = round_to_i16(yf); + xyzcal_lineXYZ_to(x, y, z, 200, 0); + ret = true; + break; + } } /// wipe buffer From d7507649d8202de6653ca4d376d6f19e309a98b1 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 12 Jan 2021 00:28:46 +0100 Subject: [PATCH 131/218] Remove degree char --- Firmware/mesh_bed_calibration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 4f4261161..a0efc3aae 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -372,7 +372,7 @@ BedSkewOffsetDetectionResultType calculate_machine_skew_and_offset_LS( { angleDiff = fabs(a2 - a1); /// XY skew and Y-bed skew - DBG(_n("Measured skews: %f° %f°\n"), degrees(a2 - a1), degrees(a2)); + DBG(_n("Measured skews: %f %f\n"), degrees(a2 - a1), degrees(a2)); eeprom_update_float((float *)(EEPROM_XYZ_CAL_SKEW), angleDiff); //storing xyz cal. skew to be able to show in support menu later if (angleDiff > bed_skew_angle_mild) result = (angleDiff > bed_skew_angle_extreme) ? From 546812294ec91d5ad0011c3de7201d6464fa21e0 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 12 Jan 2021 00:34:28 +0100 Subject: [PATCH 132/218] Clean serial output --- Firmware/xyzcal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 1370542bc..8365fc94b 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -682,7 +682,7 @@ uint8_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, u } // DBG(_n("\n")); } - DBG(_n("max_c=%d max_r=%d max_match=%d pixel\n"), max_c, max_r, max_match); + DBG(_n("Pattern center [%f %f], match %f%%\n"), max_c + 5.5f, max_r + 5.5f, max_match / 1.32f); *pc = max_c; *pr = max_r; @@ -839,7 +839,7 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t float shifts_y[blocks]; float shifts_r[blocks]; - DBG(_n(" [%f, %f][%f] start circle\n"), x, y, r); + // DBG(_n(" [%f, %f][%f] start circle\n"), x, y, r); for (int8_t i = iterations; i > 0; --i){ From 9dceb488b68bb131e512fe4c7a96c65cc28d4ef2 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 12 Jan 2021 16:04:04 +0100 Subject: [PATCH 133/218] Revert double scanning --- Firmware/xyzcal.cpp | 73 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 8365fc94b..f6cb1ea10 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -923,40 +923,38 @@ bool xyzcal_scan_and_process(void){ pattern10[i] = pgm_read_word((uint16_t*)(xyzcal_point_pattern_10 + i)); } - /// Lower z if pattern not found - for (int8_t lower = 0; lower < 60; lower += 50){ - xyzcal_scan_pixels_32x32_Zhop(x, y, z - lower, 2400, 200, matrix32); - print_image(matrix32); - - /// SEARCH FOR BINARY CIRCLE - uint8_t uc = 0; - uint8_t ur = 0; - - /// max match = 132, 1/2 good = 66, 2/3 good = 88 - if (find_patterns(matrix32, pattern08, pattern10, uc, ur) >= 88){ - /// find precise circle - /// move to the center of the pattern (+5.5) - float xf = uc + 5.5f; - float yf = ur + 5.5f; - float radius = 4.5f; ///< default radius - const uint8_t iterations = 20; - dynamic_circle(matrix32, xf, yf, radius, iterations); - if (ABS(xf - (uc + 5.5f)) > 3 || ABS(yf - (ur + 5.5f)) > 3 || ABS(radius - 5) > 3){ - DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); - /// dynamic algorithm diverged, use original position instead - xf = uc + 5.5f; - yf = ur + 5.5f; - } + xyzcal_scan_pixels_32x32_Zhop(x, y, z, 2400, 200, matrix32); + print_image(matrix32); - /// move to the center of area and convert to position - xf = (float)x + (xf - 15.5f) * 64; - yf = (float)y + (yf - 15.5f) * 64; - DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); - x = round_to_i16(xf); - y = round_to_i16(yf); - xyzcal_lineXYZ_to(x, y, z, 200, 0); - ret = true; - break; + /// SEARCH FOR BINARY CIRCLE + uint8_t uc = 0; + uint8_t ur = 0; + + /// max match = 132, 1/2 good = 66, 2/3 good = 88 + if (find_patterns(matrix32, pattern08, pattern10, uc, ur) >= 88){ + /// find precise circle + /// move to the center of the pattern (+5.5) + float xf = uc + 5.5f; + float yf = ur + 5.5f; + float radius = 4.5f; ///< default radius + const uint8_t iterations = 20; + dynamic_circle(matrix32, xf, yf, radius, iterations); + if (ABS(xf - (uc + 5.5f)) > 3 || ABS(yf - (ur + 5.5f)) > 3 || ABS(radius - 5) > 3) + { + DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); + /// dynamic algorithm diverged, use original position instead + xf = uc + 5.5f; + yf = ur + 5.5f; + } + + /// move to the center of area and convert to position + xf = (float)x + (xf - 15.5f) * 64; + yf = (float)y + (yf - 15.5f) * 64; + DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); + x = round_to_i16(xf); + y = round_to_i16(yf); + xyzcal_lineXYZ_to(x, y, z, 200, 0); + ret = true; } } @@ -971,9 +969,11 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); st_synchronize(); - pos_i16_t x = _X; - pos_i16_t y = _Y; - pos_i16_t z = _Z; + const pos_i16_t x = _X; + const pos_i16_t y = _Y; + const pos_i16_t z = _Z; + ///< magic constant, lowers min_z after searchZ to obtain more dense data in scan + const pos_i16_t lower_z = 72; uint8_t point = xyzcal_xycoords2point(x, y); x = pgm_read_word((uint16_t *)(xyzcal_point_xcoords + point)); @@ -983,6 +983,7 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ xyzcal_lineXYZ_to(x, y, z, 200, 0); if (xyzcal_searchZ()){ + xyzcal_lineXYZ_to(_X, _Y, _Z - lower_z, 200, 0); xyzcal_lineXYZ_to(x, y, _Z, 200, 0); ret = xyzcal_scan_and_process(); } From f3faf651c576f8bf7a53f6d7fa5489948d32bd82 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 12 Jan 2021 16:12:34 +0100 Subject: [PATCH 134/218] Move down before scanning --- Firmware/xyzcal.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index f6cb1ea10..98cd04a4d 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -984,7 +984,6 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ if (xyzcal_searchZ()){ xyzcal_lineXYZ_to(_X, _Y, _Z - lower_z, 200, 0); - xyzcal_lineXYZ_to(x, y, _Z, 200, 0); ret = xyzcal_scan_and_process(); } xyzcal_meassure_leave(); From 21d6f970ef7e139840dc5535fb09f03c3ff99ed6 Mon Sep 17 00:00:00 2001 From: espr14 Date: Tue, 12 Jan 2021 16:26:46 +0100 Subject: [PATCH 135/218] Fix build --- Firmware/xyzcal.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 98cd04a4d..47eecb942 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -955,7 +955,6 @@ bool xyzcal_scan_and_process(void){ y = round_to_i16(yf); xyzcal_lineXYZ_to(x, y, z, 200, 0); ret = true; - } } /// wipe buffer @@ -969,8 +968,8 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); st_synchronize(); - const pos_i16_t x = _X; - const pos_i16_t y = _Y; + pos_i16_t x = _X; + pos_i16_t y = _Y; const pos_i16_t z = _Z; ///< magic constant, lowers min_z after searchZ to obtain more dense data in scan const pos_i16_t lower_z = 72; From 9867ecd3f90d53a1d1f6b32f9f6937d89590fa85 Mon Sep 17 00:00:00 2001 From: espr14 Date: Wed, 13 Jan 2021 13:59:20 +0100 Subject: [PATCH 136/218] Reduce unnecessary code --- Firmware/xyzcal.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index c68804890..973efb366 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -689,25 +689,6 @@ uint8_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, u return max_match; } -uint8_t xyzcal_xycoords2point(int16_t x, int16_t y) -{ - uint8_t ix = (x > 10000)?1:0; - uint8_t iy = (y > 10000)?1:0; - return iy?(3-ix):ix; -} - -//MK3 -#if ((MOTHERBOARD == BOARD_EINSY_1_0a)) -const int16_t xyzcal_point_xcoords[4] PROGMEM = {1200, 22000, 22000, 1200}; -const int16_t xyzcal_point_ycoords[4] PROGMEM = {600, 600, 19800, 19800}; -#endif //((MOTHERBOARD == BOARD_EINSY_1_0a)) - -//MK2.5 -#if ((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3)) -const int16_t xyzcal_point_xcoords[4] PROGMEM = {1200, 22000, 22000, 1200}; -const int16_t xyzcal_point_ycoords[4] PROGMEM = {700, 700, 19800, 19800}; -#endif //((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3)) - const uint16_t xyzcal_point_pattern_10[12] PROGMEM = {0x000, 0x0f0, 0x1f8, 0x3fc, 0x7fe, 0x7fe, 0x7fe, 0x7fe, 0x3fc, 0x1f8, 0x0f0, 0x000}; const uint16_t xyzcal_point_pattern_08[12] PROGMEM = {0x000, 0x000, 0x0f0, 0x1f8, 0x3fc, 0x3fc, 0x3fc, 0x3fc, 0x1f8, 0x0f0, 0x000, 0x000}; @@ -972,13 +953,7 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ pos_i16_t y = _Y; pos_i16_t z = _Z; - uint8_t point = xyzcal_xycoords2point(x, y); - x = pgm_read_word((uint16_t *)(xyzcal_point_xcoords + point)); - y = pgm_read_word((uint16_t *)(xyzcal_point_ycoords + point)); - DBG(_n("point=%d x=%d y=%d z=%d\n"), point, x, y, z); xyzcal_meassure_enter(); - xyzcal_lineXYZ_to(x, y, z, 200, 0); - if (xyzcal_searchZ()){ xyzcal_lineXYZ_to(x, y, _Z, 200, 0); ret = xyzcal_scan_and_process(); From dea3f23a69f700032b97f765a77d03b71a2d1e27 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Thu, 14 Jan 2021 11:52:22 +0200 Subject: [PATCH 137/218] PRUSA SN in eeprom --- Firmware/Marlin_main.cpp | 38 ++++++++++++++++++++++++++++++-------- Firmware/eeprom.h | 4 +++- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3be465912..86b14402c 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -407,6 +407,7 @@ static void gcode_M105(uint8_t extruder); static void temp_compensation_start(); static void temp_compensation_apply(); +static bool get_PRUSA_SN(char* SN); uint16_t gcode_in_progress = 0; uint16_t mcode_in_progress = 0; @@ -1075,6 +1076,21 @@ void setup() if(!(eeprom_read_byte((uint8_t*)EEPROM_FAN_CHECK_ENABLED))) eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED,true); } + + + if (eeprom_read_byte((uint8_t*)EEPROM_PRUSA_SN + 19)) //saved EEPROM SN is not valid. Try to retrieve it. + { + char SN[20]; + if (get_PRUSA_SN(SN)) + { + eeprom_update_block(SN, (uint8_t*)EEPROM_PRUSA_SN, 20); + puts_P(PSTR("SN updated")); + } + else + puts_P(PSTR("SN update failed")); + } + + #ifndef W25X20CL SERIAL_PROTOCOLLNPGM("start"); #else @@ -3386,25 +3402,26 @@ void gcode_M701() * * Typical format of S/N is:CZPX0917X003XC13518 * - * Command operates only in farm mode, if not in farm mode, "Not in farm mode." is written to MYSERIAL. - * * Send command ;S to serial port 0 to retrieve serial number stored in 32U2 processor, - * reply is transmitted to serial port 1 character by character. + * reply is transmitted to the selected serial port. * Operation takes typically 23 ms. If the retransmit is not finished until 100 ms, * it is interrupted, so less, or no characters are retransmitted, only newline character is send * in any case. + * The command will fail if the 32U2 processor is unpowered via USB since it is isolated from the rest of the electronics. + * In that case the value that is stored in the EEPROM should be used instead. + * + * @return 1 on success */ -static void gcode_PRUSA_SN() +static bool get_PRUSA_SN(char* SN) { uint8_t selectedSerialPort_bak = selectedSerialPort; - char SN[20]; selectedSerialPort = 0; SERIAL_ECHOLNRPGM(PSTR(";S")); uint8_t numbersRead = 0; ShortTimer timeout; timeout.start(); - while (numbersRead < (sizeof(SN) - 1)) { + while (numbersRead < 19) { if (MSerial.available() > 0) { SN[numbersRead] = MSerial.read(); numbersRead++; @@ -3413,7 +3430,7 @@ static void gcode_PRUSA_SN() } SN[numbersRead] = 0; selectedSerialPort = selectedSerialPort_bak; - SERIAL_ECHOLN(SN); + return (numbersRead == 19); } //! Detection of faulty RAMBo 1.1b boards equipped with bigger capacitors //! at the TACH_1 pin, which causes bad detection of print fan speed. @@ -3950,7 +3967,12 @@ void process_commands() card.openFile(strchr_pointer+4,false); } else if (code_seen("SN")) { // PRUSA SN - gcode_PRUSA_SN(); + char SN[20]; + eeprom_read_block(SN, (uint8_t*)EEPROM_PRUSA_SN, 20); + if (SN[19]) + puts_P(PSTR("SN invalid")); + else + puts(SN); } else if(code_seen("Fir")){ // PRUSA Fir diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 731db1da1..f54bb8ed7 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -316,6 +316,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0D29 3369 | uint8 | EEPROM_PINDA_TEMP_COMPENSATION | ffh 255 | ffh 255 | PINDA temp compensation unknown state | LCD menu | D3 Ax0d29 C1 | ^ | ^ | ^ | 00h 0 | ^ | PINDA has no temp compensation PINDA v1/2 | ^ | ^ | ^ | ^ | ^ | 01h 1 | ^ | PINDA has temp compensation aka SuperPINDA | ^ | ^ +| 0x0D15 3349 | char[20] | EEPROM_PRUSA_SN | SN[19] == 0 | ffffffffffffffff... | PRUSA Serial number string | PRUSA SN | D3 Ax0d15 C20 | Address begin | Bit/Type | Name | Valid values | Default/FactoryReset | Description | Gcode/Function| Debug code @@ -521,8 +522,9 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_ALTFAN_OVERRIDE (EEPROM_UVLO_LA_K-1) //uint8 #define EEPROM_EXPERIMENTAL_VISIBILITY (EEPROM_ALTFAN_OVERRIDE-1) //uint8 #define EEPROM_PINDA_TEMP_COMPENSATION (EEPROM_EXPERIMENTAL_VISIBILITY-1) //uint8 +#define EEPROM_PRUSA_SN (EEPROM_PINDA_TEMP_COMPENSATION-20) //char[20] //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. -#define EEPROM_LAST_ITEM EEPROM_PINDA_TEMP_COMPENSATION +#define EEPROM_LAST_ITEM EEPROM_PRUSA_SN // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! From 20c3f4cb7709692824d7751e150d9df0606b75b3 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 14 Jan 2021 12:53:12 +0200 Subject: [PATCH 138/218] Update comments --- Firmware/Marlin_main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 86b14402c..d43e05e58 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1077,8 +1077,9 @@ void setup() eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED,true); } - - if (eeprom_read_byte((uint8_t*)EEPROM_PRUSA_SN + 19)) //saved EEPROM SN is not valid. Try to retrieve it. + //saved EEPROM SN is not valid. Try to retrieve it. + //SN is valid only if it is NULL terminated. Any other character means either uninitialized or corrupted + if (eeprom_read_byte((uint8_t*)EEPROM_PRUSA_SN + 19)) { char SN[20]; if (get_PRUSA_SN(SN)) @@ -3403,14 +3404,14 @@ void gcode_M701() * Typical format of S/N is:CZPX0917X003XC13518 * * Send command ;S to serial port 0 to retrieve serial number stored in 32U2 processor, - * reply is transmitted to the selected serial port. + * reply is stored in *SN. * Operation takes typically 23 ms. If the retransmit is not finished until 100 ms, - * it is interrupted, so less, or no characters are retransmitted, only newline character is send - * in any case. + * it is interrupted, so less, or no characters are retransmitted, the function returns false * The command will fail if the 32U2 processor is unpowered via USB since it is isolated from the rest of the electronics. * In that case the value that is stored in the EEPROM should be used instead. * * @return 1 on success + * @return 0 on general failure */ static bool get_PRUSA_SN(char* SN) { From ca4e638ea2abe912736b84c1798c7da72a5abc3a Mon Sep 17 00:00:00 2001 From: espr14 Date: Thu, 14 Jan 2021 13:19:30 +0100 Subject: [PATCH 139/218] Don't use extrusion in XYZ calibration --- Firmware/sm4.c | 40 ++++++++++++++++ Firmware/sm4.h | 113 ++++++++++++++++++++++---------------------- Firmware/xyzcal.cpp | 3 +- 3 files changed, 98 insertions(+), 58 deletions(-) diff --git a/Firmware/sm4.c b/Firmware/sm4.c index 34cf8a3c9..ff8a1cd53 100644 --- a/Firmware/sm4.c +++ b/Firmware/sm4.c @@ -191,5 +191,45 @@ uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de) return nd; } +uint16_t sm4_line_xyz_ui(uint16_t dx, uint16_t dy, uint16_t dz){ + uint16_t dd = (uint16_t)(sqrt((float)(((uint32_t)dx)*dx + ((uint32_t)dy*dy) + ((uint32_t)dz*dz))) + 0.5); + uint16_t nd = dd; + uint16_t cx = dd; + uint16_t cy = dd; + uint16_t cz = dd; + uint16_t x = 0; + uint16_t y = 0; + uint16_t z = 0; + while (nd){ + if (sm4_stop_cb && (*sm4_stop_cb)()) break; + uint8_t sm = 0; //step mask + if (cx <= dx){ + sm |= 1; + cx += dd; + x++; + } + if (cy <= dy){ + sm |= 2; + cy += dd; + y++; + } + if (cz <= dz){ + sm |= 4; + cz += dd; + z++; + } + cx -= dx; + cy -= dy; + cz -= dz; + sm4_do_step(sm); + uint16_t delay = SM4_DEFDELAY; + if (sm4_calc_delay_cb) delay = (*sm4_calc_delay_cb)(nd, dd); + if (delay) delayMicroseconds(delay); + nd--; + } + if (sm4_update_pos_cb) + (*sm4_update_pos_cb)(x, y, z, 0); + return nd; +} #endif //NEW_XYZCAL diff --git a/Firmware/sm4.h b/Firmware/sm4.h index fc64f7a66..ce110caa8 100644 --- a/Firmware/sm4.h +++ b/Firmware/sm4.h @@ -1,56 +1,57 @@ -//sm4.h - simple 4-axis stepper control -#ifndef _SM4_H -#define _SM4_H - -#include -#include "config.h" - - -#if defined(__cplusplus) -extern "C" { -#endif //defined(__cplusplus) - - -// callback prototype for stop condition (return 0 - continue, return 1 - stop) -typedef uint8_t (*sm4_stop_cb_t)(); - -// callback prototype for updating position counters -typedef void (*sm4_update_pos_cb_t)(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); - -// callback prototype for calculating delay -typedef uint16_t (*sm4_calc_delay_cb_t)(uint16_t nd, uint16_t dd); - - -// callback pointer - stop -extern sm4_stop_cb_t sm4_stop_cb; - -// callback pointer - update_pos -extern sm4_update_pos_cb_t sm4_update_pos_cb; - -// callback pointer - calc_delay -extern sm4_calc_delay_cb_t sm4_calc_delay_cb; - - -// returns direction for single axis (0 - positive, 1 - negative) -extern uint8_t sm4_get_dir(uint8_t axis); - -// set direction for single axis (0 - positive, 1 - negative) -extern void sm4_set_dir(uint8_t axis, uint8_t dir); - -// returns direction of all axes as bitmask (0 - positive, 1 - negative) -extern uint8_t sm4_get_dir_bits(void); - -// set direction for all axes as bitmask (0 - positive, 1 - negative) -extern void sm4_set_dir_bits(uint8_t dir_bits); - -// step axes by bitmask -extern void sm4_do_step(uint8_t axes_mask); - -// xyze linear-interpolated relative move, returns remaining diagonal steps (>0 means stoped) -extern uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); - - -#if defined(__cplusplus) -} -#endif //defined(__cplusplus) -#endif //_SM4_H +//sm4.h - simple 4-axis stepper control +#ifndef _SM4_H +#define _SM4_H + +#include +#include "config.h" + + +#if defined(__cplusplus) +extern "C" { +#endif //defined(__cplusplus) + + +// callback prototype for stop condition (return 0 - continue, return 1 - stop) +typedef uint8_t (*sm4_stop_cb_t)(); + +// callback prototype for updating position counters +typedef void (*sm4_update_pos_cb_t)(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); + +// callback prototype for calculating delay +typedef uint16_t (*sm4_calc_delay_cb_t)(uint16_t nd, uint16_t dd); + + +// callback pointer - stop +extern sm4_stop_cb_t sm4_stop_cb; + +// callback pointer - update_pos +extern sm4_update_pos_cb_t sm4_update_pos_cb; + +// callback pointer - calc_delay +extern sm4_calc_delay_cb_t sm4_calc_delay_cb; + + +// returns direction for single axis (0 - positive, 1 - negative) +extern uint8_t sm4_get_dir(uint8_t axis); + +// set direction for single axis (0 - positive, 1 - negative) +extern void sm4_set_dir(uint8_t axis, uint8_t dir); + +// returns direction of all axes as bitmask (0 - positive, 1 - negative) +extern uint8_t sm4_get_dir_bits(void); + +// set direction for all axes as bitmask (0 - positive, 1 - negative) +extern void sm4_set_dir_bits(uint8_t dir_bits); + +// step axes by bitmask +extern void sm4_do_step(uint8_t axes_mask); + +// xyze linear-interpolated relative move, returns remaining diagonal steps (>0 means stoped) +extern uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); +extern uint16_t sm4_line_xyz_ui(uint16_t dx, uint16_t dy, uint16_t dz); + + +#if defined(__cplusplus) +} +#endif //defined(__cplusplus) +#endif //_SM4_H diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 973efb366..fed7f5c14 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -252,7 +252,7 @@ bool xyzcal_lineXYZ_to(int16_t x, int16_t y, int16_t z, uint16_t delay_us, int8_ sm4_stop_cb = check_pinda?((check_pinda<0)?check_pinda_0:check_pinda_1):0; xyzcal_sm4_delay = delay_us; // uint32_t u = _micros(); - bool ret = sm4_line_xyze_ui(abs(x), abs(y), abs(z), 0) ? true : false; + bool ret = sm4_line_xyz_ui(abs(x), abs(y), abs(z)) ? true : false; // u = _micros() - u; return ret; } @@ -951,7 +951,6 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ st_synchronize(); pos_i16_t x = _X; pos_i16_t y = _Y; - pos_i16_t z = _Z; xyzcal_meassure_enter(); if (xyzcal_searchZ()){ From 735895c6bc9a1cb90f79c132626b1a81888a3f6d Mon Sep 17 00:00:00 2001 From: espr14 Date: Thu, 14 Jan 2021 16:38:34 +0100 Subject: [PATCH 140/218] Use fabs --- Firmware/xyzcal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index fed7f5c14..551546646 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -921,7 +921,7 @@ bool xyzcal_scan_and_process(void){ float radius = 5; ///< default radius const uint8_t iterations = 20; dynamic_circle(matrix32, xf, yf, radius, iterations); - if (ABS(xf - (uc + 5.5f)) > 3 || ABS(yf - (ur + 5.5f)) > 3 || ABS(radius - 5) > 3){ + if (fabs(xf - (uc + 5.5f)) > 3 || fabs(yf - (ur + 5.5f)) > 3 || fabs(radius - 5) > 3){ DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); /// dynamic algorithm diverged, use original position instead xf = uc + 5.5f; From 9264454d3a8bae032937885d1833b5f1cae0ca29 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 19 Jan 2021 09:01:46 +0100 Subject: [PATCH 141/218] Gcode `M123` only if FANCHECK and TACHOs are defined Gcode `M155` added parameter "C" to activate auto-report for temperatures, fans and positions Updated doxygen @todo Update RepRap Wiki @todo improve code --- Firmware/Configuration_adv.h | 27 ++++++- Firmware/Marlin.h | 2 + Firmware/Marlin_main.cpp | 148 ++++++++++++++++++++++++++++------- 3 files changed, 148 insertions(+), 29 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 65ed20751..9f2ee64a4 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -63,12 +63,35 @@ #define FAN_KICKSTART_TIME 800 /** - * Auto-report temperatures with M155 S + * Auto-report all at once with M155 S C[bitmask] with single timer + * + * bit 0 = Auto-report temperatures + * bit 1 = Auto-report fans + * bit 2 = Auto-report position + * bit 3 = free + * bit 4 = free + * bit 5 = free + * bit 6 = free + * bit 7 = free +*/ +#define AUTO_REPORT_ALL + +#ifndef AUTO_REPORT_ALL +/** + * Auto-report temperatures with M155 S [C1] */ #define AUTO_REPORT_TEMPERATURES +/** + * Auto-report fans with M155 S C2 + */ +#define AUTO_REPORT_FANS - +/** + * Auto-report position with M155 S C4 + */ +#define AUTO_REPORT_POSITION +#endif //NOT AUTO_REPORT_ALL //=========================================================================== //=============================Mechanical Settings=========================== diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 07ed8594c..307b8c91b 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -481,7 +481,9 @@ void force_high_power_mode(bool start_high_power_section); bool gcode_M45(bool onlyZ, int8_t verbosity_level); void gcode_M114(); +#if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) void gcode_M123(); +#endif //FANCHECK and TACH_0 and TACH_1 void gcode_M701(); #define UVLO !(PINE & (1<<4)) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2a0df6bfd..6cd2f43fb 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -390,11 +390,23 @@ static int saved_fanSpeed = 0; //!< Print fan speed static int saved_feedmultiply_mm = 100; -#ifdef AUTO_REPORT_TEMPERATURES -static LongTimer auto_report_temp_timer; -static uint8_t auto_report_temp_period = 0; +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) +static LongTimer auto_report_timer; //Also used for AUTO_REPORT_TEMPERATURES +static uint8_t auto_report_period = 0; //Also used for AUTO_REPORT_TEMPERATURES +#endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES or AUTO_REPORT_FANS or AUTO_REPORT_POSITION + +#if defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_ALL) +static bool auto_report_temp_active = false; #endif //AUTO_REPORT_TEMPERATURES +#if defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_ALL) +static bool auto_report_fans_active = false; +#endif //AUTO_REPORT_FANS + +#if defined(AUTO_REPORT_POSITION) || defined(AUTO_REPORT_ALL) +static bool auto_report_position_active = false; +#endif //AUTO_REPORT_POSITION + //=========================================================================== //=============================Routines====================================== //=========================================================================== @@ -1731,16 +1743,29 @@ void host_keepalive() { if (farm_mode) return; long ms = _millis(); -#ifdef AUTO_REPORT_TEMPERATURES - if (auto_report_temp_timer.running()) +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) + if (auto_report_timer.running()) { - if (auto_report_temp_timer.expired(auto_report_temp_period * 1000ul)) + if (auto_report_timer.expired(auto_report_period * 1000ul)) { - gcode_M105(active_extruder); - auto_report_temp_timer.start(); + if(auto_report_temp_active){ + gcode_M105(active_extruder); + } +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_FANS) && (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) + if(auto_report_fans_active){ + gcode_M123(); + } +#endif //AUTO_REPORT_ALL or AUTO_REPORT_FANS and (FANCHECK and TACH_0 or TACH_1) +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_POSITION) + if(auto_report_position_active){ + gcode_M114(); + } +#endif //AUTO_REPORT_POSITION or AUTO_REPORT_FANS or AUTO_REPORT_POSITION + auto_report_timer.start(); } } -#endif //AUTO_REPORT_TEMPERATURES +#endif //AUTO_REPORT_ALL + if (host_keepalive_interval && busy_state != NOT_BUSY) { if ((ms - prev_busy_signal_ms) < (long)(1000L * host_keepalive_interval)) return; @@ -3167,10 +3192,12 @@ void gcode_M114() SERIAL_PROTOCOLLN(""); } +#if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) void gcode_M123() { printf_P(_N("E0:%d RPM PRN1:%d RPM E0@:%u PRN1@:%d\n"), 60*fan_speed[active_extruder], 60*fan_speed[1], newFanSpeed, fanSpeed); } +#endif //FANCHECK and TACH_0 or TACH_1 //! extracted code to compute z_shift for M600 in case of filament change operation //! requested from fsensors. @@ -3521,7 +3548,14 @@ static void cap_line(const char* name, bool ena = false) { static void extended_capabilities_report() { - cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT_TEMPERATURES)); + // AUTOREPORT_TEMP (M155) + cap_line(PSTR("AUTOREPORT_TEMP"), (ENABLED(AUTO_REPORT_TEMPERATURES)) || ENABLED(AUTO_REPORT_ALL)); +#if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) + // AUTOREPORT_FANS (M123) + cap_line(PSTR("AUTOREPORT_FANS"), (ENABLED(AUTO_REPORT_FANS) || ENABLED(AUTO_REPORT_ALL))); +#endif //FANCHECK and TACH_0 or TACH_1 + // AUTOREPORT_POSITION (M114) + cap_line(PSTR("AUTOREPORT_POSITION"), (ENABLED(AUTO_REPORT_POSITION) || ENABLED(AUTO_REPORT_ALL))); //@todo } #endif //EXTENDED_CAPABILITIES_REPORT @@ -3619,7 +3653,7 @@ extern uint8_t st_backlash_y; //!@n M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil) //!@n M140 - Set bed target temp //!@n M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work. -//!@n M155 - Automatically send temperatures +//!@n M155 - Automatically send temperatures, fan speeds, position //!@n M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating //! Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling //!@n M200 D- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). @@ -6413,31 +6447,75 @@ Sigma_Exit: break; } -#ifdef AUTO_REPORT_TEMPERATURES +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) /*! - ### M155 - Automatically send temperatures M155: Automatically send temperatures + ### M155 - Automatically send status M155: Automatically send temperatures #### Usage - M155 [ S ] + M155 [ S ] [ C ] #### Parameters - - `S` - Set temperature autoreporting interval in seconds. 0 to disable. Maximum: 255 - - */ + - `S` - Set autoreporting interval in seconds. 0 to disable. Maximum: 255 + - `C` - Activate auto-report function. Default is temperature. + + bit 0 = Auto-report temperatures + bit 1 = Auto-report fans + bit 2 = Auto-report position + bit 3 = free + bit 4 = free + bit 5 = free + bit 6 = free + bit 7 = free + */ + //!@todo update RepRap Gcode wiki + //!@todo Should be temperature always? Octoprint doesn't switch to M105 if M155 timer is set + + union { + struct + { + uint8_t ar_temp_active : 1; //Temperature flag + uint8_t ar_fans_active : 1; //Fans flag + uint8_t ar_pos_active : 1; //Position flag + uint8_t ar_4_active : 1; //Unused + uint8_t ar_5_active : 1; //Unused + uint8_t ar_6_active : 1; //Unused + uint8_t ar_7_active : 1; //Unused + } __attribute__((packed)) bits; + uint8_t byte; + } arFunctionsActive; case 155: { - if (code_seen('S')) - { - auto_report_temp_period = code_value_uint8(); - if (auto_report_temp_period != 0) - auto_report_temp_timer.start(); - else - auto_report_temp_timer.stop(); + if (code_seen('S')) + { + auto_report_period = code_value_uint8(); + if (auto_report_period != 0){ + auto_report_timer.start(); } - } + else{ + auto_report_timer.stop(); + } + } + if (code_seen('C')) + { + arFunctionsActive.byte = code_value(); + //arFunctionsActive.bits.ar_temp_active = 1; //auto-report temperatures always on + } + else{ + arFunctionsActive.byte = 1; + } +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) + auto_report_temp_active = arFunctionsActive.bits.ar_temp_active; +#endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_FANS) + auto_report_fans_active = arFunctionsActive.bits.ar_fans_active; +#endif //AUTO_REPORT_ALL or AUTO_REPORT_FANS +#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_POSITION) + auto_report_position_active = arFunctionsActive.bits.ar_pos_active; + #endif //AUTO_REPORT_ALL or AUTO_REPORT_POSITION + } break; -#endif //AUTO_REPORT_TEMPERATURES +#endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES or AUTO_REPORT_FANS or AUTO_REPORT_POSITION /*! ### M109 - Wait for extruder temperature M109: Set Extruder Temperature and Wait @@ -6973,13 +7051,29 @@ Sigma_Exit: break; //!@todo update for all axes, use for loop +#if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) /*! ### M123 - Tachometer value M123: Tachometer value + This command is used to report fan speeds and fan pwm values. + #### Usage + + M123 + + - E0: - Hotend fan speed in RPM + - PRN1: - Part cooling fans speed in RPM + - E0@: - Hotend fan PWM value + - PRN1@: -Part cooling fan PWM value + + _Example:_ + + E0:3240 RPM PRN1:4560 RPM E0@:255 PRN1@:255 + */ + //!@todo Update RepRap Gcode wiki case 123: gcode_M123(); break; - +#endif //FANCHECK and TACH_0 and TACH_1 #ifdef BLINKM /*! From a9d8ddc89caac0b8c64aaa94eedd9fd5ee05339b Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 19 Jan 2021 09:58:02 +0100 Subject: [PATCH 142/218] Farmers' requests 1 - remove the UI and related stuff to setting a farm number (the communication protocol must remain intact) - remove confirmation after print finished ("Print OK") Both requests are highly welcome, since they allow for lowering the code size by >1KB PFW-963, PFW-927 --- Firmware/Marlin_main.cpp | 22 +++++++-------- Firmware/ultralcd.cpp | 61 +++++++++------------------------------- Firmware/ultralcd.h | 5 ++-- 3 files changed, 28 insertions(+), 60 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9da891d87..5929273db 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -714,10 +714,10 @@ static void factory_reset(char level) // Force the "Follow calibration flow" message at the next boot up. calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION); eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard - farm_no = 0; +// farm_no = 0; farm_mode = false; eeprom_update_byte((uint8_t*)EEPROM_FARM_MODE, farm_mode); - EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); +// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0); eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); @@ -1051,10 +1051,10 @@ void setup() setup_powerhold(); farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE); - EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); - if ((farm_mode == 0xFF && farm_no == 0) || ((uint16_t)farm_no == 0xFFFF)) +// EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); + if ((farm_mode == 0xFF /*&& farm_no == 0*/) /*|| ((uint16_t)farm_no == 0xFFFF)*/) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode - if ((uint16_t)farm_no == 0xFFFF) farm_no = 0; +// if ((uint16_t)farm_no == 0xFFFF) farm_no = 0; if (farm_mode) { no_response = true; //we need confirmation by recieving PRUSA thx @@ -1370,9 +1370,9 @@ void setup() #endif farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE); - EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); - if ((farm_mode == 0xFF && farm_no == 0) || (farm_no == static_cast(0xFFFF))) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode - if (farm_no == static_cast(0xFFFF)) farm_no = 0; +// EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); + if ((farm_mode == 0xFF /*&& farm_no == 0*/) /*|| (farm_no == static_cast(0xFFFF))*/) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode +// if (farm_no == static_cast(0xFFFF)) farm_no = 0; if (farm_mode) { prusa_statistics(8); @@ -3893,7 +3893,7 @@ void process_commands() gcode_PRUSA_BadRAMBoFanTest(); }else if (code_seen("FAN")) { // PRUSA FAN printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]); - }else if (code_seen("fn")) { // PRUSA fn + }/*else if (code_seen("fn")) { // PRUSA fn if (farm_mode) { printf_P(_N("%d"), farm_no); } @@ -3901,7 +3901,7 @@ void process_commands() puts_P(_N("Not in farm mode.")); } - } + }*/ else if (code_seen("thx")) // PRUSA thx { no_response = false; @@ -5556,7 +5556,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) farm_mode = 1; PingTime = _millis(); eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode); - EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); +// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); SilentModeMenu = SILENT_MODE_OFF; eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu); fCheckModeInit(); // alternatively invoke printer reset diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a12db7f48..62585c064 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -89,7 +89,6 @@ unsigned int custom_message_state = 0; bool isPrintPaused = false; uint8_t farm_mode = 0; -int farm_no = 0; int farm_timer = 8; uint8_t farm_status = 0; bool printer_connected = true; @@ -137,7 +136,7 @@ static void prusa_stat_farm_number(); static void prusa_stat_diameter(); static void prusa_stat_temperatures(); static void prusa_stat_printinfo(); -static void lcd_farm_no(); +//static void lcd_farm_no(); static void lcd_menu_xyz_y_min(); static void lcd_menu_xyz_skew(); static void lcd_menu_xyz_offset(); @@ -671,39 +670,7 @@ void lcdui_print_extruder(void) // Print farm number (5 chars total) void lcdui_print_farm(void) { - int chars = lcd_printf_P(_N(" F0 ")); -// lcd_space(5 - chars); -/* - // Farm number display - if (farm_mode) - { - lcd_set_cursor(6, 2); - lcd_puts_P(PSTR(" F")); - lcd_print(farm_no); - lcd_puts_P(PSTR(" ")); - - // Beat display - lcd_set_cursor(LCD_WIDTH - 1, 0); - if ( (_millis() - kicktime) < 60000 ) { - - lcd_puts_P(PSTR("L")); - - }else{ - lcd_puts_P(PSTR(" ")); - } - - } - else { -#ifdef SNMM - lcd_puts_P(PSTR(" E")); - lcd_print(get_ext_nr() + 1); - -#else - lcd_set_cursor(LCD_WIDTH - 8 - 2, 2); - lcd_puts_P(PSTR(" ")); -#endif - } -*/ + lcd_printf_P(_N(" F0 ")); } #ifdef CMD_DIAGNOSTICS @@ -1486,7 +1453,7 @@ void lcd_commands() if (lcd_commands_step == 1 && !blocks_queued()) { - lcd_confirm_print(); +// lcd_confirm_print(); lcd_commands_step = 0; lcd_commands_type = LcdCommands::Idle; } @@ -5833,7 +5800,7 @@ static void lcd_settings_menu() if (farm_mode) { - MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); +// MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); MENU_ITEM_FUNCTION_P(PSTR("Disable farm mode"), lcd_disable_farm_mode); } @@ -6465,7 +6432,7 @@ void unload_filament() } -static void lcd_farm_no() +/*static void lcd_farm_no() { char step = 0; int enc_dif = 0; @@ -6520,8 +6487,8 @@ static void lcd_farm_no() step++; if(step == 3) { _ret = 1; - farm_no = _farmno; - EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); +// farm_no = _farmno; +// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); prusa_statistics(20); lcd_return_to_status(); } @@ -6530,7 +6497,7 @@ static void lcd_farm_no() manage_heater(); } while (_ret == 0); -} +}*/ unsigned char lcd_choose_color() { @@ -6617,7 +6584,7 @@ unsigned char lcd_choose_color() { } -void lcd_confirm_print() +/*void lcd_confirm_print() { uint8_t filament_type; int enc_dif = 0; @@ -6694,7 +6661,7 @@ void lcd_confirm_print() } while (_ret == 0); -} +}*/ #include "w25x20cl.h" @@ -6978,10 +6945,10 @@ static void lcd_main_menu() if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) { - if (farm_mode) - { - MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); - } +// if (farm_mode) +// { +// MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); +// } } else { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index cca4eced3..6da57a918 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -47,7 +47,7 @@ void lcd_pause_print(); void lcd_resume_print(); void lcd_print_stop(); void prusa_statistics(int _message, uint8_t _col_nr = 0); -void lcd_confirm_print(); +//void lcd_confirm_print(); unsigned char lcd_choose_color(); void lcd_load_filament_color_check(); //void lcd_mylang(); @@ -127,7 +127,8 @@ extern CustomMsg custom_message_type; extern unsigned int custom_message_state; extern uint8_t farm_mode; -extern int farm_no; +// Farmers request removal of farm_no from the FW +constexpr const int farm_no = 0; extern int farm_timer; extern uint8_t farm_status; From 3f5cfc4e610e17db600382160ddd019f30096a55 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:06:23 +0200 Subject: [PATCH 143/218] Move the change filament button to the main menu when farm printing PFW-945 --- Firmware/ultralcd.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 62585c064..4ac781542 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6855,6 +6855,8 @@ static void lcd_main_menu() if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) { + if (farm_mode) + MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 } @@ -7141,7 +7143,8 @@ static void lcd_tune_menu() MENU_ITEM_EDIT_advance_K();//7 #endif #ifdef FILAMENTCHANGEENABLE - MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 + if (!farm_mode) + MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 #endif #ifdef FILAMENT_SENSOR From 9b847715ac547c5798070facff5a356d0ba6ac18 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:11:25 +0200 Subject: [PATCH 144/218] Rename F0 to FRM 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 4ac781542..85b031a38 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -670,7 +670,7 @@ void lcdui_print_extruder(void) // Print farm number (5 chars total) void lcdui_print_farm(void) { - lcd_printf_P(_N(" F0 ")); + lcd_printf_P(_N(" FRM ")); } #ifdef CMD_DIAGNOSTICS From 542677c0804d46a65afadd491ee021ad50aae76e Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:11:48 +0200 Subject: [PATCH 145/218] Prevent switching to serial port 1 on miniRambo and such --- Firmware/Marlin_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5929273db..8b2b04781 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1060,7 +1060,9 @@ void setup() no_response = true; //we need confirmation by recieving PRUSA thx important_status = 8; prusa_statistics(8); +#ifdef HAS_SECOND_SERIAL_PORT selectedSerialPort = 1; +#endif //HAS_SECOND_SERIAL_PORT MYSERIAL.begin(BAUDRATE); #ifdef TMC2130 //increased extruder current (PFW363) From 48b4bdfe8e813e2271c900abee3af4fc65cbe6a0 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:36:08 +0200 Subject: [PATCH 146/218] Make the PRUSA RESET command functional on the miniRambo --- 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 8b2b04781..07d3516ba 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3920,9 +3920,11 @@ void process_commands() else if (code_seen("RESET")) { // PRUSA RESET // careful! if (farm_mode) { -#if (defined(WATCHDOG) && (MOTHERBOARD == BOARD_EINSY_1_0a)) +#ifdef WATCHDOG +#if defined(W25X20CL) && defined(BOOTAPP) boot_app_magic = BOOT_APP_MAGIC; boot_app_flags = BOOT_APP_FLG_RUN; +#endif //defined(W25X20CL) && defined(BOOTAPP) softReset(); #else //WATCHDOG asm volatile("jmp 0x3E000"); From 70d254a1fc69d3ad08a82a94c3ec698e1b48a1f0 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 19 Jan 2021 13:39:21 +0200 Subject: [PATCH 147/218] Allow resetting when not in farm mode --- Firmware/Marlin_main.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 07d3516ba..c403ac617 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3918,21 +3918,19 @@ void process_commands() mmu_reset(); } else if (code_seen("RESET")) { // PRUSA RESET - // careful! - if (farm_mode) { #ifdef WATCHDOG #if defined(W25X20CL) && defined(BOOTAPP) - boot_app_magic = BOOT_APP_MAGIC; - boot_app_flags = BOOT_APP_FLG_RUN; + boot_app_magic = BOOT_APP_MAGIC; + boot_app_flags = BOOT_APP_FLG_RUN; #endif //defined(W25X20CL) && defined(BOOTAPP) - softReset(); + softReset(); #else //WATCHDOG + // careful! + if (farm_mode) asm volatile("jmp 0x3E000"); + else + puts_P(PSTR("Not in farm mode.")); #endif //WATCHDOG - } - else { - MYSERIAL.println("Not in farm mode."); - } }else if (code_seen("fv")) { // PRUSA fv // get file version #ifdef SDSUPPORT From 31951fe8c9a74cb348a076dd280618391c353a46 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Wed, 20 Jan 2021 11:46:25 +0100 Subject: [PATCH 148/218] Code refactoring Motivation: - save some RAM joining the autoreport flags into 1 byte - encapsulate the magic of setting bit masks/features into a class with a stable public interface --- Firmware/Marlin_main.cpp | 143 +++++++++++++++++++++++---------------- Firmware/Timer.h | 4 +- 2 files changed, 86 insertions(+), 61 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6cd2f43fb..f96139654 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -390,22 +390,79 @@ static int saved_fanSpeed = 0; //!< Print fan speed static int saved_feedmultiply_mm = 100; -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) -static LongTimer auto_report_timer; //Also used for AUTO_REPORT_TEMPERATURES -static uint8_t auto_report_period = 0; //Also used for AUTO_REPORT_TEMPERATURES -#endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES or AUTO_REPORT_FANS or AUTO_REPORT_POSITION +class AutoReportFeatures { + union { + struct { + uint8_t temp : 1; //Temperature flag + uint8_t fans : 1; //Fans flag + uint8_t pos: 1; //Position flag + uint8_t ar4 : 1; //Unused + uint8_t ar5 : 1; //Unused + uint8_t ar6 : 1; //Unused + uint8_t ar7 : 1; //Unused + } __attribute__((packed)) bits; + uint8_t byte; + } arFunctionsActive; + uint8_t auto_report_period; //Also used for AUTO_REPORT_TEMPERATURES +public: + LongTimer auto_report_timer; //Also used for AUTO_REPORT_TEMPERATURES + AutoReportFeatures():auto_report_period(0){ +#if defined(AUTO_REPORT_ALL) + arFunctionsActive.byte = 0xff; +#else + arFunctionsActive.byte = 0; +# if defined(AUTO_REPORT_TEMPERATURES) + arFunctionsActive.bits.temp = 1; +# endif +# if defined(AUTO_REPORT_FANS) + arFunctionsActive.bits.fans = 1; +# endif +# if defined(AUTO_REPORT_POSITION) + arFunctionsActive.bits.pos = 1; +# endif +#endif + } + + inline bool Temp()const { return arFunctionsActive.bits.temp != 0; } + inline void SetTemp(uint8_t v){ arFunctionsActive.bits.temp = v; } -#if defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_ALL) -static bool auto_report_temp_active = false; -#endif //AUTO_REPORT_TEMPERATURES + inline bool Fans()const { return arFunctionsActive.bits.fans != 0; } + inline void SetFans(uint8_t v){ arFunctionsActive.bits.fans = v; } -#if defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_ALL) -static bool auto_report_fans_active = false; -#endif //AUTO_REPORT_FANS + inline bool Pos()const { return arFunctionsActive.bits.pos != 0; } + inline void SetPos(uint8_t v){ arFunctionsActive.bits.pos = v; } + + inline void SetMask(uint8_t mask){ arFunctionsActive.byte = mask; } + + /// sets the autoreporting timer's period + /// setting it to zero stops the timer + void SetPeriod(uint8_t p){ + auto_report_period = p; + if (auto_report_period != 0){ + auto_report_timer.start(); + } else{ + auto_report_timer.stop(); + } + } + + inline void TimerStart() { auto_report_timer.start(); } + inline bool TimerRunning()const { return auto_report_timer.running(); } + inline bool TimerExpired() { return auto_report_timer.expired(auto_report_period * 1000ul); } +}; -#if defined(AUTO_REPORT_POSITION) || defined(AUTO_REPORT_ALL) -static bool auto_report_position_active = false; -#endif //AUTO_REPORT_POSITION +AutoReportFeatures autoReportFeatures; + +//#if defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_ALL) +//static bool auto_report_temp_active = false; +//#endif //AUTO_REPORT_TEMPERATURES + +//#if defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_ALL) +//static bool auto_report_fans_active = false; +//#endif //AUTO_REPORT_FANS + +//#if defined(AUTO_REPORT_POSITION) || defined(AUTO_REPORT_ALL) +//static bool auto_report_position_active = false; +//#endif //AUTO_REPORT_POSITION //=========================================================================== //=============================Routines====================================== @@ -1744,24 +1801,24 @@ void host_keepalive() { long ms = _millis(); #if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) - if (auto_report_timer.running()) + if ( autoReportFeatures.TimerRunning()) { - if (auto_report_timer.expired(auto_report_period * 1000ul)) + if (autoReportFeatures.TimerExpired()) { - if(auto_report_temp_active){ + if(autoReportFeatures.Temp()){ gcode_M105(active_extruder); } #if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_FANS) && (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) - if(auto_report_fans_active){ + if(autoReportFeatures.Fans()){ gcode_M123(); } #endif //AUTO_REPORT_ALL or AUTO_REPORT_FANS and (FANCHECK and TACH_0 or TACH_1) #if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_POSITION) - if(auto_report_position_active){ + if(autoReportFeatures.Pos()){ gcode_M114(); } #endif //AUTO_REPORT_POSITION or AUTO_REPORT_FANS or AUTO_REPORT_POSITION - auto_report_timer.start(); + autoReportFeatures.TimerStart(); } } #endif //AUTO_REPORT_ALL @@ -6457,7 +6514,7 @@ Sigma_Exit: #### Parameters - `S` - Set autoreporting interval in seconds. 0 to disable. Maximum: 255 - - `C` - Activate auto-report function. Default is temperature. + - `C` - Activate auto-report function (bit mask). Default is temperature. bit 0 = Auto-report temperatures bit 1 = Auto-report fans @@ -6470,49 +6527,17 @@ Sigma_Exit: */ //!@todo update RepRap Gcode wiki //!@todo Should be temperature always? Octoprint doesn't switch to M105 if M155 timer is set - - union { - struct - { - uint8_t ar_temp_active : 1; //Temperature flag - uint8_t ar_fans_active : 1; //Fans flag - uint8_t ar_pos_active : 1; //Position flag - uint8_t ar_4_active : 1; //Unused - uint8_t ar_5_active : 1; //Unused - uint8_t ar_6_active : 1; //Unused - uint8_t ar_7_active : 1; //Unused - } __attribute__((packed)) bits; - uint8_t byte; - } arFunctionsActive; case 155: { - if (code_seen('S')) - { - auto_report_period = code_value_uint8(); - if (auto_report_period != 0){ - auto_report_timer.start(); + if (code_seen('S')){ + autoReportFeatures.SetPeriod( code_value_uint8() ); } - else{ - auto_report_timer.stop(); + if (code_seen('C')){ + autoReportFeatures.SetMask(code_value()); + //arFunctionsActive.bits.ar_temp_active = 1; //auto-report temperatures always on + } else{ + autoReportFeatures.SetMask(1); } - } - if (code_seen('C')) - { - arFunctionsActive.byte = code_value(); - //arFunctionsActive.bits.ar_temp_active = 1; //auto-report temperatures always on - } - else{ - arFunctionsActive.byte = 1; - } -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) - auto_report_temp_active = arFunctionsActive.bits.ar_temp_active; -#endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_FANS) - auto_report_fans_active = arFunctionsActive.bits.ar_fans_active; -#endif //AUTO_REPORT_ALL or AUTO_REPORT_FANS -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_POSITION) - auto_report_position_active = arFunctionsActive.bits.ar_pos_active; - #endif //AUTO_REPORT_ALL or AUTO_REPORT_POSITION } break; #endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES or AUTO_REPORT_FANS or AUTO_REPORT_POSITION diff --git a/Firmware/Timer.h b/Firmware/Timer.h index e2e84eff9..599371b4e 100644 --- a/Firmware/Timer.h +++ b/Firmware/Timer.h @@ -20,10 +20,10 @@ public: Timer(); void start(); void stop(){m_isRunning = false;} - bool running(){return m_isRunning;} + bool running()const {return m_isRunning;} bool expired(T msPeriod); protected: - T started(){return m_started;} + T started()const {return m_started;} private: bool m_isRunning; T m_started; From ced3d9fa77622a0988c15759a085ec0088262988 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 11:13:44 +0200 Subject: [PATCH 149/218] "M20 L" support. Print long filenames --- Firmware/Marlin_main.cpp | 2 +- Firmware/cardreader.cpp | 25 +++++++++++++++++++------ Firmware/cardreader.h | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 3be465912..1a157668c 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5677,7 +5677,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) */ case 20: SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST - card.ls(); + card.ls(code_seen('L')); SERIAL_PROTOCOLLNRPGM(_N("End file list"));////MSG_END_FILE_LIST break; diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 94077f4cd..b8dffb3e3 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -62,9 +62,10 @@ char *createFilename(char *buffer,const dir_t &p) //buffer>12characters /** +* Dive into a folder and recurse depth-first to perform a pre-set operation lsAction: -+* LS_Count - Add +1 to nrFiles for every file within the parent -+* LS_GetFilename - Get the filename of the file indexed by nrFiles -+* LS_SerialPrint - Print the full path and size of each file to serial output ++* LS_Count - Add +1 to nrFiles for every file within the parent ++* LS_GetFilename - Get the filename of the file indexed by nrFiles ++* LS_SerialPrint - Print the full path and size of each file to serial output ++* LS_SerialPrint_LFN - Print the full path, long filename and size of each file to serial output +*/ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const match/*=NULL*/) { @@ -90,9 +91,13 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m // Serial.print(path); // Get a new directory object using the full path // and dive recursively into it. + + if (lsAction == LS_SerialPrint_LFN) + printf_P(PSTR("DIR_ENTER: %s \"%s\"\n"), path, longFilename[0] ? longFilename : lfilename); + SdFile dir; if (!dir.open(parent, lfilename, O_READ)) { - if (lsAction == LS_SerialPrint) { + if (lsAction == LS_SerialPrint || lsAction == LS_SerialPrint_LFN) { //SERIAL_ECHO_START(); //SERIAL_ECHOPGM(_i("Cannot open subdir"));////MSG_SD_CANT_OPEN_SUBDIR //SERIAL_ECHOLN(lfilename); @@ -100,6 +105,9 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m } lsDive(path, dir); // close() is done automatically by destructor of SdFile + + if (lsAction == LS_SerialPrint_LFN) + puts_P(PSTR("DIR_EXIT")); } else { uint8_t pn0 = p.name[0]; @@ -114,11 +122,16 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m nrFiles++; break; + case LS_SerialPrint_LFN: case LS_SerialPrint: createFilename(filename, p); SERIAL_PROTOCOL(prepend); SERIAL_PROTOCOL(filename); MYSERIAL.write(' '); + + if (lsAction == LS_SerialPrint_LFN) + printf_P(PSTR("\"%s\" "), LONGEST_FILENAME); + SERIAL_PROTOCOLLN(p.fileSize); break; @@ -160,9 +173,9 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m } // while readDir } -void CardReader::ls() +void CardReader::ls(bool printLFN) { - lsAction=LS_SerialPrint; + lsAction = printLFN ? LS_SerialPrint_LFN : LS_SerialPrint; //if(lsAction==LS_Count) //nrFiles=0; diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index 12e83d969..25e97882e 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -6,7 +6,7 @@ #define MAX_DIR_DEPTH 10 #include "SdFile.h" -enum LsAction {LS_SerialPrint,LS_Count,LS_GetFilename}; +enum LsAction {LS_SerialPrint,LS_SerialPrint_LFN,LS_Count,LS_GetFilename}; class CardReader { public: @@ -38,7 +38,7 @@ public: uint16_t getWorkDirDepth(); - void ls(); + void ls(bool printLFN); void chdir(const char * relpath); void updir(); void setroot(); From ede3f3405183d284f618bc045b0d35573d9761e3 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 22 Jan 2021 10:40:29 +0100 Subject: [PATCH 150/218] Documentation --- Firmware/Marlin_main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f96139654..25cd5ebca 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6534,9 +6534,8 @@ Sigma_Exit: } if (code_seen('C')){ autoReportFeatures.SetMask(code_value()); - //arFunctionsActive.bits.ar_temp_active = 1; //auto-report temperatures always on } else{ - autoReportFeatures.SetMask(1); + autoReportFeatures.SetMask(1); //Backwards compability to host systems like Octoprint to send only temp if paramerter `C`isn't used } } break; From 008c6a2590312a986934cfcb04af8e7dde312945 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 22 Jan 2021 12:26:29 +0100 Subject: [PATCH 151/218] Remove defines --- Firmware/Configuration_adv.h | 19 +---------- Firmware/Marlin_main.cpp | 62 +++++++++++------------------------- 2 files changed, 20 insertions(+), 61 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index 9f2ee64a4..7a9a4929a 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -74,24 +74,7 @@ * bit 6 = free * bit 7 = free */ -#define AUTO_REPORT_ALL - -#ifndef AUTO_REPORT_ALL -/** - * Auto-report temperatures with M155 S [C1] - */ -#define AUTO_REPORT_TEMPERATURES - -/** - * Auto-report fans with M155 S C2 - */ -#define AUTO_REPORT_FANS - -/** - * Auto-report position with M155 S C4 - */ -#define AUTO_REPORT_POSITION -#endif //NOT AUTO_REPORT_ALL +#define AUTO_REPORT //=========================================================================== //=============================Mechanical Settings=========================== diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 25cd5ebca..164804389 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -403,24 +403,15 @@ class AutoReportFeatures { } __attribute__((packed)) bits; uint8_t byte; } arFunctionsActive; - uint8_t auto_report_period; //Also used for AUTO_REPORT_TEMPERATURES + uint8_t auto_report_period; public: - LongTimer auto_report_timer; //Also used for AUTO_REPORT_TEMPERATURES + LongTimer auto_report_timer; AutoReportFeatures():auto_report_period(0){ -#if defined(AUTO_REPORT_ALL) +#if defined(AUTO_REPORT) arFunctionsActive.byte = 0xff; #else arFunctionsActive.byte = 0; -# if defined(AUTO_REPORT_TEMPERATURES) - arFunctionsActive.bits.temp = 1; -# endif -# if defined(AUTO_REPORT_FANS) - arFunctionsActive.bits.fans = 1; -# endif -# if defined(AUTO_REPORT_POSITION) - arFunctionsActive.bits.pos = 1; -# endif -#endif +#endif //AUTO_REPORT } inline bool Temp()const { return arFunctionsActive.bits.temp != 0; } @@ -452,18 +443,6 @@ public: AutoReportFeatures autoReportFeatures; -//#if defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_ALL) -//static bool auto_report_temp_active = false; -//#endif //AUTO_REPORT_TEMPERATURES - -//#if defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_ALL) -//static bool auto_report_fans_active = false; -//#endif //AUTO_REPORT_FANS - -//#if defined(AUTO_REPORT_POSITION) || defined(AUTO_REPORT_ALL) -//static bool auto_report_position_active = false; -//#endif //AUTO_REPORT_POSITION - //=========================================================================== //=============================Routines====================================== //=========================================================================== @@ -1800,28 +1779,25 @@ void host_keepalive() { if (farm_mode) return; long ms = _millis(); -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) - if ( autoReportFeatures.TimerRunning()) +#if defined(AUTO_REPORT) { if (autoReportFeatures.TimerExpired()) { if(autoReportFeatures.Temp()){ gcode_M105(active_extruder); } -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_FANS) && (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) - if(autoReportFeatures.Fans()){ - gcode_M123(); - } -#endif //AUTO_REPORT_ALL or AUTO_REPORT_FANS and (FANCHECK and TACH_0 or TACH_1) -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_POSITION) if(autoReportFeatures.Pos()){ gcode_M114(); } -#endif //AUTO_REPORT_POSITION or AUTO_REPORT_FANS or AUTO_REPORT_POSITION - autoReportFeatures.TimerStart(); + #if defined(AUTO_REPORT) && (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) + if(autoReportFeatures.Fans()){ + gcode_M123(); + } +#endif //AUTO_REPORT and (FANCHECK and TACH_0 or TACH_1) + autoReportFeatures.TimerStart(); } } -#endif //AUTO_REPORT_ALL +#endif //AUTO_REPORT if (host_keepalive_interval && busy_state != NOT_BUSY) { @@ -3606,14 +3582,14 @@ static void cap_line(const char* name, bool ena = false) { static void extended_capabilities_report() { // AUTOREPORT_TEMP (M155) - cap_line(PSTR("AUTOREPORT_TEMP"), (ENABLED(AUTO_REPORT_TEMPERATURES)) || ENABLED(AUTO_REPORT_ALL)); + cap_line(PSTR("AUTOREPORT_TEMP"), ENABLED(AUTO_REPORT)); #if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) // AUTOREPORT_FANS (M123) - cap_line(PSTR("AUTOREPORT_FANS"), (ENABLED(AUTO_REPORT_FANS) || ENABLED(AUTO_REPORT_ALL))); + cap_line(PSTR("AUTOREPORT_FANS"), ENABLED(AUTO_REPORT)); #endif //FANCHECK and TACH_0 or TACH_1 // AUTOREPORT_POSITION (M114) - cap_line(PSTR("AUTOREPORT_POSITION"), (ENABLED(AUTO_REPORT_POSITION) || ENABLED(AUTO_REPORT_ALL))); - //@todo + cap_line(PSTR("AUTOREPORT_POSITION"), ENABLED(AUTO_REPORT)); + //@todo Update RepRap cap } #endif //EXTENDED_CAPABILITIES_REPORT @@ -6504,7 +6480,7 @@ Sigma_Exit: break; } -#if defined(AUTO_REPORT_ALL) || defined(AUTO_REPORT_TEMPERATURES) || defined(AUTO_REPORT_FANS) || defined(AUTO_REPORT_POSITION) +#if defined(AUTO_REPORT) /*! ### M155 - Automatically send status M155: Automatically send temperatures #### Usage @@ -6535,11 +6511,11 @@ Sigma_Exit: if (code_seen('C')){ autoReportFeatures.SetMask(code_value()); } else{ - autoReportFeatures.SetMask(1); //Backwards compability to host systems like Octoprint to send only temp if paramerter `C`isn't used + autoReportFeatures.SetMask(1); //Backwards compability to host systems like Octoprint to send only temp if paramerter `C`isn't used. } } break; -#endif //AUTO_REPORT_ALL or AUTO_REPORT_TEMPERATURES or AUTO_REPORT_FANS or AUTO_REPORT_POSITION +#endif //AUTO_REPORT /*! ### M109 - Wait for extruder temperature M109: Set Extruder Temperature and Wait From 9fda6b774d69c31becb560f0d324c38741f79f95 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 17:58:01 +0200 Subject: [PATCH 152/218] Do not send CR on the serial line --- Firmware/MarlinSerial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/MarlinSerial.cpp b/Firmware/MarlinSerial.cpp index d3ffdfbee..2210eac7f 100644 --- a/Firmware/MarlinSerial.cpp +++ b/Firmware/MarlinSerial.cpp @@ -255,7 +255,7 @@ void MarlinSerial::print(double n, int digits) void MarlinSerial::println(void) { - print('\r'); + // print('\r'); print('\n'); } From c710253cca696b968b9be9d0cf1215972f570b91 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 17:11:51 +0100 Subject: [PATCH 153/218] Code cleanup and size reduction and RAM optimization Replase single character strings with single characters when calling lcd_print --- Firmware/Dcodes.cpp | 2 +- Firmware/MarlinSerial.cpp | 2 +- Firmware/mmu.cpp | 16 ++-- Firmware/ultralcd.cpp | 170 +++++++++++++++++++------------------- 4 files changed, 95 insertions(+), 95 deletions(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index c77cd96e1..f047fdb9d 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -204,7 +204,7 @@ extern float axis_steps_per_unit[NUM_AXIS]; */ void dcode__1() { - printf_P(PSTR("D-1 - Endless loop\n")); + DBG(_N("D-1 - Endless loop\n")); // cli(); while (1); } diff --git a/Firmware/MarlinSerial.cpp b/Firmware/MarlinSerial.cpp index d3ffdfbee..02c8b1296 100644 --- a/Firmware/MarlinSerial.cpp +++ b/Firmware/MarlinSerial.cpp @@ -359,7 +359,7 @@ void MarlinSerial::printFloat(double number, uint8_t digits) // Print the decimal point, but only if there are digits beyond if (digits > 0) - print("."); + print('.'); // Extract digits from the remainder one at a time while (digits-- > 0) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 18b5d5e79..e992c7190 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -879,7 +879,7 @@ void mmu_M600_load_filament(bool automatic, float nozzle_temp) lcd_update_enable(false); lcd_clear(); lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); - lcd_print(" "); + lcd_print(' '); lcd_print(tmp_extruder + 1); snmm_filaments_used |= (1 << tmp_extruder); //for stop print @@ -994,7 +994,7 @@ void extr_adj(uint8_t extruder) //loading filament for SNMM lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); //if(strlen(_T(MSG_LOADING_FILAMENT))>18) lcd.setCursor(0, 1); //else lcd.print(" "); - lcd_print(" "); + lcd_print(' '); lcd_print(extruder + 1); // get response @@ -1034,7 +1034,7 @@ void extr_adj(uint8_t extruder) //loading filament for SNMM lcd_clear(); lcd_set_cursor(0, 0); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); if(strlen(_T(MSG_LOADING_FILAMENT))>18) lcd_set_cursor(0, 1); - else lcd_print(" "); + else lcd_print(' '); lcd_print(mmu_extruder + 1); lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PLEASE_WAIT)); st_synchronize(); @@ -1082,8 +1082,8 @@ void extr_unload_view() { lcd_clear(); lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_UNLOADING_FILAMENT)); - lcd_print(" "); - if (mmu_extruder == MMU_FILAMENT_UNKNOWN) lcd_print(" "); + lcd_print(' '); + if (mmu_extruder == MMU_FILAMENT_UNKNOWN) lcd_print(' '); else lcd_print(mmu_extruder + 1); } @@ -1115,7 +1115,7 @@ void extr_unload() lcd_display_message_fullscreen_P(PSTR("")); max_feedrate[E_AXIS] = 50; lcd_set_cursor(0, 0); lcd_puts_P(_T(MSG_UNLOADING_FILAMENT)); - lcd_print(" "); + lcd_print(' '); lcd_print(mmu_extruder + 1); lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PLEASE_WAIT)); if (current_position[Z_AXIS] < 15) { @@ -1351,7 +1351,7 @@ void lcd_mmu_load_to_nozzle(uint8_t filament_nr) lcd_clear(); lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); - lcd_print(" "); + lcd_print(' '); lcd_print(tmp_extruder + 1); mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); @@ -1385,7 +1385,7 @@ void mmu_cut_filament(uint8_t filament_nr) LcdUpdateDisabler disableLcdUpdate; lcd_clear(); lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18 - lcd_print(" "); + lcd_print(' '); lcd_print(filament_nr + 1); mmu_filament_ramming(); mmu_command(MmuCmd::K0 + filament_nr); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0cd6fa97e..b144a6f6a 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -689,7 +689,7 @@ void lcdui_print_farm(void) lcd_puts_P(PSTR("L")); }else{ - lcd_puts_P(PSTR(" ")); + lcd_print(' '); } } @@ -700,7 +700,7 @@ void lcdui_print_farm(void) #else lcd_set_cursor(LCD_WIDTH - 8 - 2, 2); - lcd_puts_P(PSTR(" ")); + lcd_print(' '); #endif } */ @@ -713,7 +713,7 @@ void lcdui_print_cmd_diag(void) lcd_set_cursor(LCD_WIDTH - 8 -1, 2); lcd_puts_P(PSTR(" C")); lcd_print(buflen); // number of commands in cmd buffer - if (buflen < 9) lcd_puts_P(" "); + if (buflen < 9) lcd_print(' '); } #endif //CMD_DIAGNOSTICS @@ -2640,7 +2640,7 @@ static void lcd_loading_progress_bar(uint16_t loading_time_ms) { for (uint_least8_t i = 0; i < 20; i++) { lcd_set_cursor(i, 3); - lcd_print("."); + lcd_print('.'); //loading_time_ms/20 delay for (uint_least8_t j = 0; j < 5; j++) { delay_keep_alive(loading_time_ms / 100); @@ -2677,7 +2677,7 @@ void lcd_loading_filament() { for (int i = 0; i < 20; i++) { lcd_set_cursor(i, 3); - lcd_print("."); + lcd_print('.'); for (int j = 0; j < 10 ; j++) { manage_heater(); manage_inactivity(true); @@ -2725,7 +2725,7 @@ void lcd_alright() { lcd_set_cursor(0, 1); - lcd_print(">"); + lcd_print('>'); enc_dif = lcd_encoder_diff; @@ -2756,13 +2756,13 @@ void lcd_alright() { Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); enc_dif = lcd_encoder_diff; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); _delay(100); @@ -3332,7 +3332,7 @@ void lcd_adjust_z() { lcd_set_cursor(0, 1); - lcd_print(">"); + lcd_print('>'); enc_dif = lcd_encoder_diff; @@ -3361,11 +3361,11 @@ void lcd_adjust_z() { cursor_pos = 1; } lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); enc_dif = lcd_encoder_diff; _delay(100); } @@ -3411,7 +3411,7 @@ bool lcd_wait_for_pinda(float temp) { lcd_set_cursor(0, 4); lcd_print(LCD_STR_THERMOMETER[0]); lcd_print(ftostr3(current_temperature_pinda)); - lcd_print("/"); + lcd_print('/'); lcd_print(ftostr3(temp)); lcd_print(LCD_STR_DEGREE); delay_keep_alive(1000); @@ -3433,7 +3433,7 @@ void lcd_wait_for_heater() { lcd_set_cursor(0, 4); lcd_print(LCD_STR_THERMOMETER[0]); lcd_print(ftostr3(degHotend(active_extruder))); - lcd_print("/"); + lcd_print('/'); lcd_print(ftostr3(degTargetHotend(active_extruder))); lcd_print(LCD_STR_DEGREE); } @@ -3752,16 +3752,16 @@ int8_t lcd_show_multiscreen_message_two_choices_and_wait_P(const char *msg, bool if (msg_next == NULL) { lcd_set_cursor(0, 3); if (enc_dif < lcd_encoder_diff && yes) { - lcd_puts_P((PSTR(" "))); + lcd_print(' '); lcd_set_cursor(7, 3); - lcd_puts_P((PSTR(">"))); + lcd_print('>'); yes = false; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else if (enc_dif > lcd_encoder_diff && !yes) { - lcd_puts_P((PSTR(">"))); + lcd_print('>'); lcd_set_cursor(7, 3); - lcd_puts_P((PSTR(" "))); + lcd_print(' '); yes = true; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } @@ -3790,11 +3790,11 @@ int8_t lcd_show_multiscreen_message_two_choices_and_wait_P(const char *msg, bool } if (msg_next == NULL) { lcd_set_cursor(0, 3); - if (yes) lcd_puts_P(PSTR(">")); + if (yes) lcd_print('>'); lcd_set_cursor(1, 3); lcd_puts_P(first_choice); lcd_set_cursor(7, 3); - if (!yes) lcd_puts_P(PSTR(">")); + if (!yes) lcd_print('>'); lcd_set_cursor(8, 3); lcd_puts_P(second_choice); } @@ -3815,7 +3815,7 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow if (default_yes) { lcd_set_cursor(0, 2); - lcd_puts_P(PSTR(">")); + lcd_print('>'); lcd_puts_P(_T(MSG_YES)); lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_NO)); @@ -3824,7 +3824,7 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_YES)); lcd_set_cursor(0, 3); - lcd_puts_P(PSTR(">")); + lcd_print('>'); lcd_puts_P(_T(MSG_NO)); } int8_t retval = default_yes ? true : false; @@ -3845,17 +3845,17 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow if (abs(enc_dif - lcd_encoder_diff) > 4) { lcd_set_cursor(0, 2); if (enc_dif < lcd_encoder_diff && retval) { - lcd_puts_P((PSTR(" "))); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_puts_P((PSTR(">"))); + lcd_print('>'); retval = 0; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else if (enc_dif > lcd_encoder_diff && !retval) { - lcd_puts_P((PSTR(">"))); + lcd_print('>'); lcd_set_cursor(0, 3); - lcd_puts_P((PSTR(" "))); + lcd_print(' '); retval = 1; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } @@ -4281,23 +4281,23 @@ void lcd_pick_babystep(){ lcd_set_cursor(3, 2); - lcd_print("1"); + lcd_print('1'); lcd_set_cursor(3, 3); - lcd_print("2"); + lcd_print('2'); lcd_set_cursor(12, 2); - lcd_print("3"); + lcd_print('3'); lcd_set_cursor(12, 3); - lcd_print("4"); + lcd_print('4'); lcd_set_cursor(1, 2); - lcd_print(">"); + lcd_print('>'); enc_dif = lcd_encoder_diff; @@ -4328,20 +4328,20 @@ void lcd_pick_babystep(){ lcd_set_cursor(1, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(1, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(10, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(10, 3); - lcd_print(" "); + lcd_print(' '); if (cursor_pos < 3) { lcd_set_cursor(1, cursor_pos+1); - lcd_print(">"); + lcd_print('>'); }else{ lcd_set_cursor(10, cursor_pos-1); - lcd_print(">"); + lcd_print('>'); } @@ -5938,7 +5938,7 @@ void bowden_menu() { int cursor_pos = 0; lcd_clear(); lcd_set_cursor(0, 0); - lcd_print(">"); + lcd_print('>'); for (uint_least8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print("Extruder "); @@ -5976,15 +5976,15 @@ void bowden_menu() { } lcd_set_cursor(0, 0); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); @@ -6029,7 +6029,7 @@ void bowden_menu() { lcd_clear(); enc_dif = lcd_encoder_diff; lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); for (uint_least8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print("Extruder "); @@ -6052,8 +6052,8 @@ void bowden_menu() { static char snmm_stop_print_menu() { //menu for choosing which filaments will be unloaded in stop print lcd_clear(); - lcd_puts_at_P(0,0,_T(MSG_UNLOAD_FILAMENT)); lcd_print(":"); - lcd_set_cursor(0, 1); lcd_print(">"); + lcd_puts_at_P(0,0,_T(MSG_UNLOAD_FILAMENT)); lcd_print(':'); + lcd_set_cursor(0, 1); lcd_print('>'); lcd_puts_at_P(1,2,_i("Used during print"));////MSG_USED c=19 r=1 lcd_puts_at_P(1,3,_i("Current"));////MSG_CURRENT c=19 r=1 char cursor_pos = 1; @@ -6078,13 +6078,13 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be } lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); enc_dif = lcd_encoder_diff; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); _delay(100); @@ -6188,13 +6188,13 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (last_item&&last_visible) lcd_puts_at_P(1, 3, last_item); lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); _delay(100); if (lcd_clicked()) @@ -6229,7 +6229,7 @@ char reset_menu() { enc_dif = lcd_encoder_diff; lcd_clear(); lcd_set_cursor(0, 0); - lcd_print(">"); + lcd_print('>'); lcd_consume_click(); while (1) { @@ -6270,15 +6270,15 @@ char reset_menu() { } } lcd_set_cursor(0, 0); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); @@ -6513,8 +6513,8 @@ static void lcd_farm_no() } lcd_set_cursor(0, 2); - if (_farmno < 100) lcd_print("0"); - if (_farmno < 10) lcd_print("0"); + if (_farmno < 100) lcd_print('0'); + if (_farmno < 10) lcd_print('0'); lcd_print(_farmno); lcd_print(" "); lcd_set_cursor(0, 3); @@ -6522,7 +6522,7 @@ static void lcd_farm_no() lcd_set_cursor(step, 3); - lcd_print("^"); + lcd_print('^'); _delay(100); if (lcd_clicked()) @@ -6560,7 +6560,7 @@ unsigned char lcd_choose_color() { enc_dif = lcd_encoder_diff; lcd_clear(); lcd_set_cursor(0, 1); - lcd_print(">"); + lcd_print('>'); active_rows = items_no < 3 ? items_no : 3; lcd_consume_click(); @@ -6602,13 +6602,13 @@ unsigned char lcd_choose_color() { } } lcd_set_cursor(0, 1); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 2); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, 3); - lcd_print(" "); + lcd_print(' '); lcd_set_cursor(0, cursor_pos); - lcd_print(">"); + lcd_print('>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); @@ -6665,7 +6665,7 @@ void lcd_confirm_print() lcd_set_cursor(2, 3); lcd_puts_P(_T(MSG_NO)); lcd_set_cursor(0, 1 + cursor_pos); - lcd_print(">"); + lcd_print('>'); _delay(100); _t = _t + 1; @@ -7445,14 +7445,14 @@ void lcd_sdcard_stop() lcd_puts_P(_T(MSG_NO)); lcd_set_cursor(2, 3); lcd_puts_P(_T(MSG_YES)); - lcd_set_cursor(0, 2); lcd_print(" "); - lcd_set_cursor(0, 3); lcd_print(" "); + lcd_set_cursor(0, 2); lcd_print(' '); + lcd_set_cursor(0, 3); lcd_print(' '); if ((int32_t)lcd_encoder > 2) { lcd_encoder = 2; } if ((int32_t)lcd_encoder < 1) { lcd_encoder = 1; } lcd_set_cursor(0, 1 + lcd_encoder); - lcd_print(">"); + lcd_print('>'); if (lcd_clicked()) { @@ -8560,7 +8560,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, _delay(500); lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_SELFTEST_FAN_YES)); - lcd_set_cursor(0, 3); lcd_print(">"); + lcd_set_cursor(0, 3); lcd_print('>'); lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); int8_t enc_dif = int(_default)*3; @@ -8573,17 +8573,17 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, if (abs((enc_dif - lcd_encoder_diff)) > 2) { if (enc_dif > lcd_encoder_diff) { _result = !check_opposite; - lcd_set_cursor(0, 2); lcd_print(">"); + lcd_set_cursor(0, 2); lcd_print('>'); lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_SELFTEST_FAN_YES)); - lcd_set_cursor(0, 3); lcd_print(" "); + lcd_set_cursor(0, 3); lcd_print(' '); lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); } if (enc_dif < lcd_encoder_diff) { _result = check_opposite; - lcd_set_cursor(0, 2); lcd_print(" "); + lcd_set_cursor(0, 2); lcd_print(' '); lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_SELFTEST_FAN_YES)); - lcd_set_cursor(0, 3); lcd_print(">"); + lcd_set_cursor(0, 3); lcd_print('>'); lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); } enc_dif = 0; @@ -8652,10 +8652,10 @@ static FanCheck lcd_selftest_fan_auto(int _fan) for (uint8_t i = 0; i < 5; i++) { delay_keep_alive(1000); lcd_set_cursor(18, 3); - lcd_print("-"); + lcd_print('-'); delay_keep_alive(1000); lcd_set_cursor(18, 3); - lcd_print("|"); + lcd_print('|'); } fanSpeed = 0; @@ -8679,10 +8679,10 @@ static FanCheck lcd_selftest_fan_auto(int _fan) for (uint8_t i = 0; i < 5; i++) { delay_keep_alive(1000); lcd_set_cursor(18, 3); - lcd_print("-"); + lcd_print('-'); delay_keep_alive(1000); lcd_set_cursor(18, 3); - lcd_print("|"); + lcd_print('|'); } fanSpeed = 0; @@ -8786,14 +8786,14 @@ static void lcd_selftest_screen_step(int _row, int _col, int _state, const char case 1: lcd_print(_name); lcd_set_cursor(_col + strlen(_name), _row); - lcd_print(":"); + lcd_print(':'); lcd_set_cursor(_col + strlen(_name) + 1, _row); lcd_print(_indicator); break; case 2: lcd_print(_name); lcd_set_cursor(_col + strlen(_name), _row); - lcd_print(":"); + lcd_print(':'); lcd_set_cursor(_col + strlen(_name) + 1, _row); lcd_print("OK"); break; From 4dec171266a255e73f1143af652fa2bee3c59730 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 17:13:28 +0100 Subject: [PATCH 154/218] Reduce code by 104 bytes in xyzcal.cpp Extract CLAMP_median into a non-inline function. The extra instructions to call that function do not matter from the speed perspective --- Firmware/xyzcal.cpp | 50 +++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index aed790739..1c397e141 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -18,6 +18,8 @@ #define _PINDA ((READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)?1:0) +static const char endl[2] PROGMEM = "\n"; + #define DBG(args...) printf_P(args) //#define DBG(args...) #ifndef _n @@ -275,6 +277,7 @@ bool xyzcal_spiral2(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi ad = 0; if (pad) ad = *pad % 720; + //@size=214 DBG(_n("xyzcal_spiral2 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad); // lcd_set_cursor(0, 4); // char text[10]; @@ -318,6 +321,7 @@ bool xyzcal_spiral8(int16_t cx, int16_t cy, int16_t z0, int16_t dz, int16_t radi bool ret = false; uint16_t ad = 0; if (pad) ad = *pad; + //@size=274 DBG(_n("xyzcal_spiral8 cx=%d cy=%d z0=%d dz=%d radius=%d ad=%d\n"), cx, cy, z0, dz, radius, ad); if (!ret && (ad < 720)) if ((ret = xyzcal_spiral2(cx, cy, z0 - 0*dz, dz, radius, 0, delay_us, check_pinda, &ad)) != 0) @@ -401,6 +405,7 @@ void print_hysteresis(int16_t min_z, int16_t max_z, int16_t step){ trigger = _Z; //xyzcal_lineXYZ_to(_X, _Y, min_z, delay_us, 0); + //@size=114 DBG(_n("min, trigger, untrigger, max: [%d %d %d %d]\n"), _Z, trigger, untrigger, z); } } @@ -559,6 +564,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ go_manhattan((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, Z_ACCEL, Z_MIN_DELAY); xyzcal_lineXYZ_to((d & 1) ? (cx + 992) : (cx - 992), cy - 992 + r * 64, _Z, delay_us, 0); sm4_set_dir(X_AXIS, d); + //@size=242 DBG(_n("%d\n"), 64 - (r * 2 + d)); ///< to keep OctoPrint connection alive for (uint8_t c = 0; c < 32; c++){ ///< X axis @@ -635,7 +641,7 @@ void xyzcal_scan_pixels_32x32_Zhop(int16_t cx, int16_t cy, int16_t min_z, int16_ } } } - DBG(_n("\n")); + DBG(endl); } /// Returns rate of match @@ -682,6 +688,7 @@ uint8_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, u } // DBG(_n("\n")); } + //@size=278 DBG(_n("Pattern center [%f %f], match %f%%\n"), max_c + 5.5f, max_r + 5.5f, max_match / 1.32f); *pc = max_c; @@ -694,6 +701,7 @@ const uint16_t xyzcal_point_pattern_08[12] PROGMEM = {0x000, 0x000, 0x0f0, 0x1f8 bool xyzcal_searchZ(void) { + //@size=118 DBG(_n("xyzcal_searchZ x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); int16_t x0 = _X; int16_t y0 = _Y; @@ -709,11 +717,13 @@ bool xyzcal_searchZ(void) int16_t x_on = _X; int16_t y_on = _Y; int16_t z_on = _Z; - DBG(_n(" ON-SIGNAL at x=%d y=%d z=%d ad=%d\n"), x_on, y_on, z_on, ad); + //@size=82 + DBG(_n(" ON-SIGNAL at x=%d y=%d z=%d ad=%d\n"), x_on, y_on, z_on, ad); return true; } z -= 400; } + //@size=138 DBG(_n("xyzcal_searchZ no signal\n x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); return false; } @@ -805,6 +815,11 @@ float median(float *points, const uint8_t num_points){ return points[num_points / 2]; } +float __attribute__ ((noinline)) CLAMP_median(float *shifts, uint8_t blocks, float norm){ + const constexpr float max_change = 0.5f; ///< avoids too fast changes (avoid oscillation) + return CLAMP( median(shifts, blocks) * norm, -max_change, max_change); +} + /// Searches for circle iteratively /// Uses points on the perimeter. If point is high it pushes circle out of the center (shift or change of radius), /// otherwise to the center. @@ -814,7 +829,6 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t const constexpr uint8_t num_points = 33; const float pi_2_div_num_points = 2 * M_PI / num_points; const constexpr uint8_t target_z = 32; ///< target z height of the circle - float max_change = 0.5f; ///< avoids too fast changes (avoid oscillation) const uint8_t blocks = num_points; float shifts_x[blocks]; float shifts_y[blocks]; @@ -824,6 +838,7 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t for (int8_t i = iterations; i > 0; --i){ + //@size=128B DBG(_n(" [%f, %f][%f] circle\n"), x, y, r); /// read points on the circle @@ -840,26 +855,31 @@ void dynamic_circle(uint8_t *matrix_32x32, float &x, float &y, float &r, uint8_t const float reducer = 32.f; ///< reduces speed of convergency to avoid oscillation const float norm = 1.f / reducer; - x += CLAMP(median(shifts_x, blocks) * norm, -max_change, max_change); - y += CLAMP(median(shifts_y, blocks) * norm, -max_change, max_change); - r += CLAMP(median(shifts_r, blocks) * norm * .5f, -max_change, max_change); +// x += CLAMP(median(shifts_x, blocks) * norm, -max_change, max_change); +// y += CLAMP(median(shifts_y, blocks) * norm, -max_change, max_change); +// r += CLAMP(median(shifts_r, blocks) * norm * .5f, -max_change, max_change); + //104B down + x += CLAMP_median(shifts_x, blocks, norm); + y += CLAMP_median(shifts_y, blocks, norm); + r += CLAMP_median(shifts_r, blocks, norm * .5f); r = MAX(2, r); } + //@size=118 DBG(_n(" [%f, %f][%f] final circle\n"), x, y, r); } /// Prints matrix in hex to debug output (serial line) -void print_image(uint8_t *matrix_32x32){ +void print_image(const uint8_t *matrix_32x32){ for (uint8_t y = 0; y < 32; ++y){ const uint16_t idx_y = y * 32; for (uint8_t x = 0; x < 32; ++x){ DBG(_n("%02x"), matrix_32x32[idx_y + x]); } - DBG(_n("\n")); + DBG(endl); } - DBG(_n("\n")); + DBG(endl); } /// Takes two patterns and searches them in matrix32 @@ -889,6 +909,7 @@ uint8_t find_patterns(uint8_t *matrix32, uint16_t *pattern08, uint16_t *pattern1 /// scans area around the current head location and /// searches for the center of the calibration pin bool xyzcal_scan_and_process(void){ + //@size=44 DBG(_n("sizeof(block_buffer)=%d\n"), sizeof(block_t)*BLOCK_BUFFER_SIZE); bool ret = false; int16_t x = _X; @@ -918,10 +939,11 @@ bool xyzcal_scan_and_process(void){ float xf = uc + 5.5f; float yf = ur + 5.5f; float radius = 4.5f; ///< default radius - const uint8_t iterations = 20; + constexpr const uint8_t iterations = 20; dynamic_circle(matrix32, xf, yf, radius, iterations); if (fabs(xf - (uc + 5.5f)) > 3 || fabs(yf - (ur + 5.5f)) > 3 || fabs(radius - 5) > 3){ - DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); + //@size=88 + DBG(_n(" [%f %f][%f] mm divergence\n"), xf - (uc + 5.5f), yf - (ur + 5.5f), radius - 5); /// dynamic algorithm diverged, use original position instead xf = uc + 5.5f; yf = ur + 5.5f; @@ -930,7 +952,8 @@ bool xyzcal_scan_and_process(void){ /// move to the center of area and convert to position xf = (float)x + (xf - 15.5f) * 64; yf = (float)y + (yf - 15.5f) * 64; - DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); + //@size=114 + DBG(_n(" [%f %f] mm pattern center\n"), pos_2_mm(xf), pos_2_mm(yf)); x = round_to_i16(xf); y = round_to_i16(yf); xyzcal_lineXYZ_to(x, y, z, 200, 0); @@ -946,7 +969,8 @@ bool xyzcal_scan_and_process(void){ bool xyzcal_find_bed_induction_sensor_point_xy(void){ bool ret = false; - DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); + //@size=258 + DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); st_synchronize(); pos_i16_t x = _X; pos_i16_t y = _Y; From 3dc85b319c1c6c7958c97a248135b7674710e805 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 17:15:36 +0100 Subject: [PATCH 155/218] Marlin_main.cpp hacks - code_seen("string") -> code_seen_P(PSTR("string")) saved >100B of RAM! - serial print "." -> '.' saved some code - extract commonly used string - SERIAL_PROTOCOLLN("") -> SERIAL_PROTOCOLLN() as no argument is necessary --- Firmware/Marlin_main.cpp | 146 ++++++++++++++++++++------------------- Firmware/cmdqueue.h | 2 +- 2 files changed, 75 insertions(+), 73 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4d2a4e20d..25767a4f0 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -308,6 +308,7 @@ uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; const char errormagic[] PROGMEM = "Error:"; const char echomagic[] PROGMEM = "echo:"; +const char G28W0[] PROGMEM = "G28 W0"; bool no_response = false; uint8_t important_status; @@ -2185,7 +2186,7 @@ bool check_commands() { while (buflen) { - if ((code_seen("M84")) || (code_seen("M 84"))) end_command_found = true; + if ((code_seen_P(PSTR("M84"))) || (code_seen_P(PSTR("M 84")))) end_command_found = true; if (!cmdbuffer_front_already_processed) cmdqueue_pop_front(); cmdbuffer_front_already_processed = false; @@ -2689,7 +2690,7 @@ void gcode_M105(uint8_t extruder) } } #endif - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } #ifdef TMC2130 @@ -3222,7 +3223,7 @@ void gcode_M114() SERIAL_PROTOCOLPGM(" E:"); SERIAL_PROTOCOL(float(st_get_position(E_AXIS)) / cs.axis_steps_per_unit[E_AXIS]); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } #if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) @@ -3807,7 +3808,7 @@ void process_commands() - TMC_SET_STEP - TMC_SET_CHOP */ - if (code_seen("M117")) { //moved to highest priority place to be able to to print strings which includes "G", "PRUSA" and "^" + if (code_seen_P(PSTR("M117"))) { //moved to highest priority place to be able to to print strings which includes "G", "PRUSA" and "^" starpos = (strchr(strchr_pointer + 5, '*')); if (starpos != NULL) *(starpos) = '\0'; @@ -3820,7 +3821,7 @@ void process_commands() // ### CRASH_DETECTED - TMC2130 // --------------------------------- - if(code_seen("CRASH_DETECTED")) + if(code_seen_P(PSTR("CRASH_DETECTED"))) { uint8_t mask = 0; if (code_seen('X')) mask |= X_AXIS_MASK; @@ -3830,12 +3831,12 @@ void process_commands() // ### CRASH_RECOVER - TMC2130 // ---------------------------------- - else if(code_seen("CRASH_RECOVER")) + else if(code_seen_P(PSTR("CRASH_RECOVER"))) crashdet_recover(); // ### CRASH_CANCEL - TMC2130 // ---------------------------------- - else if(code_seen("CRASH_CANCEL")) + else if(code_seen_P(PSTR("CRASH_CANCEL"))) crashdet_cancel(); } else if (strncmp_P(CMDBUFFER_CURRENT_STRING, PSTR("TMC_"), 4) == 0) @@ -3921,7 +3922,7 @@ void process_commands() } #endif //BACKLASH_Y #endif //TMC2130 - else if(code_seen("PRUSA")){ + else if(code_seen_P(PSTR("PRUSA"))){ /*! --------------------------------------------------------------------------------- ### PRUSA - Internal command set G98: Activate farm mode - Notes @@ -3954,20 +3955,20 @@ void process_commands() */ - if (code_seen("Ping")) { // PRUSA Ping + if (code_seen_P(PSTR("Ping"))) { // PRUSA Ping if (farm_mode) { PingTime = _millis(); //MYSERIAL.print(farm_no); MYSERIAL.println(": OK"); } } - else if (code_seen("PRN")) { // PRUSA PRN + else if (code_seen_P(PSTR("PRN"))) { // PRUSA PRN printf_P(_N("%d"), status_number); - } else if( code_seen("FANPINTST") ){ + } else if( code_seen_P(PSTR("FANPINTST"))){ gcode_PRUSA_BadRAMBoFanTest(); - }else if (code_seen("FAN")) { // PRUSA FAN + }else if (code_seen_P(PSTR("FAN"))) { // PRUSA FAN printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]); - }else if (code_seen("fn")) { // PRUSA fn + }else if (code_seen_P(PSTR("fn"))) { // PRUSA fn if (farm_mode) { printf_P(_N("%d"), farm_no); } @@ -3976,20 +3977,20 @@ void process_commands() } } - else if (code_seen("thx")) // PRUSA thx + else if (code_seen_P(PSTR("thx"))) // PRUSA thx { no_response = false; } - else if (code_seen("uvlo")) // PRUSA uvlo + else if (code_seen_P(PSTR("uvlo"))) // PRUSA uvlo { eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); enquecommand_P(PSTR("M24")); } - else if (code_seen("MMURES")) // PRUSA MMURES + else if (code_seen_P(PSTR("MMURES"))) // PRUSA MMURES { mmu_reset(); } - else if (code_seen("RESET")) { // PRUSA RESET + else if (code_seen_P(PSTR("RESET"))) { // PRUSA RESET // careful! if (farm_mode) { #if (defined(WATCHDOG) && (MOTHERBOARD == BOARD_EINSY_1_0a)) @@ -4001,9 +4002,9 @@ void process_commands() #endif //WATCHDOG } else { - MYSERIAL.println("Not in farm mode."); + MYSERIAL.println("Not in farm mode."); // @@TODO } - }else if (code_seen("fv")) { // PRUSA fv + }else if (code_seen_P(PSTR("fv"))) { // PRUSA fv // get file version #ifdef SDSUPPORT card.openFile(strchr_pointer + 3,true); @@ -4018,38 +4019,38 @@ void process_commands() #endif // SDSUPPORT - } else if (code_seen("M28")) { // PRUSA M28 + } else if (code_seen_P(PSTR("M28"))) { // PRUSA M28 trace(); prusa_sd_card_upload = true; card.openFile(strchr_pointer+4,false); - } else if (code_seen("SN")) { // PRUSA SN + } else if (code_seen_P(PSTR("SN"))) { // PRUSA SN gcode_PRUSA_SN(); - } else if(code_seen("Fir")){ // PRUSA Fir + } else if(code_seen_P(PSTR("Fir"))){ // PRUSA Fir SERIAL_PROTOCOLLN(FW_VERSION_FULL); - } else if(code_seen("Rev")){ // PRUSA Rev + } else if(code_seen_P(PSTR("Rev"))){ // PRUSA Rev SERIAL_PROTOCOLLN(FILAMENT_SIZE "-" ELECTRONICS "-" NOZZLE_TYPE ); - } else if(code_seen("Lang")) { // PRUSA Lang + } else if(code_seen_P(PSTR("Lang"))) { // PRUSA Lang lang_reset(); - } else if(code_seen("Lz")) { // PRUSA Lz + } else if(code_seen_P(PSTR("Lz"))) { // PRUSA Lz eeprom_update_word(reinterpret_cast(&(EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)),0); - } else if(code_seen("Beat")) { // PRUSA Beat + } else if(code_seen_P(PSTR("Beat"))) { // PRUSA Beat // Kick farm link timer kicktime = _millis(); - } else if(code_seen("FR")) { // PRUSA FR + } else if(code_seen_P(PSTR("FR"))) { // PRUSA FR // Factory full reset factory_reset(0); - } else if(code_seen("MBL")) { // PRUSA MBL + } else if(code_seen_P(PSTR("MBL"))) { // PRUSA MBL // Change the MBL status without changing the logical Z position. - if(code_seen("V")) { + if(code_seen('V')) { bool value = code_value_short(); st_synchronize(); if(value != mbl.active) { @@ -4074,14 +4075,14 @@ eeprom_update_byte((uint8_t*)EEPROM_CHECK_MODE,0xFF); eeprom_update_byte((uint8_t*)EEPROM_NOZZLE_DIAMETER,0xFF); eeprom_update_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM,0xFFFF); */ - } else if (code_seen("nozzle")) { // PRUSA nozzle + } else if (code_seen_P(PSTR("nozzle"))) { // PRUSA nozzle uint16_t nDiameter; if(code_seen('D')) { nDiameter=(uint16_t)(code_value()*1000.0+0.5); // [,um] nozzle_diameter_check(nDiameter); } - else if(code_seen("set") && farm_mode) + else if(code_seen_P(PSTR("set")) && farm_mode) { strchr_pointer++; // skip 1st char (~ 's') strchr_pointer++; // skip 2nd char (~ 'e') @@ -4791,7 +4792,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G76 with all its parameters - enquecommand_front_P((PSTR("G28 W0"))); + enquecommand_front_P(G28W0); break; } lcd_show_fullscreen_message_and_wait_P(_i("Stable ambient temperature 21-26C is needed a rigid stand is required."));////MSG_TEMP_CAL_WARNING c=20 r=4 @@ -4932,7 +4933,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G76 with all its parameters - enquecommand_front_P((PSTR("G28 W0"))); + enquecommand_front_P(G28W0); break; } puts_P(_N("PINDA probe calibration start")); @@ -5081,7 +5082,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G80 with all its parameters - enquecommand_front_P((PSTR("G28 W0"))); + enquecommand_front_P(G28W0); break; } @@ -5114,7 +5115,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) temp_compensation_start(); run = true; repeatcommand_front(); // repeat G80 with all its parameters - enquecommand_front_P((PSTR("G28 W0"))); + enquecommand_front_P(G28W0); break; } run = false; @@ -6053,22 +6054,21 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) // M46: Prusa3D: Show the assigned IP address. if (card.ToshibaFlashAir_isEnabled()) { uint8_t ip[4]; - bool hasIP = card.ToshibaFlashAir_GetIP(ip); - if (hasIP) { + if (card.ToshibaFlashAir_GetIP(ip)) { // SERIAL_PROTOCOLPGM("Toshiba FlashAir current IP: "); - SERIAL_PROTOCOL(int(ip[0])); - SERIAL_PROTOCOLPGM("."); - SERIAL_PROTOCOL(int(ip[1])); - SERIAL_PROTOCOLPGM("."); - SERIAL_PROTOCOL(int(ip[2])); - SERIAL_PROTOCOLPGM("."); - SERIAL_PROTOCOL(int(ip[3])); - SERIAL_PROTOCOLPGM("\n"); + SERIAL_PROTOCOL(uint8_t(ip[0])); + SERIAL_PROTOCOL('.'); + SERIAL_PROTOCOL(uint8_t(ip[1])); + SERIAL_PROTOCOL('.'); + SERIAL_PROTOCOL(uint8_t(ip[2])); + SERIAL_PROTOCOL('.'); + SERIAL_PROTOCOL(uint8_t(ip[3])); + SERIAL_PROTOCOLLN(); } else { SERIAL_PROTOCOLPGM("?Toshiba FlashAir GetIP failed\n"); } } else { - SERIAL_PROTOCOLPGM("n/a\n"); + SERIAL_PROTOCOLLNPGM("n/a"); } break; } @@ -6629,7 +6629,7 @@ Sigma_Exit: SERIAL_PROTOCOL((int)active_extruder); SERIAL_PROTOCOLPGM(" B:"); SERIAL_PROTOCOL_F(degBed(), 1); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } codenum = _millis(); @@ -6899,7 +6899,7 @@ Sigma_Exit: else { SERIAL_ECHO_START; SERIAL_ECHOPAIR("M113 S", (unsigned long)host_keepalive_interval); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } break; @@ -6993,7 +6993,7 @@ Sigma_Exit: */ case 119: SERIAL_PROTOCOLRPGM(_N("Reporting endstop status"));////MSG_M119_REPORT - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #if defined(X_MIN_PIN) && X_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){ @@ -7001,7 +7001,7 @@ Sigma_Exit: }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif #if defined(X_MAX_PIN) && X_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX @@ -7010,7 +7010,7 @@ Sigma_Exit: }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN @@ -7019,7 +7019,7 @@ Sigma_Exit: }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX @@ -7028,7 +7028,7 @@ Sigma_Exit: }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1 SERIAL_PROTOCOLRPGM(MSG_Z_MIN); @@ -7037,7 +7037,7 @@ Sigma_Exit: }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1 SERIAL_PROTOCOLRPGM(MSG_Z_MAX); @@ -7046,7 +7046,7 @@ Sigma_Exit: }else{ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN); } - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif break; //!@todo update for all axes, use for loop @@ -7194,7 +7194,7 @@ Sigma_Exit: For each axis individually. */ case 203: // M203 max feedrate mm/sec - for (int8_t i = 0; i < NUM_AXIS; i++) + for (uint8_t i = 0; i < NUM_AXIS; i++) { if (code_seen(axis_codes[i])) { @@ -7315,7 +7315,7 @@ Sigma_Exit: - `Z` - Z axis offset */ case 206: - for(int8_t i=0; i < 3; i++) + for(uint8_t i=0; i < 3; i++) { if(code_seen(axis_codes[i])) cs.add_homing[i] = code_value(); } @@ -7638,7 +7638,7 @@ Sigma_Exit: SERIAL_PROTOCOL(servo_index); SERIAL_PROTOCOL(": "); SERIAL_PROTOCOL(servos[servo_index].read()); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } } break; @@ -7714,7 +7714,7 @@ Sigma_Exit: //Kc does not have scaling applied above, or in resetting defaults SERIAL_PROTOCOL(Kc); #endif - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } break; #endif //PIDTEMP @@ -7747,7 +7747,7 @@ Sigma_Exit: SERIAL_PROTOCOL(unscalePID_i(cs.bedKi)); SERIAL_PROTOCOL(" d:"); SERIAL_PROTOCOL(unscalePID_d(cs.bedKd)); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } break; #endif //PIDTEMP @@ -7970,7 +7970,7 @@ Sigma_Exit: cs.zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp SERIAL_ECHO_START; SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", MSG_OK,PSTR(""))); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } else { @@ -7980,7 +7980,7 @@ Sigma_Exit: SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MIN); SERIAL_ECHORPGM(MSG_Z_MAX); SERIAL_ECHO(Z_PROBE_OFFSET_RANGE_MAX); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } } else @@ -7988,7 +7988,7 @@ Sigma_Exit: SERIAL_ECHO_START; SERIAL_ECHOLNRPGM(CAT2(MSG_ZPROBE_ZOFFSET, PSTR(" : "))); SERIAL_ECHO(-cs.zprobe_zoffset); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } break; } @@ -8077,7 +8077,7 @@ Sigma_Exit: #endif } - if (mmu_enabled && code_seen("AUTO")) + if (mmu_enabled && code_seen_P(PSTR("AUTO"))) automatic = true; gcode_M600(automatic, x_position, y_position, z_shift, e_shift_init, e_shift_late); @@ -8151,7 +8151,7 @@ Sigma_Exit: SERIAL_PROTOCOLPGM("Wait for PINDA target temperature:"); SERIAL_PROTOCOL(set_target_pinda); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); codenum = _millis(); cancel_heatup = false; @@ -8210,7 +8210,7 @@ Sigma_Exit: SERIAL_PROTOCOL(usteps); SERIAL_PROTOCOLPGM(", "); SERIAL_PROTOCOL(mm * 1000); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } } else if (code_seen('!')) { // ! - Set factory default values @@ -8253,7 +8253,7 @@ Sigma_Exit: SERIAL_PROTOCOL(usteps); SERIAL_PROTOCOLPGM(", "); SERIAL_PROTOCOL(mm * 1000); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } } } @@ -8788,6 +8788,8 @@ Sigma_Exit: */ else if(code_seen('T')) { + static const char duplicate_Tcode_ignored[] PROGMEM = "Duplicate T-code ignored.\n"; + int index; bool load_to_nozzle = false; for (index = 1; *(strchr_pointer + index) == ' ' || *(strchr_pointer + index) == '\t'; index++); @@ -8803,7 +8805,7 @@ Sigma_Exit: tmp_extruder = choose_menu_P(_T(MSG_CHOOSE_FILAMENT), _T(MSG_FILAMENT)); if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row { - printf_P(PSTR("Duplicate T-code ignored.\n")); + printf_P(duplicate_Tcode_ignored); } else { @@ -8848,7 +8850,7 @@ Sigma_Exit: { if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row { - printf_P(PSTR("Duplicate T-code ignored.\n")); + printf_P(duplicate_Tcode_ignored); } else { @@ -10151,7 +10153,7 @@ static void wait_for_heater(long codenum, uint8_t extruder) { } } #else - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); #endif codenum = _millis(); } @@ -10458,7 +10460,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ // There shall be always enough space reserved for these commands. repeatcommand_front(); // repeat G80 with all its parameters - enquecommand_front_P((PSTR("G28 W0"))); + enquecommand_front_P(G28W0); enquecommand_front_P((PSTR("G1 Z5"))); return; } @@ -10774,7 +10776,7 @@ void serialecho_temperatures() { SERIAL_PROTOCOL((int)active_extruder); SERIAL_PROTOCOLPGM(" B:"); SERIAL_PROTOCOL_F(degBed(), 1); - SERIAL_PROTOCOLLN(""); + SERIAL_PROTOCOLLN(); } #ifdef UVLO_SUPPORT diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index 017452a2a..e85f2704e 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -75,7 +75,7 @@ extern uint16_t cmdqueue_calc_sd_length(); // Return True if a character was found static inline bool code_seen(char code) { return (strchr_pointer = strchr(CMDBUFFER_CURRENT_STRING, code)) != NULL; } -static inline bool code_seen(const char *code) { return (strchr_pointer = strstr(CMDBUFFER_CURRENT_STRING, code)) != NULL; } +static inline bool code_seen_P(const char *code_PROGMEM) { return (strchr_pointer = strstr_P(CMDBUFFER_CURRENT_STRING, code_PROGMEM)) != NULL; } static inline float code_value() { return strtod(strchr_pointer+1, NULL);} static inline long code_value_long() { return strtol(strchr_pointer+1, NULL, 10); } static inline int16_t code_value_short() { return int16_t(strtol(strchr_pointer+1, NULL, 10)); }; From 2780a03967e6f5fe78a207e141fbdbb47de7de05 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 17:47:44 +0100 Subject: [PATCH 156/218] Improve duplicate_Tcode_ignored kudos to @leptun --- Firmware/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 25767a4f0..f832131b4 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8788,7 +8788,7 @@ Sigma_Exit: */ else if(code_seen('T')) { - static const char duplicate_Tcode_ignored[] PROGMEM = "Duplicate T-code ignored.\n"; + static const char duplicate_Tcode_ignored[] PROGMEM = "Duplicate T-code ignored."; int index; bool load_to_nozzle = false; @@ -8805,7 +8805,7 @@ Sigma_Exit: tmp_extruder = choose_menu_P(_T(MSG_CHOOSE_FILAMENT), _T(MSG_FILAMENT)); if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row { - printf_P(duplicate_Tcode_ignored); + puts_P(duplicate_Tcode_ignored); } else { @@ -8850,7 +8850,7 @@ Sigma_Exit: { if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row { - printf_P(duplicate_Tcode_ignored); + puts_P(duplicate_Tcode_ignored); } else { From 90d22a376dbe90132f5001b2d0c9835bd5346fd3 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 17:50:08 +0100 Subject: [PATCH 157/218] Remove unused vars in xyzcal.cpp --- Firmware/xyzcal.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 1c397e141..64b0935a7 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -972,9 +972,6 @@ bool xyzcal_find_bed_induction_sensor_point_xy(void){ //@size=258 DBG(_n("xyzcal_find_bed_induction_sensor_point_xy x=%ld y=%ld z=%ld\n"), count_position[X_AXIS], count_position[Y_AXIS], count_position[Z_AXIS]); st_synchronize(); - pos_i16_t x = _X; - pos_i16_t y = _Y; - const pos_i16_t z = _Z; ///< magic constant, lowers min_z after searchZ to obtain more dense data in scan const pos_i16_t lower_z = 72; From 9b3478939883f4f727c6ed61c00a0f3cf092e43d Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 17:54:44 +0100 Subject: [PATCH 158/218] Cleanup reset_menu() --- Firmware/ultralcd.cpp | 44 +++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b144a6f6a..21b7cccd5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6208,34 +6208,38 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite } char reset_menu() { + const uint8_t items_no = #ifdef SNMM - int items_no = 5; + 5; #else - int items_no = 4; + 4; #endif - static int first = 0; - int enc_dif = 0; + static int8_t first = 0; + int8_t enc_dif = 0; char cursor_pos = 0; - const char *item [items_no]; - - item[0] = "Language"; - item[1] = "Statistics"; - item[2] = "Shipping prep"; - item[3] = "All Data"; -#ifdef SNMM - item[4] = "Bowden length"; -#endif // SNMM + static const char iLa[] PROGMEM = "Language"; + static const char iSt[] PROGMEM = "Statistics"; + static const char iSh[] PROGMEM = "Shipping prep"; + static const char iAl[] PROGMEM = "All Data"; + static const char iBl[] PROGMEM = "Bowden length"; + + static const char *const item [items_no] PROGMEM = { iLa, iSt, iSh, iAl +#ifdef SNMM + , iBl +#endif + }; + enc_dif = lcd_encoder_diff; lcd_clear(); lcd_set_cursor(0, 0); - lcd_print('>'); + lcd_putc('>'); lcd_consume_click(); while (1) { for (uint_least8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); - lcd_print(item[first + i]); + lcd_puts_P(item[first + i]); } manage_heater(); @@ -6270,15 +6274,15 @@ char reset_menu() { } } lcd_set_cursor(0, 0); - lcd_print(' '); + lcd_space(1); lcd_set_cursor(0, 1); - lcd_print(' '); + lcd_space(1); lcd_set_cursor(0, 2); - lcd_print(' '); + lcd_space(1); lcd_set_cursor(0, 3); - lcd_print(' '); + lcd_space(1); lcd_set_cursor(0, cursor_pos); - lcd_print('>'); + lcd_putc('>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); From da21916473d070e850ceb504a5b496b5730c8234 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 18:56:05 +0200 Subject: [PATCH 159/218] Change printf_P without format arguments and NL to puts_P only --- Firmware/Dcodes.cpp | 8 ++++---- Firmware/Marlin_main.cpp | 18 +++++++++--------- Firmware/adc.c | 2 +- Firmware/fsensor.cpp | 22 +++++++++++----------- Firmware/mmu.cpp | 22 +++++++++++----------- Firmware/tmc2130.cpp | 4 ++-- Firmware/uart2.c | 2 +- Firmware/ultralcd.cpp | 12 ++++++------ 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index f047fdb9d..a4b2829b1 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -380,7 +380,7 @@ void dcode_4() */ void dcode_5() { - printf_P(PSTR("D5 - Read/Write FLASH\n")); + puts_P(PSTR("D5 - Read/Write FLASH")); uint32_t address = 0x0000; //default 0x0000 uint16_t count = 0x0400; //default 0x0400 (1kb block) if (code_seen('A')) // Address (0x00000-0x3ffff) @@ -481,7 +481,7 @@ void dcode_7() */ void dcode_8() { - printf_P(PSTR("D8 - Read/Write PINDA\n")); + puts_P(PSTR("D8 - Read/Write PINDA")); uint8_t cal_status = calibration_status_pinda(); float temp_pinda = current_temperature_pinda; float offset_z = temp_compensation_pinda_thermistor_offset(temp_pinda); @@ -587,7 +587,7 @@ uint16_t dcode_9_ADC_val(uint8_t i) void dcode_9() { - printf_P(PSTR("D9 - Read/Write ADC\n")); + puts_P(PSTR("D9 - Read/Write ADC")); if ((strchr_pointer[1+1] == '?') || (strchr_pointer[1+1] == 0)) { for (uint8_t i = 0; i < ADC_CHAN_CNT; i++) @@ -784,7 +784,7 @@ extern void st_synchronize(); */ void dcode_2130() { - printf_P(PSTR("D2130 - TMC2130\n")); + puts_P(PSTR("D2130 - TMC2130")); uint8_t axis = 0xff; switch (strchr_pointer[1+4]) { diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f832131b4..842f60129 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1019,10 +1019,10 @@ uint8_t lang_xflash_enum_codes(uint16_t* codes) w25x20cl_rd_data(addr, (uint8_t*)&header, sizeof(lang_table_header_t)); if (header.magic != LANG_MAGIC) { - printf_P(_n("NG!\n")); + puts_P(_n("NG!")); break; } - printf_P(_n("OK\n")); + puts_P(_n("OK")); printf_P(_n(" _lt_magic = 0x%08lx %S\n"), header.magic, (header.magic==LANG_MAGIC)?_n("OK"):_n("NA")); printf_P(_n(" _lt_size = 0x%04x (%d)\n"), header.size, header.size); printf_P(_n(" _lt_count = 0x%04x (%d)\n"), header.count, header.count); @@ -1132,7 +1132,7 @@ void setup() SERIAL_PROTOCOLLNPGM("start"); #endif SERIAL_ECHO_START; - printf_P(PSTR(" " FW_VERSION_FULL "\n")); + puts_P(PSTR(" " FW_VERSION_FULL)); //SERIAL_ECHOPAIR("Active sheet before:", static_cast(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))); @@ -1222,12 +1222,12 @@ void setup() printf_P(_n("_SEC_LANG_TABLE checksum = %04x\n"), sum); sum = (sum >> 8) | ((sum & 0xff) << 8); //swap bytes if (sum == header.checksum) - printf_P(_n("Checksum OK\n"), sum); + puts_P(_n("Checksum OK"), sum); else - printf_P(_n("Checksum NG\n"), sum); + puts_P(_n("Checksum NG"), sum); } else - printf_P(_n("lang_get_header failed!\n")); + puts_P(_n("lang_get_header failed!")); #if 0 for (uint16_t i = 0; i < 1024*10; i++) @@ -1307,7 +1307,7 @@ void setup() else { w25x20cl_err_msg(); - printf_P(_n("W25X20CL not responding.\n")); + puts_P(_n("W25X20CL not responding.")); } #ifdef EXTRUDER_ALTFAN_DETECT SERIAL_ECHORPGM(_n("Extruder fan type: ")); @@ -5243,12 +5243,12 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { - printf_P(PSTR("Bed leveling failed. Sensor disconnected or cable broken.\n")); + puts_P(PSTR("Bed leveling failed. Sensor disconnected or cable broken.")); break; } } if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point - printf_P(PSTR("Bed leveling failed. Sensor triggered too high.\n")); + puts_P(PSTR("Bed leveling failed. Sensor triggered too high.")); break; } #ifdef SUPPORT_VERBOSITY diff --git a/Firmware/adc.c b/Firmware/adc.c index 3144990da..b41e58f69 100644 --- a/Firmware/adc.c +++ b/Firmware/adc.c @@ -19,7 +19,7 @@ uint16_t adc_sim_mask; void adc_init(void) { - printf_P(PSTR("adc_init\n")); + puts_P(PSTR("adc_init")); adc_sim_mask = 0x00; ADCSRA |= (1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0); ADMUX |= (1 << REFS0); diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index b6ea77883..7c225bf2a 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -129,7 +129,7 @@ unsigned long nIRsensorLastTime; void fsensor_stop_and_save_print(void) { - printf_P(PSTR("fsensor_stop_and_save_print\n")); + puts_P(PSTR("fsensor_stop_and_save_print")); stop_and_save_print_to_ram(0, 0); fsensor_watch_runout = false; } @@ -152,7 +152,7 @@ void fsensor_set_axis_steps_per_unit(float u) void fsensor_restore_print_and_continue(void) { - printf_P(PSTR("fsensor_restore_print_and_continue\n")); + puts_P(PSTR("fsensor_restore_print_and_continue")); fsensor_watch_runout = true; #ifdef PAT9125 fsensor_reset_err_cnt(); @@ -164,7 +164,7 @@ void fsensor_restore_print_and_continue(void) // allowing new instructions to be inserted in the middle void fsensor_checkpoint_print(void) { - printf_P(PSTR("fsensor_checkpoint_print\n")); + puts_P(PSTR("fsensor_checkpoint_print")); stop_and_save_print_to_ram(0, 0); restore_print_from_ram_and_continue(0); } @@ -414,7 +414,7 @@ void fsensor_oq_meassure_start(uint8_t skip) { if (!fsensor_enabled) return; if (!fsensor_oq_meassure_enabled) return; - printf_P(PSTR("fsensor_oq_meassure_start\n")); + puts_P(PSTR("fsensor_oq_meassure_start")); fsensor_oq_skipchunk = skip; fsensor_oq_samples = 0; fsensor_oq_st_sum = 0; @@ -447,7 +447,7 @@ bool fsensor_oq_result(void) { if (!fsensor_enabled) return true; if (!fsensor_oq_meassure_enabled) return true; - printf_P(_N("fsensor_oq_result\n")); + puts_P(_N("fsensor_oq_result")); bool res_er_sum = (fsensor_oq_er_sum <= FSENSOR_OQ_MAX_ES); printf_P(_N(" er_sum = %u %S\n"), fsensor_oq_er_sum, (res_er_sum?_OK:_NG)); bool res_er_max = (fsensor_oq_er_max <= FSENSOR_OQ_MAX_EM); @@ -616,7 +616,7 @@ void fsensor_st_block_chunk(int cnt) //! Common code for enqueing M600 and supplemental codes into the command queue. //! Used both for the IR sensor and the PAT9125 void fsensor_enque_M600(){ - printf_P(PSTR("fsensor_update - M600\n")); + puts_P(PSTR("fsensor_update - M600")); 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("M600"))); @@ -670,7 +670,7 @@ void fsensor_update(void) fsensor_softfail_ccnt = 0; if (!err && fsensor_softfail_ccnt <= FSENSOR_SOFTERR_CMAX) { - printf_P(PSTR("fsensor_err_cnt = 0\n")); + puts_P(PSTR("fsensor_err_cnt = 0")); ++fsensor_softfail; ++fsensor_softfail_ccnt; fsensor_softfail_last = now; @@ -757,19 +757,19 @@ bool fsensor_IR_check(){ /// Or the user is so creative so that he can hold a piece of fillament in the hole in such a genius way, /// that the IR fsensor reading is within 1.5 and 3V ... this would have been highly unusual /// and would have been considered more like a sabotage than normal printer operation - printf_P(PSTR("fsensor in forbidden range 1.5-3V - check sensor\n")); + puts_P(PSTR("fsensor in forbidden range 1.5-3V - check sensor")); return false; } if( oFsensorPCB == ClFsensorPCB::_Rev04 ){ /// newer IR sensor cannot normally produce 4.6-5V, this is considered a failure/bad mount if( IRsensor_Hopen_TRESHOLD <= current_voltage_raw_IR && current_voltage_raw_IR <= IRsensor_VMax_TRESHOLD ){ - printf_P(PSTR("fsensor v0.4 in fault range 4.6-5V - unconnected\n")); + puts_P(PSTR("fsensor v0.4 in fault range 4.6-5V - unconnected")); return false; } /// newer IR sensor cannot normally produce 0-0.3V, this is considered a failure #if 0 //Disabled as it has to be decided if we gonna use this or not. if( IRsensor_Hopen_TRESHOLD <= current_voltage_raw_IR && current_voltage_raw_IR <= IRsensor_VMax_TRESHOLD ){ - printf_P(PSTR("fsensor v0.4 in fault range 0.0-0.3V - wrong IR sensor\n")); + puts_P(PSTR("fsensor v0.4 in fault range 0.0-0.3V - wrong IR sensor")); return false; } #endif @@ -777,7 +777,7 @@ bool fsensor_IR_check(){ /// If IR sensor is "uknown state" and filament is not loaded > 1.5V return false #if 0 if( (oFsensorPCB == ClFsensorPCB::_Undef) && ( current_voltage_raw_IR > IRsensor_Lmax_TRESHOLD ) ){ - printf_P(PSTR("Unknown IR sensor version and no filament loaded detected.\n")); + puts_P(PSTR("Unknown IR sensor version and no filament loaded detected.")); return false; } #endif diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index e992c7190..b37fe5f8c 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -567,11 +567,11 @@ bool can_extrude() static void get_response_print_info(uint8_t move) { printf_P(PSTR("mmu_get_response - begin move: "), move); switch (move) { - case MMU_LOAD_MOVE: printf_P(PSTR("load\n")); break; - case MMU_UNLOAD_MOVE: printf_P(PSTR("unload\n")); break; - case MMU_TCODE_MOVE: printf_P(PSTR("T-code\n")); break; - case MMU_NO_MOVE: printf_P(PSTR("no move\n")); break; - default: printf_P(PSTR("error: unknown move\n")); break; + case MMU_LOAD_MOVE: puts_P(PSTR("load")); break; + case MMU_UNLOAD_MOVE: puts_P(PSTR("unload")); break; + case MMU_TCODE_MOVE: puts_P(PSTR("T-code")); break; + case MMU_NO_MOVE: puts_P(PSTR("no move")); break; + default: puts_P(PSTR("error: unknown move")); break; } } @@ -602,7 +602,7 @@ bool mmu_get_response(uint8_t move) { if (can_extrude()) { - printf_P(PSTR("Unload 1\n")); + puts_P(PSTR("Unload 1")); current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001; plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE); st_synchronize(); @@ -610,7 +610,7 @@ bool mmu_get_response(uint8_t move) } else //filament was unloaded from idler, no additional movements needed { - printf_P(PSTR("Unloading finished 1\n")); + puts_P(PSTR("Unloading finished 1")); disable_e0(); //turn off E-stepper to prevent overheating and alow filament pull-out if necessary move = MMU_NO_MOVE; } @@ -620,7 +620,7 @@ bool mmu_get_response(uint8_t move) { if (can_extrude()) { - printf_P(PSTR("Unload 2\n")); + puts_P(PSTR("Unload 2")); current_position[E_AXIS] = current_position[E_AXIS] - MMU_LOAD_FEEDRATE * MMU_LOAD_TIME_MS*0.001; plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE); st_synchronize(); @@ -628,7 +628,7 @@ bool mmu_get_response(uint8_t move) } else //delay to allow mmu unit to pull out filament from bondtech gears and then start with infinite loading { - printf_P(PSTR("Unloading finished 2\n")); + puts_P(PSTR("Unloading finished 2")); disable_e0(); //turn off E-stepper to prevent overheating and alow filament pull-out if necessary delay_keep_alive(MMU_LOAD_TIME_MS); move = MMU_LOAD_MOVE; @@ -689,7 +689,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) } st_synchronize(); mmu_print_saved = true; - printf_P(PSTR("MMU not responding\n")); + puts_P(PSTR("MMU not responding")); KEEPALIVE_STATE(PAUSED_FOR_USER); hotend_temp_bckp = degTargetHotend(active_extruder); if (move_axes) { @@ -746,7 +746,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) } } else if (mmu_print_saved) { - printf_P(PSTR("MMU starts responding\n")); + puts_P(PSTR("MMU starts responding")); KEEPALIVE_STATE(IN_HANDLER); mmu_loading_flag = false; if (turn_off_nozzle) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 108d00b1d..223233a92 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -996,11 +996,11 @@ bool tmc2130_home_calibrate(uint8_t axis) uint8_t val[16]; homeaxis(axis, 16, step); bubblesort_uint8(step, 16, 0); - printf_P(PSTR("sorted samples:\n")); + puts_P(PSTR("sorted samples:")); for (uint8_t i = 0; i < 16; i++) printf_P(PSTR(" i=%2d step=%2d\n"), i, step[i]); uint8_t cl = clusterize_uint8(step, 16, cnt, val, 1); - printf_P(PSTR("clusters:\n")); + puts_P(PSTR("clusters:")); for (uint8_t i = 0; i < cl; i++) printf_P(PSTR(" i=%2d cnt=%2d val=%2d\n"), i, cnt[i], val[i]); bubblesort_uint8(cnt, cl, val); diff --git a/Firmware/uart2.c b/Firmware/uart2.c index 9a2a724e1..f3da9ed33 100644 --- a/Firmware/uart2.c +++ b/Firmware/uart2.c @@ -79,7 +79,7 @@ ISR(USART2_RX_vect) if (rbuf_put(uart2_ibuf, UDR2) < 0) // put received byte to buffer { //rx buffer full //uart2_rx_clr(); //for sure, clear input buffer - printf_P(PSTR("USART2 rx Full!!!\n")); + puts_P(PSTR("USART2 rx Full!!!")); } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 21b7cccd5..1bf724e2f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8629,9 +8629,9 @@ static FanCheck lcd_selftest_fan_auto(int _fan) setExtruderAutoFanState(0); //extruder fan manage_heater(); //count average fan speed from 2s delay and turn off fans - printf_P(PSTR("Test 1:\n")); - printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]); - printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]); + puts_P(PSTR("Test 1:")); + printf_P(PSTR("Print fan speed: %d\n"), fan_speed[1]); + printf_P(PSTR("Extr fan speed: %d\n"), fan_speed[0]); if (fan_speed[0] < 20) { // < 1200 RPM would mean either a faulty Noctua or Altfan return FanCheck::ExtruderFan; @@ -8669,9 +8669,9 @@ static FanCheck lcd_selftest_fan_auto(int _fan) manage_heater(); //turn off fan manage_inactivity(true); //to turn off print fan #endif //FAN_SOFT_PWM - printf_P(PSTR("Test 2:\n")); - printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]); - printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]); + puts_P(PSTR("Test 2:")); + printf_P(PSTR("Print fan speed: %d\n"), fan_speed[1]); + printf_P(PSTR("Extr fan speed: %d\n"), fan_speed[0]); if (!fan_speed[1]) { return FanCheck::PrintFan; } From bc7d36b6ffb8eb1fc6021f160567423caeaefc18 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 18:57:24 +0200 Subject: [PATCH 160/218] Fix sm4.h line ending --- Firmware/sm4.h | 114 ++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/Firmware/sm4.h b/Firmware/sm4.h index ce110caa8..9b5531548 100644 --- a/Firmware/sm4.h +++ b/Firmware/sm4.h @@ -1,57 +1,57 @@ -//sm4.h - simple 4-axis stepper control -#ifndef _SM4_H -#define _SM4_H - -#include -#include "config.h" - - -#if defined(__cplusplus) -extern "C" { -#endif //defined(__cplusplus) - - -// callback prototype for stop condition (return 0 - continue, return 1 - stop) -typedef uint8_t (*sm4_stop_cb_t)(); - -// callback prototype for updating position counters -typedef void (*sm4_update_pos_cb_t)(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); - -// callback prototype for calculating delay -typedef uint16_t (*sm4_calc_delay_cb_t)(uint16_t nd, uint16_t dd); - - -// callback pointer - stop -extern sm4_stop_cb_t sm4_stop_cb; - -// callback pointer - update_pos -extern sm4_update_pos_cb_t sm4_update_pos_cb; - -// callback pointer - calc_delay -extern sm4_calc_delay_cb_t sm4_calc_delay_cb; - - -// returns direction for single axis (0 - positive, 1 - negative) -extern uint8_t sm4_get_dir(uint8_t axis); - -// set direction for single axis (0 - positive, 1 - negative) -extern void sm4_set_dir(uint8_t axis, uint8_t dir); - -// returns direction of all axes as bitmask (0 - positive, 1 - negative) -extern uint8_t sm4_get_dir_bits(void); - -// set direction for all axes as bitmask (0 - positive, 1 - negative) -extern void sm4_set_dir_bits(uint8_t dir_bits); - -// step axes by bitmask -extern void sm4_do_step(uint8_t axes_mask); - -// xyze linear-interpolated relative move, returns remaining diagonal steps (>0 means stoped) -extern uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); -extern uint16_t sm4_line_xyz_ui(uint16_t dx, uint16_t dy, uint16_t dz); - - -#if defined(__cplusplus) -} -#endif //defined(__cplusplus) -#endif //_SM4_H +//sm4.h - simple 4-axis stepper control +#ifndef _SM4_H +#define _SM4_H + +#include +#include "config.h" + + +#if defined(__cplusplus) +extern "C" { +#endif //defined(__cplusplus) + + +// callback prototype for stop condition (return 0 - continue, return 1 - stop) +typedef uint8_t (*sm4_stop_cb_t)(); + +// callback prototype for updating position counters +typedef void (*sm4_update_pos_cb_t)(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); + +// callback prototype for calculating delay +typedef uint16_t (*sm4_calc_delay_cb_t)(uint16_t nd, uint16_t dd); + + +// callback pointer - stop +extern sm4_stop_cb_t sm4_stop_cb; + +// callback pointer - update_pos +extern sm4_update_pos_cb_t sm4_update_pos_cb; + +// callback pointer - calc_delay +extern sm4_calc_delay_cb_t sm4_calc_delay_cb; + + +// returns direction for single axis (0 - positive, 1 - negative) +extern uint8_t sm4_get_dir(uint8_t axis); + +// set direction for single axis (0 - positive, 1 - negative) +extern void sm4_set_dir(uint8_t axis, uint8_t dir); + +// returns direction of all axes as bitmask (0 - positive, 1 - negative) +extern uint8_t sm4_get_dir_bits(void); + +// set direction for all axes as bitmask (0 - positive, 1 - negative) +extern void sm4_set_dir_bits(uint8_t dir_bits); + +// step axes by bitmask +extern void sm4_do_step(uint8_t axes_mask); + +// xyze linear-interpolated relative move, returns remaining diagonal steps (>0 means stoped) +extern uint16_t sm4_line_xyze_ui(uint16_t dx, uint16_t dy, uint16_t dz, uint16_t de); +extern uint16_t sm4_line_xyz_ui(uint16_t dx, uint16_t dy, uint16_t dz); + + +#if defined(__cplusplus) +} +#endif //defined(__cplusplus) +#endif //_SM4_H From 3ccd1b2b2b9ef834f6ee4f7460a5c4e344a30c21 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 22 Jan 2021 18:34:47 +0100 Subject: [PATCH 161/218] Refactor lcd_set_cursor + lcd_puts_P -> lcd_puts_at_P saves considerable amount of flash --- Firmware/Marlin_main.cpp | 6 +- Firmware/mmu.cpp | 13 +- Firmware/ultralcd.cpp | 254 +++++++++++++-------------------------- 3 files changed, 94 insertions(+), 179 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 842f60129..ae04ede85 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3314,8 +3314,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float if (lcd_change_fil_state == 0) { lcd_clear(); - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_PLEASE_WAIT)); + lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT)); current_position[X_AXIS] -= 100; plan_buffer_line_curposXYZE(FILAMENTCHANGE_XYFEED); st_synchronize(); @@ -3331,8 +3330,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float if (saved_printing) { lcd_clear(); - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_PLEASE_WAIT)); + lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT)); mmu_command(MmuCmd::R0); manage_response(false, false); diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index b37fe5f8c..be5e988d8 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -878,7 +878,7 @@ void mmu_M600_load_filament(bool automatic, float nozzle_temp) } lcd_update_enable(false); lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); + lcd_puts_at_P(0, 1, _T(MSG_LOADING_FILAMENT)); lcd_print(' '); lcd_print(tmp_extruder + 1); snmm_filaments_used |= (1 << tmp_extruder); //for stop print @@ -991,7 +991,7 @@ void extr_adj(uint8_t extruder) //loading filament for SNMM lcd_update_enable(false); lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); + lcd_puts_at_P(0, 1, _T(MSG_LOADING_FILAMENT)); //if(strlen(_T(MSG_LOADING_FILAMENT))>18) lcd.setCursor(0, 1); //else lcd.print(" "); lcd_print(' '); @@ -1081,7 +1081,7 @@ void mmu_filament_ramming() void extr_unload_view() { lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_UNLOADING_FILAMENT)); + lcd_puts_at_P(0, 1, _T(MSG_UNLOADING_FILAMENT)); lcd_print(' '); if (mmu_extruder == MMU_FILAMENT_UNKNOWN) lcd_print(' '); else lcd_print(mmu_extruder + 1); @@ -1349,8 +1349,7 @@ void lcd_mmu_load_to_nozzle(uint8_t filament_nr) tmp_extruder = filament_nr; lcd_update_enable(false); lcd_clear(); - lcd_set_cursor(0, 1); - lcd_puts_P(_T(MSG_LOADING_FILAMENT)); + lcd_puts_at_P(0, 1, _T(MSG_LOADING_FILAMENT)); lcd_print(' '); lcd_print(tmp_extruder + 1); mmu_command(MmuCmd::T0 + tmp_extruder); @@ -1384,7 +1383,7 @@ void mmu_cut_filament(uint8_t filament_nr) { LcdUpdateDisabler disableLcdUpdate; lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18 + lcd_puts_at_P(0, 1, _i("Cutting filament")); //// c=18 lcd_print(' '); lcd_print(filament_nr + 1); mmu_filament_ramming(); @@ -1412,7 +1411,7 @@ bFilamentAction=false; // NOT in "mmu_fil_eject_menu( { LcdUpdateDisabler disableLcdUpdate; lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_i("Ejecting filament")); + lcd_puts_at_P(0, 1, _i("Ejecting filament")); mmu_filament_ramming(); mmu_command(MmuCmd::E0 + filament); manage_response(false, false, MMU_UNLOAD_MOVE); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1bf724e2f..d7319c3ab 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -768,7 +768,7 @@ void lcdui_print_status_line(void) heating_status_counter = 0; } lcd_set_cursor(7, 3); - lcd_puts_P(PSTR(" ")); + lcd_space(13); for (unsigned int dots = 0; dots < heating_status_counter; dots++) { @@ -778,22 +778,18 @@ void lcdui_print_status_line(void) switch (heating_status) { case 1: - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_HEATING)); + lcd_puts_at_P(0, 3, _T(MSG_HEATING)); break; case 2: - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_HEATING_COMPLETE)); + lcd_puts_at_P(0, 3, _T(MSG_HEATING_COMPLETE)); heating_status = 0; heating_status_counter = 0; break; case 3: - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_BED_HEATING)); + lcd_puts_at_P(0, 3, _T(MSG_BED_HEATING)); break; case 4: - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_BED_DONE)); + lcd_puts_at_P(0, 3, _T(MSG_BED_DONE)); heating_status = 0; heating_status_counter = 0; break; @@ -842,9 +838,8 @@ void lcdui_print_status_line(void) if (custom_message_state > 10) { lcd_set_cursor(0, 3); - lcd_puts_P(PSTR(" ")); - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_CALIBRATE_Z_AUTO)); + lcd_space(20); + lcd_puts_at_P(0, 3, _T(MSG_CALIBRATE_Z_AUTO)); lcd_puts_P(PSTR(" : ")); lcd_print(custom_message_state-10); } @@ -859,9 +854,8 @@ void lcdui_print_status_line(void) if (custom_message_state > 3 && custom_message_state <= 10 ) { lcd_set_cursor(0, 3); - lcd_puts_P(PSTR(" ")); - lcd_set_cursor(0, 3); - lcd_puts_P(_i("Calibration done"));////MSG_HOMEYZ_DONE + lcd_space(19); + lcd_puts_at_P(0, 3, _i("Calibration done"));////MSG_HOMEYZ_DONE custom_message_state--; } } @@ -891,8 +885,7 @@ void lcdui_print_status_line(void) } break; case CustomMsg::TempCompPreheat: // temp compensation preheat - lcd_set_cursor(0, 3); - lcd_puts_P(_i("PINDA Heating"));////MSG_PINDA_PREHEAT c=20 r=1 + lcd_puts_at_P(0, 3, _i("PINDA Heating"));////MSG_PINDA_PREHEAT c=20 r=1 if (custom_message_state <= PINDA_HEAT_T) { lcd_puts_P(PSTR(": ")); @@ -2281,8 +2274,7 @@ uint8_t nLevel; lcd_set_cursor(0,0); lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0)); -lcd_set_cursor(0,2); -lcd_puts_P(_i("Press the knob")); ////MSG_ c=20 r=1 +lcd_puts_at_P(0,2, _i("Press the knob")); ////MSG_ c=20 r=1 lcd_set_cursor(0,3); switch(eFilamentAction) { @@ -2461,8 +2453,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) // handled earlier break; } - lcd_set_cursor(0, 3); - lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1 + lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_ c=20 r=1 } if (lcd_clicked()) @@ -2619,8 +2610,7 @@ void lcd_wait_interact() { lcd_puts_P(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20 #endif if (!fsensor_autoload_enabled) { - lcd_set_cursor(0, 2); - lcd_puts_P(_i("and press the knob"));////MSG_PRESS c=20 r=2 + lcd_puts_at_P(0, 2, _i("and press the knob"));////MSG_PRESS c=20 r=2 } } @@ -2629,9 +2619,7 @@ void lcd_change_success() { lcd_clear(); - lcd_set_cursor(0, 2); - - lcd_puts_P(_i("Change success!"));////MSG_CHANGE_SUCCESS + lcd_puts_at_P(0, 2, _i("Change success!"));////MSG_CHANGE_SUCCESS } @@ -2654,11 +2642,8 @@ void lcd_loading_color() { lcd_clear(); - lcd_set_cursor(0, 0); - - lcd_puts_P(_i("Loading color"));////MSG_LOADING_COLOR - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_PLEASE_WAIT)); + lcd_puts_at_P(0, 0, _i("Loading color"));////MSG_LOADING_COLOR + lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT)); lcd_loading_progress_bar((FILAMENTCHANGE_FINALFEED * 1000ul) / FILAMENTCHANGE_EFEED_FINAL); //show progress bar during filament loading slow sequence } @@ -2668,11 +2653,8 @@ void lcd_loading_filament() { lcd_clear(); - lcd_set_cursor(0, 0); - - lcd_puts_P(_T(MSG_LOADING_FILAMENT)); - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_PLEASE_WAIT)); + lcd_puts_at_P(0, 0, _T(MSG_LOADING_FILAMENT)); + lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT)); #ifdef SNMM for (int i = 0; i < 20; i++) { @@ -2706,23 +2688,10 @@ void lcd_alright() { lcd_clear(); - lcd_set_cursor(0, 0); - - lcd_puts_P(_i("Changed correctly?"));////MSG_CORRECTLY c=20 - - lcd_set_cursor(1, 1); - - lcd_puts_P(_T(MSG_YES)); - - lcd_set_cursor(1, 2); - - lcd_puts_P(_i("Filament not loaded"));////MSG_NOT_LOADED c=19 - - - lcd_set_cursor(1, 3); - lcd_puts_P(_i("Color not correct"));////MSG_NOT_COLOR - - + lcd_puts_at_P(0, 0, _i("Changed correctly?"));////MSG_CORRECTLY c=20 + lcd_puts_at_P(1, 1, _T(MSG_YES)); + lcd_puts_at_P(1, 2, _i("Filament not loaded"));////MSG_NOT_LOADED c=19 + lcd_puts_at_P(1, 3, _i("Color not correct"));////MSG_NOT_COLOR lcd_set_cursor(0, 1); lcd_print('>'); @@ -2791,10 +2760,8 @@ void lcd_alright() { void show_preheat_nozzle_warning() { lcd_clear(); - lcd_set_cursor(0, 0); - lcd_puts_P(_T(MSG_ERROR)); - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_PREHEAT_NOZZLE)); + lcd_puts_at_P(0, 0, _T(MSG_ERROR)); + lcd_puts_at_P(0, 2, _T(MSG_PREHEAT_NOZZLE)); _delay(2000); lcd_clear(); } @@ -3055,8 +3022,7 @@ static void lcd_menu_xyz_skew() lcd_printf_P(_N("%3.2f\x01"), _deg(angleDiff)); } else{ - lcd_set_cursor(15,0); - lcd_puts_P(_T(MSG_NA)); + lcd_puts_at_P(15,0, _T(MSG_NA)); } if (lcd_clicked()) menu_goto(lcd_menu_xyz_offset, 0, true, true); @@ -3074,8 +3040,7 @@ static void lcd_menu_xyz_skew() //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. static void lcd_menu_xyz_offset() { - lcd_set_cursor(0,0); - lcd_puts_P(_i("[0;0] point offset"));////MSG_MEASURED_OFFSET + lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET lcd_puts_at_P(0, 1, separator); lcd_puts_at_P(0, 2, PSTR("X")); ////c=10 r=1 lcd_puts_at_P(0, 3, PSTR("Y")); ////c=10 r=1 @@ -3296,8 +3261,7 @@ void lcd_adjust_bed(void) void pid_extruder() { lcd_clear(); - lcd_set_cursor(1, 0); - lcd_puts_P(_i("Set temperature:"));////MSG_SET_TEMPERATURE c=19 r=1 + lcd_puts_at_P(1, 0, _i("Set temperature:"));////MSG_SET_TEMPERATURE c=19 r=1 pid_temp += int(lcd_encoder); if (pid_temp > HEATER_0_MAXTEMP) pid_temp = HEATER_0_MAXTEMP; if (pid_temp < HEATER_0_MINTEMP) pid_temp = HEATER_0_MINTEMP; @@ -3791,12 +3755,10 @@ int8_t lcd_show_multiscreen_message_two_choices_and_wait_P(const char *msg, bool if (msg_next == NULL) { lcd_set_cursor(0, 3); if (yes) lcd_print('>'); - lcd_set_cursor(1, 3); - lcd_puts_P(first_choice); + lcd_puts_at_P(1, 3, first_choice); lcd_set_cursor(7, 3); if (!yes) lcd_print('>'); - lcd_set_cursor(8, 3); - lcd_puts_P(second_choice); + lcd_puts_at_P(8, 3, second_choice); } } } @@ -3817,12 +3779,10 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow lcd_set_cursor(0, 2); lcd_print('>'); lcd_puts_P(_T(MSG_YES)); - lcd_set_cursor(1, 3); - lcd_puts_P(_T(MSG_NO)); + lcd_puts_at_P(1, 3, _T(MSG_NO)); } else { - lcd_set_cursor(1, 2); - lcd_puts_P(_T(MSG_YES)); + lcd_puts_at_P(1, 2, _T(MSG_YES)); lcd_set_cursor(0, 3); lcd_print('>'); lcd_puts_P(_T(MSG_NO)); @@ -3951,14 +3911,10 @@ void lcd_temp_cal_show_result(bool result) { } static void lcd_show_end_stops() { - lcd_set_cursor(0, 0); - lcd_puts_P((PSTR("End stops diag"))); - lcd_set_cursor(0, 1); - lcd_puts_P((READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) ? (PSTR("X1")) : (PSTR("X0"))); - lcd_set_cursor(0, 2); - lcd_puts_P((READ(Y_MIN_PIN) ^ (bool)Y_MIN_ENDSTOP_INVERTING) ? (PSTR("Y1")) : (PSTR("Y0"))); - lcd_set_cursor(0, 3); - lcd_puts_P((READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING) ? (PSTR("Z1")) : (PSTR("Z0"))); + lcd_puts_at_P(0, 0, (PSTR("End stops diag"))); + lcd_puts_at_P(0, 1, (READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) ? (PSTR("X1")) : (PSTR("X0"))); + lcd_puts_at_P(0, 2, (READ(Y_MIN_PIN) ^ (bool)Y_MIN_ENDSTOP_INVERTING) ? (PSTR("Y1")) : (PSTR("Y0"))); + lcd_puts_at_P(0, 3, (READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING) ? (PSTR("Z1")) : (PSTR("Z0"))); } #ifndef TMC2130 @@ -5940,8 +5896,7 @@ void bowden_menu() { lcd_set_cursor(0, 0); lcd_print('>'); for (uint_least8_t i = 0; i < 4; i++) { - lcd_set_cursor(1, i); - lcd_print("Extruder "); + lcd_puts_at_P(1, i, PSTR("Extruder ")); lcd_print(i); lcd_print(": "); EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); @@ -5998,8 +5953,7 @@ void bowden_menu() { manage_heater(); manage_inactivity(true); - lcd_set_cursor(1, 1); - lcd_print("Extruder "); + lcd_puts_at_P(1, 1, PSTR("Extruder ")); lcd_print(cursor_pos); lcd_print(": "); lcd_set_cursor(13, 1); @@ -6031,8 +5985,7 @@ void bowden_menu() { lcd_set_cursor(0, cursor_pos); lcd_print('>'); for (uint_least8_t i = 0; i < 4; i++) { - lcd_set_cursor(1, i); - lcd_print("Extruder "); + lcd_puts_at_P(1, i, PSTR("Extruder ")); lcd_print(i); lcd_print(": "); EEPROM_read_B(EEPROM_BOWDEN_LENGTH + i * 2, &bowden_length[i]); @@ -6222,8 +6175,10 @@ char reset_menu() { static const char iSt[] PROGMEM = "Statistics"; static const char iSh[] PROGMEM = "Shipping prep"; static const char iAl[] PROGMEM = "All Data"; +#ifdef SNMM static const char iBl[] PROGMEM = "Bowden length"; - +#endif + static const char *const item [items_no] PROGMEM = { iLa, iSt, iSh, iAl #ifdef SNMM , iBl @@ -6238,8 +6193,7 @@ char reset_menu() { while (1) { for (uint_least8_t i = 0; i < 4; i++) { - lcd_set_cursor(1, i); - lcd_puts_P(item[first + i]); + lcd_puts_at_P(1, i, item[first + i]); } manage_heater(); @@ -6662,12 +6616,10 @@ void lcd_confirm_print() if (cursor_pos > 2) { cursor_pos = 2; } if (cursor_pos < 1) { cursor_pos = 1; } - lcd_set_cursor(0, 2); lcd_print(" "); - lcd_set_cursor(0, 3); lcd_print(" "); - lcd_set_cursor(2, 2); - lcd_puts_P(_T(MSG_YES)); - lcd_set_cursor(2, 3); - lcd_puts_P(_T(MSG_NO)); + lcd_set_cursor(0, 2); lcd_space(10); + lcd_set_cursor(0, 3); lcd_space(10); + lcd_puts_at_P(2, 2, _T(MSG_YES)); + lcd_puts_at_P(2, 3, _T(MSG_NO)); lcd_set_cursor(0, 1 + cursor_pos); lcd_print('>'); _delay(100); @@ -7443,12 +7395,9 @@ void lcd_print_stop() void lcd_sdcard_stop() { - lcd_set_cursor(0, 0); - lcd_puts_P(_T(MSG_STOP_PRINT)); - lcd_set_cursor(2, 2); - lcd_puts_P(_T(MSG_NO)); - lcd_set_cursor(2, 3); - lcd_puts_P(_T(MSG_YES)); + lcd_puts_at_P(0, 0, _T(MSG_STOP_PRINT)); + lcd_puts_at_P(2, 2, _T(MSG_NO)); + lcd_puts_at_P(2, 3, _T(MSG_YES)); lcd_set_cursor(0, 2); lcd_print(' '); lcd_set_cursor(0, 3); lcd_print(' '); @@ -7654,7 +7603,7 @@ bool lcd_selftest() #endif //IR_SENSOR_ANALOG lcd_wait_for_cool_down(); lcd_clear(); - lcd_set_cursor(0, 0); lcd_puts_P(_i("Self test start "));////MSG_SELFTEST_START c=20 + lcd_puts_at_P(0, 0, _i("Self test start "));////MSG_SELFTEST_START c=20 #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 @@ -8328,106 +8277,79 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const lcd_clear(); - lcd_set_cursor(0, 0); - lcd_puts_P(_i("Selftest error !"));////MSG_SELFTEST_ERROR - lcd_set_cursor(0, 1); - lcd_puts_P(_i("Please check :"));////MSG_SELFTEST_PLEASECHECK + lcd_puts_at_P(0, 0, _i("Selftest error !"));////MSG_SELFTEST_ERROR + lcd_puts_at_P(0, 1, _i("Please check :"));////MSG_SELFTEST_PLEASECHECK switch (testError) { case TestError::Heater: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR - lcd_set_cursor(0, 3); - lcd_puts_P(_i("Not connected"));////MSG_SELFTEST_NOTCONNECTED + lcd_puts_at_P(0, 2, _i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR + lcd_puts_at_P(0, 3, _i("Not connected"));////MSG_SELFTEST_NOTCONNECTED break; case TestError::Bed: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); + lcd_puts_at_P(0, 2, _i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER + lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR)); break; case TestError::Endstops: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Endstops"));////MSG_SELFTEST_ENDSTOPS - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); + lcd_puts_at_P(0, 2, _i("Endstops"));////MSG_SELFTEST_ENDSTOPS + lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR)); lcd_set_cursor(17, 3); lcd_print(_error_1); break; case TestError::Motor: - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_SELFTEST_MOTOR)); + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_MOTOR)); lcd_set_cursor(18, 2); lcd_print(_error_1); - lcd_set_cursor(0, 3); - lcd_puts_P(_i("Endstop"));////MSG_SELFTEST_ENDSTOP + lcd_puts_at_P(0, 3, _i("Endstop"));////MSG_SELFTEST_ENDSTOP lcd_set_cursor(18, 3); lcd_print(_error_2); break; case TestError::Endstop: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Endstop not hit"));////MSG_SELFTEST_ENDSTOP_NOTHIT c=20 - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_MOTOR)); + lcd_puts_at_P(0, 2, _i("Endstop not hit"));////MSG_SELFTEST_ENDSTOP_NOTHIT c=20 + lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_MOTOR)); lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::PrintFan: - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_SELFTEST_COOLING_FAN)); - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_COOLING_FAN)); + lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR)); lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::ExtruderFan: - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_SELFTEST_EXTRUDER_FAN)); - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_EXTRUDER_FAN)); + lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR)); lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::Pulley: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Loose pulley"));////MSG_LOOSE_PULLEY c=20 r=1 - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_MOTOR)); + lcd_puts_at_P(0, 2, _i("Loose pulley"));////MSG_LOOSE_PULLEY c=20 r=1 + lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_MOTOR)); lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::Axis: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH - lcd_set_cursor(0, 3); - lcd_puts_P(_i("Axis"));////MSG_SELFTEST_AXIS + lcd_puts_at_P(0, 2, _i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH + lcd_puts_at_P(0, 3, _i("Axis"));////MSG_SELFTEST_AXIS lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::SwappedFan: - lcd_set_cursor(0, 2); - lcd_puts_P(_i("Front/left fans"));////MSG_SELFTEST_FANS - lcd_set_cursor(0, 3); - lcd_puts_P(_i("Swapped"));////MSG_SELFTEST_SWAPPED + lcd_puts_at_P(0, 2, _i("Front/left fans"));////MSG_SELFTEST_FANS + lcd_puts_at_P(0, 3, _i("Swapped"));////MSG_SELFTEST_SWAPPED lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::WiringFsensor: - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); - lcd_set_cursor(0, 3); - lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_puts_at_P(0, 3, _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 + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_puts_at_P(0, 3, _i("False triggering"));////c=20 break; case TestError::FsensorLevel: - lcd_set_cursor(0, 2); - lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_FILAMENT_SENSOR)); lcd_set_cursor(0, 3); lcd_printf_P(_i("%s level expected"),_error_1);////c=20 break; @@ -8536,22 +8458,18 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, bool _result = check_opposite; lcd_clear(); - lcd_set_cursor(0, 0); lcd_puts_P(_T(MSG_SELFTEST_FAN)); + lcd_puts_at_P(0, 0, _T(MSG_SELFTEST_FAN)); switch (_fan) { case 0: // extruder cooling fan - lcd_set_cursor(0, 1); - if(check_opposite == true) lcd_puts_P(_T(MSG_SELFTEST_COOLING_FAN)); - else lcd_puts_P(_T(MSG_SELFTEST_EXTRUDER_FAN)); + lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_COOLING_FAN) : _T(MSG_SELFTEST_EXTRUDER_FAN)); setExtruderAutoFanState(3); break; case 1: // object cooling fan - lcd_set_cursor(0, 1); - if (check_opposite == true) lcd_puts_P(_T(MSG_SELFTEST_EXTRUDER_FAN)); - else lcd_puts_P(_T(MSG_SELFTEST_COOLING_FAN)); + lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_EXTRUDER_FAN) : _T(MSG_SELFTEST_COOLING_FAN)); SET_OUTPUT(FAN_PIN); #ifdef FAN_SOFT_PWM fanSpeedSoftPwm = 255; @@ -8563,9 +8481,9 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, } _delay(500); - lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_SELFTEST_FAN_YES)); + lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_set_cursor(0, 3); lcd_print('>'); - lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); + lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); int8_t enc_dif = int(_default)*3; @@ -8578,17 +8496,17 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, if (enc_dif > lcd_encoder_diff) { _result = !check_opposite; lcd_set_cursor(0, 2); lcd_print('>'); - lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_SELFTEST_FAN_YES)); + lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_set_cursor(0, 3); lcd_print(' '); - lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); + lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } if (enc_dif < lcd_encoder_diff) { _result = check_opposite; lcd_set_cursor(0, 2); lcd_print(' '); - lcd_set_cursor(1, 2); lcd_puts_P(_T(MSG_SELFTEST_FAN_YES)); + lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); lcd_set_cursor(0, 3); lcd_print('>'); - lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); + lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } enc_dif = 0; lcd_encoder_diff = 0; From 37c431abd9076e3243047aebe369fa14f14d8da0 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 19:44:46 +0200 Subject: [PATCH 162/218] another lcd_puts_at_P --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d7319c3ab..f37ff5d9e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -8654,8 +8654,7 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s if (screen == TestScreen::Failed) lcd_puts_P(_T(MSG_SELFTEST_FAILED)); if (screen == TestScreen::Home) lcd_puts_P(_i("Calibrating home"));////c=20 r=1 - lcd_set_cursor(0, 1); - lcd_puts_P(separator); + lcd_puts_at_P(0, 1, separator); if ((screen >= TestScreen::ExtruderFan) && (screen <= TestScreen::FansOk)) { //SERIAL_ECHOLNPGM("Fan test"); From 4d3f056b810008ea736b70757ef6b3e00f74ce37 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 20:07:27 +0200 Subject: [PATCH 163/218] Fix factory reset menu rendering --- Firmware/ultralcd.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f37ff5d9e..2290c02a6 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6171,17 +6171,9 @@ char reset_menu() { int8_t enc_dif = 0; char cursor_pos = 0; - static const char iLa[] PROGMEM = "Language"; - static const char iSt[] PROGMEM = "Statistics"; - static const char iSh[] PROGMEM = "Shipping prep"; - static const char iAl[] PROGMEM = "All Data"; + const char *const item[items_no] PROGMEM = {PSTR("Language"), PSTR("Statistics"), PSTR("Shipping prep"), PSTR("All Data") #ifdef SNMM - static const char iBl[] PROGMEM = "Bowden length"; -#endif - - static const char *const item [items_no] PROGMEM = { iLa, iSt, iSh, iAl -#ifdef SNMM - , iBl + , PSTR("Bowden length") #endif }; From 31a6270f69b7ac8bd1ccfc4c3c3a140c67fe6278 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 20:12:11 +0200 Subject: [PATCH 164/218] Abuse \n in lcd printing instead of constantly calling other functions "other functions" being lcd_set_cursor and lcd_print(char). Saves 100B of flash --- Firmware/ultralcd.cpp | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2290c02a6..c33f47bed 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2724,12 +2724,7 @@ void lcd_alright() { cursor_pos = 1; Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } - lcd_set_cursor(0, 1); - lcd_print(' '); - lcd_set_cursor(0, 2); - lcd_print(' '); - lcd_set_cursor(0, 3); - lcd_print(' '); + lcd_puts_at_P(0, 1, PSTR(" \n \n ")); lcd_set_cursor(0, cursor_pos); lcd_print('>'); enc_dif = lcd_encoder_diff; @@ -5930,14 +5925,7 @@ void bowden_menu() { Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } - lcd_set_cursor(0, 0); - lcd_print(' '); - lcd_set_cursor(0, 1); - lcd_print(' '); - lcd_set_cursor(0, 2); - lcd_print(' '); - lcd_set_cursor(0, 3); - lcd_print(' '); + lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); lcd_set_cursor(0, cursor_pos); lcd_print('>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); @@ -6030,12 +6018,7 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } - lcd_set_cursor(0, 1); - lcd_print(' '); - lcd_set_cursor(0, 2); - lcd_print(' '); - lcd_set_cursor(0, 3); - lcd_print(' '); + lcd_puts_at_P(0, 1, PSTR(" \n \n ")); lcd_set_cursor(0, cursor_pos); lcd_print('>'); enc_dif = lcd_encoder_diff; @@ -6140,12 +6123,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (last_item&&last_visible) lcd_puts_at_P(1, 3, last_item); - lcd_set_cursor(0, 1); - lcd_print(' '); - lcd_set_cursor(0, 2); - lcd_print(' '); - lcd_set_cursor(0, 3); - lcd_print(' '); + lcd_puts_at_P(0, 1, PSTR(" \n \n ")); lcd_set_cursor(0, cursor_pos); lcd_print('>'); _delay(100); @@ -6219,16 +6197,9 @@ char reset_menu() { lcd_clear(); } } - lcd_set_cursor(0, 0); - lcd_space(1); - lcd_set_cursor(0, 1); - lcd_space(1); - lcd_set_cursor(0, 2); - lcd_space(1); - lcd_set_cursor(0, 3); - lcd_space(1); + lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); lcd_set_cursor(0, cursor_pos); - lcd_putc('>'); + lcd_putc('>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); From e8e4aabfdb2b16d1bffd4c04f1ad1a8d5c2e4cf5 Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Fri, 22 Jan 2021 21:07:14 +0200 Subject: [PATCH 165/218] Add gcode documentation --- Firmware/Marlin_main.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1a157668c..750f1d198 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5674,6 +5674,11 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) /*! ### M20 - SD Card file list M20: List SD card + #### Usage + + M20 [ L ] + #### Parameters + - `L` - Reports ling filenames instead of just short filenames. Requires host software parsing. */ case 20: SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST From 9bfada94f0cbd4f2224852b2eedd4c5d68d9e156 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 25 Jan 2021 08:38:44 +0100 Subject: [PATCH 166/218] Remove commented code --- Firmware/Marlin_main.cpp | 28 ++----- Firmware/ultralcd.cpp | 159 +-------------------------------------- 2 files changed, 7 insertions(+), 180 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5929273db..907839434 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -714,10 +714,8 @@ static void factory_reset(char level) // Force the "Follow calibration flow" message at the next boot up. calibration_status_store(CALIBRATION_STATUS_Z_CALIBRATION); eeprom_write_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); //run wizard -// farm_no = 0; farm_mode = false; eeprom_update_byte((uint8_t*)EEPROM_FARM_MODE, farm_mode); -// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); eeprom_update_dword((uint32_t *)EEPROM_TOTALTIME, 0); eeprom_update_dword((uint32_t *)EEPROM_FILAMENTUSED, 0); @@ -1051,10 +1049,8 @@ void setup() setup_powerhold(); farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE); -// EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); - if ((farm_mode == 0xFF /*&& farm_no == 0*/) /*|| ((uint16_t)farm_no == 0xFFFF)*/) + if (farm_mode == 0xFF) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode -// if ((uint16_t)farm_no == 0xFFFF) farm_no = 0; if (farm_mode) { no_response = true; //we need confirmation by recieving PRUSA thx @@ -1370,9 +1366,7 @@ void setup() #endif farm_mode = eeprom_read_byte((uint8_t*)EEPROM_FARM_MODE); -// EEPROM_read_B(EEPROM_FARM_NUMBER, &farm_no); - if ((farm_mode == 0xFF /*&& farm_no == 0*/) /*|| (farm_no == static_cast(0xFFFF))*/) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode -// if (farm_no == static_cast(0xFFFF)) farm_no = 0; + if (farm_mode == 0xFF) farm_mode = false; //if farm_mode has not been stored to eeprom yet and farm number is set to zero or EEPROM is fresh, deactivate farm mode if (farm_mode) { prusa_statistics(8); @@ -3883,7 +3877,6 @@ void process_commands() if (code_seen("Ping")) { // PRUSA Ping if (farm_mode) { PingTime = _millis(); - //MYSERIAL.print(farm_no); MYSERIAL.println(": OK"); } } else if (code_seen("PRN")) { // PRUSA PRN @@ -3893,15 +3886,7 @@ void process_commands() gcode_PRUSA_BadRAMBoFanTest(); }else if (code_seen("FAN")) { // PRUSA FAN printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]); - }/*else if (code_seen("fn")) { // PRUSA fn - if (farm_mode) { - printf_P(_N("%d"), farm_no); - } - else { - puts_P(_N("Not in farm mode.")); - } - - }*/ + } else if (code_seen("thx")) // PRUSA thx { no_response = false; @@ -5556,10 +5541,9 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) farm_mode = 1; PingTime = _millis(); eeprom_update_byte((unsigned char *)EEPROM_FARM_MODE, farm_mode); -// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); - SilentModeMenu = SILENT_MODE_OFF; - eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu); - fCheckModeInit(); // alternatively invoke printer reset + SilentModeMenu = SILENT_MODE_OFF; + eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu); + fCheckModeInit(); // alternatively invoke printer reset break; /*! ### G99 - Deactivate farm mode G99: Deactivate farm mode diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 62585c064..ed9e6fc94 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -136,7 +136,6 @@ static void prusa_stat_farm_number(); static void prusa_stat_diameter(); static void prusa_stat_temperatures(); static void prusa_stat_printinfo(); -//static void lcd_farm_no(); static void lcd_menu_xyz_y_min(); static void lcd_menu_xyz_skew(); static void lcd_menu_xyz_offset(); @@ -1453,7 +1452,6 @@ void lcd_commands() if (lcd_commands_step == 1 && !blocks_queued()) { -// lcd_confirm_print(); lcd_commands_step = 0; lcd_commands_type = LcdCommands::Idle; } @@ -5800,7 +5798,6 @@ static void lcd_settings_menu() if (farm_mode) { -// MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); MENU_ITEM_FUNCTION_P(PSTR("Disable farm mode"), lcd_disable_farm_mode); } @@ -6432,74 +6429,6 @@ void unload_filament() } -/*static void lcd_farm_no() -{ - char step = 0; - int enc_dif = 0; - int _farmno = farm_no; - int _ret = 0; - lcd_clear(); - - lcd_set_cursor(0, 0); - lcd_print("Farm no"); - - do - { - - if (abs((enc_dif - lcd_encoder_diff)) > 2) { - if (enc_dif > lcd_encoder_diff) { - switch (step) { - case(0): if (_farmno >= 100) _farmno -= 100; break; - case(1): if (_farmno % 100 >= 10) _farmno -= 10; break; - case(2): if (_farmno % 10 >= 1) _farmno--; break; - default: break; - } - } - - if (enc_dif < lcd_encoder_diff) { - switch (step) { - case(0): if (_farmno < 900) _farmno += 100; break; - case(1): if (_farmno % 100 < 90) _farmno += 10; break; - case(2): if (_farmno % 10 <= 8)_farmno++; break; - default: break; - } - } - enc_dif = 0; - lcd_encoder_diff = 0; - } - - lcd_set_cursor(0, 2); - if (_farmno < 100) lcd_print("0"); - if (_farmno < 10) lcd_print("0"); - lcd_print(_farmno); - lcd_print(" "); - lcd_set_cursor(0, 3); - lcd_print(" "); - - - lcd_set_cursor(step, 3); - lcd_print("^"); - _delay(100); - - if (lcd_clicked()) - { - _delay(200); - step++; - if(step == 3) { - _ret = 1; -// farm_no = _farmno; -// EEPROM_save_B(EEPROM_FARM_NUMBER, &farm_no); - prusa_statistics(20); - lcd_return_to_status(); - } - } - - manage_heater(); - } while (_ret == 0); - -}*/ - - unsigned char lcd_choose_color() { //function returns index of currently chosen item //following part can be modified from 2 to 255 items: @@ -6584,85 +6513,6 @@ unsigned char lcd_choose_color() { } -/*void lcd_confirm_print() -{ - uint8_t filament_type; - int enc_dif = 0; - int cursor_pos = 1; - int _ret = 0; - int _t = 0; - - enc_dif = lcd_encoder_diff; - lcd_clear(); - - lcd_set_cursor(0, 0); - lcd_print("Print ok ?"); - - do - { - if (abs(enc_dif - lcd_encoder_diff) > 12) { - if (enc_dif > lcd_encoder_diff) { - cursor_pos--; - } - - if (enc_dif < lcd_encoder_diff) { - cursor_pos++; - } - enc_dif = lcd_encoder_diff; - } - - if (cursor_pos > 2) { cursor_pos = 2; } - if (cursor_pos < 1) { cursor_pos = 1; } - - lcd_set_cursor(0, 2); lcd_print(" "); - lcd_set_cursor(0, 3); lcd_print(" "); - lcd_set_cursor(2, 2); - lcd_puts_P(_T(MSG_YES)); - lcd_set_cursor(2, 3); - lcd_puts_P(_T(MSG_NO)); - lcd_set_cursor(0, 1 + cursor_pos); - lcd_print(">"); - _delay(100); - - _t = _t + 1; - if (_t>100) - { - prusa_statistics(99); - _t = 0; - } - if (lcd_clicked()) - { - filament_type = FARM_FILAMENT_COLOR_NONE; - if (cursor_pos == 1) - { - _ret = 1; -// filament_type = lcd_choose_color(); - prusa_statistics(4, filament_type); - no_response = true; //we need confirmation by recieving PRUSA thx - important_status = 4; - saved_filament_type = filament_type; - NcTime = _millis(); - } - if (cursor_pos == 2) - { - _ret = 2; -// filament_type = lcd_choose_color(); - prusa_statistics(5, filament_type); - no_response = true; //we need confirmation by recieving PRUSA thx - important_status = 5; - saved_filament_type = filament_type; - NcTime = _millis(); - } - } - - manage_heater(); - manage_inactivity(); - proc_commands(); - - } while (_ret == 0); - -}*/ - #include "w25x20cl.h" #ifdef LCD_TEST @@ -6943,14 +6793,7 @@ static void lcd_main_menu() } - if (IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) - { -// if (farm_mode) -// { -// MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no); -// } - } - else + if ( ! ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal) ) ) { if (mmu_enabled) { From 6a62674bd8a6640f7e25e82ad6f351deb8d839f4 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 25 Jan 2021 08:43:37 +0100 Subject: [PATCH 167/218] Keep PRUSA RESET available even in non-farm mode --- Firmware/Marlin_main.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6e4bf1446..196e3a590 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3910,11 +3910,7 @@ void process_commands() #endif //defined(W25X20CL) && defined(BOOTAPP) softReset(); #else //WATCHDOG - // careful! - if (farm_mode) - asm volatile("jmp 0x3E000"); - else - puts_P(PSTR("Not in farm mode.")); + asm volatile("jmp 0x3E000"); #endif //WATCHDOG }else if (code_seen("fv")) { // PRUSA fv // get file version From 9fa9d6b0631c86875129b14a93ef84fc51cac55c Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Mon, 25 Jan 2021 09:48:17 +0200 Subject: [PATCH 168/218] Move farm strings to PROGMEM --- Firmware/ultralcd.cpp | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6ca163dfd..905ce3112 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3997,7 +3997,7 @@ void lcd_menu_show_sensors_state() // NOT static due to using ins } void prusa_statistics_err(char c){ - SERIAL_ECHO("{[ERR:"); + SERIAL_ECHOPGM("{[ERR:"); SERIAL_ECHO(c); SERIAL_ECHO(']'); prusa_stat_farm_number(); @@ -4082,7 +4082,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { return; break; case 4: // print succesfull - SERIAL_ECHO("{[RES:1][FIL:"); + SERIAL_ECHOPGM("{[RES:1][FIL:"); MYSERIAL.print(int(_fil_nr)); SERIAL_ECHO(']'); prusa_stat_printerstatus(status_number); @@ -4090,7 +4090,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { farm_timer = 2; break; case 5: // print not succesfull - SERIAL_ECHO("{[RES:0][FIL:"); + SERIAL_ECHOPGM("{[RES:0][FIL:"); MYSERIAL.print(int(_fil_nr)); SERIAL_ECHO(']'); prusa_stat_printerstatus(status_number); @@ -4098,19 +4098,19 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { farm_timer = 2; break; case 6: // print done - SERIAL_ECHO("{[PRN:8]"); + SERIAL_ECHOPGM("{[PRN:8]"); prusa_stat_farm_number(); status_number = 8; farm_timer = 2; break; case 7: // print done - stopped - SERIAL_ECHO("{[PRN:9]"); + SERIAL_ECHOPGM("{[PRN:9]"); prusa_stat_farm_number(); status_number = 9; farm_timer = 2; break; case 8: // printer started - SERIAL_ECHO("{[PRN:0][PFN:"); + SERIAL_ECHOPGM("{[PRN:0][PFN:"); status_number = 0; SERIAL_ECHO(farm_no); SERIAL_ECHO(']'); @@ -4129,7 +4129,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { prusa_stat_printerstatus(status_number); break; case 22: // waiting for filament change - SERIAL_ECHO("{[PRN:5]"); + SERIAL_ECHOPGM("{[PRN:5]"); prusa_stat_farm_number(); status_number = 5; break; @@ -4148,9 +4148,9 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { break; case 99: // heartbeat - SERIAL_ECHO("{[PRN:99]"); + SERIAL_ECHOPGM("{[PRN:99]"); prusa_stat_temperatures(); - SERIAL_ECHO("[PFN:"); + SERIAL_ECHOPGM("[PFN:"); SERIAL_ECHO(farm_no); SERIAL_ECHO(']'); @@ -4162,47 +4162,47 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { static void prusa_stat_printerstatus(int _status) { - SERIAL_ECHO("[PRN:"); + SERIAL_ECHOPGM("[PRN:"); SERIAL_ECHO(_status); SERIAL_ECHO(']'); } static void prusa_stat_farm_number() { - SERIAL_ECHO("[PFN:"); + SERIAL_ECHOPGM("[PFN:"); SERIAL_ECHO(farm_no); SERIAL_ECHO(']'); } static void prusa_stat_diameter() { - SERIAL_ECHO("[DIA:"); + SERIAL_ECHOPGM("[DIA:"); SERIAL_ECHO(eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM)); SERIAL_ECHO(']'); } static void prusa_stat_temperatures() { - SERIAL_ECHO("[ST0:"); + SERIAL_ECHOPGM("[ST0:"); SERIAL_ECHO(target_temperature[0]); - SERIAL_ECHO("][STB:"); + SERIAL_ECHOPGM("][STB:"); SERIAL_ECHO(target_temperature_bed); - SERIAL_ECHO("][AT0:"); + SERIAL_ECHOPGM("][AT0:"); SERIAL_ECHO(current_temperature[0]); - SERIAL_ECHO("][ATB:"); + SERIAL_ECHOPGM("][ATB:"); SERIAL_ECHO(current_temperature_bed); SERIAL_ECHO(']'); } static void prusa_stat_printinfo() { - SERIAL_ECHO("[TFU:"); + SERIAL_ECHOPGM("[TFU:"); SERIAL_ECHO(total_filament_used); - SERIAL_ECHO("][PCD:"); + SERIAL_ECHOPGM("][PCD:"); SERIAL_ECHO(itostr3(card.percentDone())); - SERIAL_ECHO("][FEM:"); + SERIAL_ECHOPGM("][FEM:"); SERIAL_ECHO(itostr3(feedmultiply)); - SERIAL_ECHO("][FNM:"); + SERIAL_ECHOPGM("][FNM:"); SERIAL_ECHO(longFilenameOLD); - SERIAL_ECHO("][TIM:"); + SERIAL_ECHOPGM("][TIM:"); if (starttime != 0) { SERIAL_ECHO(_millis() / 1000 - starttime / 1000); @@ -4211,7 +4211,7 @@ static void prusa_stat_printinfo() { SERIAL_ECHO(0); } - SERIAL_ECHO("][FWR:"); + SERIAL_ECHOPGM("][FWR:"); SERIAL_ECHO(FW_VERSION); SERIAL_ECHO(']'); prusa_stat_diameter(); From 4f769f0faa7487cb24d342e3baad9e3ac4196b8b Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Mon, 25 Jan 2021 09:58:12 +0200 Subject: [PATCH 169/218] PRUSA RESET safety precaution --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 196e3a590..d57c6c55e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3909,9 +3909,9 @@ void process_commands() boot_app_flags = BOOT_APP_FLG_RUN; #endif //defined(W25X20CL) && defined(BOOTAPP) softReset(); -#else //WATCHDOG +#elif defined(BOOTAPP) //this is a safety precaution. This is because the new bootloader turns off the heaters, but the old one doesn't. The watchdog should be used most of the time. asm volatile("jmp 0x3E000"); -#endif //WATCHDOG +#endif }else if (code_seen("fv")) { // PRUSA fv // get file version #ifdef SDSUPPORT From c1ff6242b07488cb6bf5811030a92fe439c0570c Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 25 Jan 2021 09:03:04 +0100 Subject: [PATCH 170/218] Avoid copying FW version number into RAM - use the PROGMEM string --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d57c6c55e..4c14cc3bf 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8218,7 +8218,7 @@ Sigma_Exit: if(code_seen('P')) fw_version_check(++strchr_pointer); else if(code_seen('Q')) - SERIAL_PROTOCOLLN(FW_VERSION); + SERIAL_PROTOCOLLNRPGM(FW_VERSION_STR_P()); break; case ClPrintChecking::_Gcode: // ~ .5 if(code_seen('P')) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 905ce3112..c7ebbbbe0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4212,7 +4212,7 @@ static void prusa_stat_printinfo() SERIAL_ECHO(0); } SERIAL_ECHOPGM("][FWR:"); - SERIAL_ECHO(FW_VERSION); + SERIAL_ECHORPGM(FW_VERSION_STR_P()); SERIAL_ECHO(']'); prusa_stat_diameter(); } From 2b3729125d51d250ead7eb2364f0a03fc4c8563b Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Mon, 25 Jan 2021 11:46:51 +0200 Subject: [PATCH 171/218] Prevent wdt reset during file listing --- Firmware/Marlin_main.cpp | 1 + Firmware/cardreader.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 750f1d198..a86782df9 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5681,6 +5681,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) - `L` - Reports ling filenames instead of just short filenames. Requires host software parsing. */ case 20: + KEEPALIVE_STATE(NOT_BUSY); // do not send busy messages during listing. Inhibits the output of manage_heater() SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST card.ls(code_seen('L')); SERIAL_PROTOCOLLNRPGM(_N("End file list"));////MSG_END_FILE_LIST diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index b8dffb3e3..7005e6500 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -133,6 +133,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m printf_P(PSTR("\"%s\" "), LONGEST_FILENAME); SERIAL_PROTOCOLLN(p.fileSize); + manage_heater(); break; case LS_GetFilename: From 514321f2ce497cd8fffccf47a90f9905f1a76581 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 25 Jan 2021 11:09:28 +0100 Subject: [PATCH 172/218] Remove farm_no completely + reuse prusa_stat_farm_number() where applicable --- Firmware/ultralcd.cpp | 14 ++++---------- Firmware/ultralcd.h | 3 --- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c7ebbbbe0..2f4860afa 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4110,10 +4110,9 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { farm_timer = 2; break; case 8: // printer started - SERIAL_ECHOPGM("{[PRN:0][PFN:"); + SERIAL_ECHOPGM("{[PRN:0]"); + prusa_stat_farm_number(); status_number = 0; - SERIAL_ECHO(farm_no); - SERIAL_ECHO(']'); farm_timer = 2; break; case 20: // echo farm no @@ -4150,10 +4149,7 @@ void prusa_statistics(int _message, uint8_t _fil_nr) { case 99: // heartbeat SERIAL_ECHOPGM("{[PRN:99]"); prusa_stat_temperatures(); - SERIAL_ECHOPGM("[PFN:"); - SERIAL_ECHO(farm_no); - SERIAL_ECHO(']'); - + prusa_stat_farm_number(); break; } SERIAL_ECHOLN('}'); @@ -4168,9 +4164,7 @@ static void prusa_stat_printerstatus(int _status) } static void prusa_stat_farm_number() { - SERIAL_ECHOPGM("[PFN:"); - SERIAL_ECHO(farm_no); - SERIAL_ECHO(']'); + SERIAL_ECHOPGM("[PFN:0]"); } static void prusa_stat_diameter() { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 6da57a918..e3e64fa53 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -47,7 +47,6 @@ void lcd_pause_print(); void lcd_resume_print(); void lcd_print_stop(); void prusa_statistics(int _message, uint8_t _col_nr = 0); -//void lcd_confirm_print(); unsigned char lcd_choose_color(); void lcd_load_filament_color_check(); //void lcd_mylang(); @@ -127,8 +126,6 @@ extern CustomMsg custom_message_type; extern unsigned int custom_message_state; extern uint8_t farm_mode; -// Farmers request removal of farm_no from the FW -constexpr const int farm_no = 0; extern int farm_timer; extern uint8_t farm_status; From 783e4bbaf95a4bda25abb8045542ab8c79c3f526 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 25 Jan 2021 14:58:57 +0100 Subject: [PATCH 173/218] Add lcd_putc_at (code down >150B), refactor lcd_selftest_screen_step (RAM down 10B) --- Firmware/cardreader.cpp | 6 +- Firmware/lcd.cpp | 8 ++- Firmware/lcd.h | 5 +- Firmware/ultralcd.cpp | 132 +++++++++++++++------------------------- 4 files changed, 63 insertions(+), 88 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 94077f4cd..566347efe 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -873,8 +873,7 @@ void CardReader::presort() { for (int column = 0; column < 20; column++) { if (column < (percent / 5)) { - lcd_set_cursor(column, 2); - lcd_print('\x01'); //simple progress bar + lcd_putc_at(column, 2, '\x01'); //simple progress bar } } counter++; @@ -952,8 +951,7 @@ void CardReader::presort() { #if !SDSORT_USES_RAM //show progresss bar only if slow sorting method is used for (int column = 0; column <= 19; column++) { - lcd_set_cursor(column, 2); - lcd_print('\x01'); //simple progress bar + lcd_putc_at(column, 2, '\x01'); //simple progress bar } _delay(300); lcd_set_degree(); diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 3e39312c1..0212a9dfe 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -486,11 +486,17 @@ void lcd_escape_write(uint8_t chr) #endif //VT100 -int lcd_putc(int c) +int lcd_putc(char c) { return fputc(c, lcdout); } +int lcd_putc_at(uint8_t c, uint8_t r, char ch) +{ + lcd_set_cursor(c, r); + return fputc(ch, lcdout); +} + int lcd_puts_P(const char* str) { return fputs_P(str, lcdout); diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 790c0a955..6b1e42b71 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -40,7 +40,10 @@ extern void lcd_set_cursor(uint8_t col, uint8_t row); extern void lcd_createChar_P(uint8_t, const uint8_t*); -extern int lcd_putc(int c); +// char c is non-standard, however it saves 1B on stack +extern int lcd_putc(char c); +extern int lcd_putc_at(uint8_t c, uint8_t r, char ch); + extern int lcd_puts_P(const char* str); extern int lcd_puts_at_P(uint8_t c, uint8_t r, const char* str); extern int lcd_printf_P(const char* format, ...); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e85d0ee9c..0d4149daf 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -339,11 +339,9 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* uint8_t n = LCD_WIDTH - 1; for(uint_least8_t g = 0; g<4;g++){ - lcd_set_cursor(0, g); - lcd_print(' '); + lcd_putc_at(0, g, ' '); } - lcd_set_cursor(0, row); - lcd_print('>'); + lcd_putc_at(0, row, '>'); if (longFilename[0] == '\0') { @@ -394,8 +392,7 @@ static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* filename { char c; uint8_t n = LCD_WIDTH - 1; - lcd_set_cursor(0, row); - lcd_print(' '); + lcd_putc_at(0, row, ' '); if (longFilename[0] != '\0') { filename = longFilename; @@ -414,8 +411,7 @@ static void lcd_implementation_drawmenu_sddirectory_selected(uint8_t row, const { char c; uint8_t n = LCD_WIDTH - 2; - lcd_set_cursor(0, row); - lcd_print('>'); + lcd_putc_at(0, row, '>'); lcd_print(LCD_STR_FOLDER[0]); if (longFilename[0] != '\0') { @@ -435,8 +431,7 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* fil { char c; uint8_t n = LCD_WIDTH - 2; - lcd_set_cursor(0, row); - lcd_print(' '); + lcd_putc_at(0, row, ' '); lcd_print(LCD_STR_FOLDER[0]); if (longFilename[0] != '\0') { @@ -738,8 +733,7 @@ void lcdui_print_status_line(void) for (unsigned int dots = 0; dots < heating_status_counter; dots++) { - lcd_set_cursor(7 + dots, 3); - lcd_print('.'); + lcd_putc_at(7 + dots, 3, '.'); } switch (heating_status) { @@ -2592,8 +2586,7 @@ void lcd_change_success() { static void lcd_loading_progress_bar(uint16_t loading_time_ms) { for (uint_least8_t i = 0; i < 20; i++) { - lcd_set_cursor(i, 3); - lcd_print('.'); + lcd_putc_at(i, 3, '.'); //loading_time_ms/20 delay for (uint_least8_t j = 0; j < 5; j++) { delay_keep_alive(loading_time_ms / 100); @@ -2657,9 +2650,7 @@ void lcd_alright() { lcd_puts_at_P(1, 1, _T(MSG_YES)); lcd_puts_at_P(1, 2, _i("Filament not loaded"));////MSG_NOT_LOADED c=19 lcd_puts_at_P(1, 3, _i("Color not correct"));////MSG_NOT_COLOR - lcd_set_cursor(0, 1); - - lcd_print('>'); + lcd_putc_at(0, 1, '>'); enc_dif = lcd_encoder_diff; @@ -2690,8 +2681,7 @@ void lcd_alright() { Sound_MakeSound(e_SOUND_TYPE_BlindAlert); } lcd_puts_at_P(0, 1, PSTR(" \n \n ")); - lcd_set_cursor(0, cursor_pos); - lcd_print('>'); + lcd_putc_at(0, cursor_pos, '>'); enc_dif = lcd_encoder_diff; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); _delay(100); @@ -3677,15 +3667,13 @@ int8_t lcd_show_multiscreen_message_two_choices_and_wait_P(const char *msg, bool lcd_set_cursor(0, 3); if (enc_dif < lcd_encoder_diff && yes) { lcd_print(' '); - lcd_set_cursor(7, 3); - lcd_print('>'); + lcd_putc_at(7, 3, '>'); yes = false; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else if (enc_dif > lcd_encoder_diff && !yes) { lcd_print('>'); - lcd_set_cursor(7, 3); - lcd_print(' '); + lcd_putc_at(7, 3, ' '); yes = true; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } @@ -3736,15 +3724,13 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow lcd_display_message_fullscreen_P(msg); if (default_yes) { - lcd_set_cursor(0, 2); - lcd_print('>'); + lcd_putc_at(0, 2, '>'); lcd_puts_P(_T(MSG_YES)); lcd_puts_at_P(1, 3, _T(MSG_NO)); } else { lcd_puts_at_P(1, 2, _T(MSG_YES)); - lcd_set_cursor(0, 3); - lcd_print('>'); + lcd_putc_at(0, 3, '>'); lcd_puts_P(_T(MSG_NO)); } int8_t retval = default_yes ? true : false; @@ -3766,16 +3752,14 @@ int8_t lcd_show_fullscreen_message_yes_no_and_wait_P(const char *msg, bool allow lcd_set_cursor(0, 2); if (enc_dif < lcd_encoder_diff && retval) { lcd_print(' '); - lcd_set_cursor(0, 3); - lcd_print('>'); + lcd_putc_at(0, 3, '>'); retval = 0; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } else if (enc_dif > lcd_encoder_diff && !retval) { lcd_print('>'); - lcd_set_cursor(0, 3); - lcd_print(' '); + lcd_putc_at(0, 3, ' '); retval = 1; Sound_MakeSound(e_SOUND_TYPE_EncoderMove); } @@ -5846,8 +5830,7 @@ void bowden_menu() { int enc_dif = lcd_encoder_diff; int cursor_pos = 0; lcd_clear(); - lcd_set_cursor(0, 0); - lcd_print('>'); + lcd_putc_at(0, 0, '>'); for (uint_least8_t i = 0; i < 4; i++) { lcd_puts_at_P(1, i, PSTR("Extruder ")); lcd_print(i); @@ -5884,8 +5867,7 @@ void bowden_menu() { } lcd_puts_at_P(0, 0, PSTR(" \n \n \n ")); - lcd_set_cursor(0, cursor_pos); - lcd_print('>'); + lcd_putc_at(0, cursor_pos, '>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); @@ -5928,8 +5910,7 @@ void bowden_menu() { lcd_update_enable(true); lcd_clear(); enc_dif = lcd_encoder_diff; - lcd_set_cursor(0, cursor_pos); - lcd_print('>'); + lcd_putc_at(0, cursor_pos, '>'); for (uint_least8_t i = 0; i < 4; i++) { lcd_puts_at_P(1, i, PSTR("Extruder ")); lcd_print(i); @@ -6082,8 +6063,7 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (last_item&&last_visible) lcd_puts_at_P(1, 3, last_item); lcd_puts_at_P(0, 1, PSTR(" \n \n ")); - lcd_set_cursor(0, cursor_pos); - lcd_print('>'); + lcd_putc_at(0, cursor_pos, '>'); _delay(100); if (lcd_clicked()) @@ -6370,8 +6350,7 @@ unsigned char lcd_choose_color() { unsigned char cursor_pos = 1; enc_dif = lcd_encoder_diff; lcd_clear(); - lcd_set_cursor(0, 1); - lcd_print('>'); + lcd_putc_at(0, 1, '>'); active_rows = items_no < 3 ? items_no : 3; lcd_consume_click(); @@ -6412,14 +6391,10 @@ unsigned char lcd_choose_color() { lcd_clear(); } } - lcd_set_cursor(0, 1); - lcd_print(' '); - lcd_set_cursor(0, 2); - lcd_print(' '); - lcd_set_cursor(0, 3); - lcd_print(' '); - lcd_set_cursor(0, cursor_pos); - lcd_print('>'); + lcd_putc_at(0, 1, ' '); + lcd_putc_at(0, 2, ' '); + lcd_putc_at(0, 3, ' '); + lcd_putc_at(0, cursor_pos, '>'); Sound_MakeSound(e_SOUND_TYPE_EncoderMove); enc_dif = lcd_encoder_diff; _delay(100); @@ -7170,14 +7145,13 @@ void lcd_sdcard_stop() lcd_puts_at_P(0, 0, _T(MSG_STOP_PRINT)); lcd_puts_at_P(2, 2, _T(MSG_NO)); lcd_puts_at_P(2, 3, _T(MSG_YES)); - lcd_set_cursor(0, 2); lcd_print(' '); - lcd_set_cursor(0, 3); lcd_print(' '); + lcd_putc_at(0, 2, ' '); + lcd_putc_at(0, 3, ' '); if ((int32_t)lcd_encoder > 2) { lcd_encoder = 2; } if ((int32_t)lcd_encoder < 1) { lcd_encoder = 1; } - lcd_set_cursor(0, 1 + lcd_encoder); - lcd_print('>'); + lcd_putc_at(0, 1 + lcd_encoder, '>'); if (lcd_clicked()) { @@ -8254,7 +8228,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, _delay(500); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); - lcd_set_cursor(0, 3); lcd_print('>'); + lcd_putc_at(0, 3, '>'); lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); int8_t enc_dif = int(_default)*3; @@ -8267,17 +8241,17 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, if (abs((enc_dif - lcd_encoder_diff)) > 2) { if (enc_dif > lcd_encoder_diff) { _result = !check_opposite; - lcd_set_cursor(0, 2); lcd_print('>'); + lcd_putc_at(0, 2, '>'); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); - lcd_set_cursor(0, 3); lcd_print(' '); + lcd_putc_at(0, 3, ' '); lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } if (enc_dif < lcd_encoder_diff) { _result = check_opposite; - lcd_set_cursor(0, 2); lcd_print(' '); + lcd_putc_at(0, 2, ' '); lcd_puts_at_P(1, 2, _T(MSG_SELFTEST_FAN_YES)); - lcd_set_cursor(0, 3); lcd_print('>'); + lcd_putc_at(0, 3, '>'); lcd_puts_at_P(1, 3, _T(MSG_SELFTEST_FAN_NO)); } enc_dif = 0; @@ -8345,11 +8319,9 @@ static FanCheck lcd_selftest_fan_auto(int _fan) #endif //FAN_SOFT_PWM for (uint8_t i = 0; i < 5; i++) { delay_keep_alive(1000); - lcd_set_cursor(18, 3); - lcd_print('-'); + lcd_putc_at(18, 3, '-'); delay_keep_alive(1000); - lcd_set_cursor(18, 3); - lcd_print('|'); + lcd_putc_at(18, 3, '|'); } fanSpeed = 0; @@ -8372,11 +8344,9 @@ static FanCheck lcd_selftest_fan_auto(int _fan) for (uint8_t i = 0; i < 5; i++) { delay_keep_alive(1000); - lcd_set_cursor(18, 3); - lcd_print('-'); + lcd_putc_at(18, 3, '-'); delay_keep_alive(1000); - lcd_set_cursor(18, 3); - lcd_print('|'); + lcd_putc_at(18, 3, '|'); } fanSpeed = 0; @@ -8449,19 +8419,19 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s //SERIAL_ECHOLNPGM("Other tests"); TestScreen _step_block = TestScreen::AxisX; - lcd_selftest_screen_step(2, 2, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), "X", _indicator); + lcd_selftest_screen_step(2, 2, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), PSTR("X"), _indicator); _step_block = TestScreen::AxisY; - lcd_selftest_screen_step(2, 8, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), "Y", _indicator); + lcd_selftest_screen_step(2, 8, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), PSTR("Y"), _indicator); _step_block = TestScreen::AxisZ; - lcd_selftest_screen_step(2, 14, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), "Z", _indicator); + lcd_selftest_screen_step(2, 14, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), PSTR("Z"), _indicator); _step_block = TestScreen::Bed; - lcd_selftest_screen_step(3, 0, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), "Bed", _indicator); + lcd_selftest_screen_step(3, 0, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), PSTR("Bed"), _indicator); _step_block = TestScreen::Hotend; - lcd_selftest_screen_step(3, 9, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), "Hotend", _indicator); + lcd_selftest_screen_step(3, 9, ((screen == _step_block) ? 1 : (screen < _step_block) ? 0 : 2), PSTR("Hotend"), _indicator); } if (_delay > 0) delay_keep_alive(_delay); @@ -8470,28 +8440,26 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s return (_progress >= _progress_scale * 2) ? 0 : _progress; } -static void lcd_selftest_screen_step(int _row, int _col, int _state, const char *_name, const char *_indicator) +static void lcd_selftest_screen_step(int _row, int _col, int _state, const char *_name_PROGMEM, const char *_indicator) { lcd_set_cursor(_col, _row); + uint8_t strlenNameP = strlen_P(_name_PROGMEM); switch (_state) { case 1: - lcd_print(_name); - lcd_set_cursor(_col + strlen(_name), _row); - lcd_print(':'); - lcd_set_cursor(_col + strlen(_name) + 1, _row); + lcd_puts_P(_name_PROGMEM); + lcd_putc_at(_col + strlenNameP, _row, ':'); + lcd_set_cursor(_col + strlenNameP + 1, _row); lcd_print(_indicator); break; case 2: - lcd_print(_name); - lcd_set_cursor(_col + strlen(_name), _row); - lcd_print(':'); - lcd_set_cursor(_col + strlen(_name) + 1, _row); - lcd_print("OK"); + lcd_puts_P(_name_PROGMEM); + lcd_putc_at(_col + strlenNameP, _row, ':'); + lcd_puts_at_P(_col + strlenNameP + 1, _row, PSTR("OK")); break; default: - lcd_print(_name); + lcd_puts_P(_name_PROGMEM); } } From d8917a304a7bd50f094c2945816a7f4f377f4773 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Mon, 25 Jan 2021 15:21:25 +0100 Subject: [PATCH 174/218] Reuse lcd_space() instead of in-place printing of spaces in a cycle Saves another ~40B --- Firmware/ultralcd.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0d4149daf..d628afac0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -380,13 +380,11 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, const char* } } if(c!='\0'){ - lcd_set_cursor(i, row); - lcd_print(c); + lcd_putc_at(i, row, c); i++; } n=n-i+1; - while(n--) - lcd_print(' '); + lcd_space(n); } static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* filename, char* longFilename) { @@ -404,8 +402,7 @@ static void lcd_implementation_drawmenu_sdfile(uint8_t row, const char* filename filename++; n--; } - while(n--) - lcd_print(' '); + lcd_space(n); } static void lcd_implementation_drawmenu_sddirectory_selected(uint8_t row, const char* filename, char* longFilename) { @@ -424,8 +421,7 @@ static void lcd_implementation_drawmenu_sddirectory_selected(uint8_t row, const filename++; n--; } - while(n--) - lcd_print(' '); + lcd_space(n); } static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* filename, char* longFilename) { @@ -444,8 +440,7 @@ static void lcd_implementation_drawmenu_sddirectory(uint8_t row, const char* fil filename++; n--; } - while(n--) - lcd_print(' '); + lcd_space(n); } From 377a59c624ba332a82e72c5497d08cbb6776f25a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 15:53:31 +0100 Subject: [PATCH 175/218] Remove duplicate string `Belt status` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 6 +- lang/lang_en.txt | 2 +- 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 +- lang/po/Firmware.pot | 688 ++++++++++++++++++++--------------------- lang/po/Firmware_cs.po | 688 ++++++++++++++++++++--------------------- lang/po/Firmware_de.po | 688 ++++++++++++++++++++--------------------- lang/po/Firmware_es.po | 688 ++++++++++++++++++++--------------------- lang/po/Firmware_fr.po | 688 ++++++++++++++++++++--------------------- lang/po/Firmware_it.po | 688 ++++++++++++++++++++--------------------- lang/po/Firmware_pl.po | 688 ++++++++++++++++++++--------------------- 17 files changed, 2420 insertions(+), 2418 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 1c442b479..477213f09 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -16,6 +16,7 @@ const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); //// const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); //// const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=5 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8 +const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt Status");////c=18 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2 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 diff --git a/Firmware/messages.h b/Firmware/messages.h index cb8010225..8e5d733de 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -17,6 +17,7 @@ extern const char MSG_BED_DONE[]; extern const char MSG_BED_HEATING[]; extern const char MSG_BED_LEVELING_FAILED_POINT_LOW[]; extern const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[]; +extern const char MSG_BELT_STATUS[]; extern const char MSG_CALIBRATE_Z_AUTO[]; extern const char MSG_CARD_MENU[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0d4149daf..9683a333c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1957,7 +1957,7 @@ static void lcd_menu_voltages() static void lcd_menu_belt_status() { lcd_home(); - lcd_printf_P(PSTR("%S\n" " X %d\n" " Y %d"), _i("Belt status"), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); + lcd_printf_P(PSTR("%S\n" " X %d\n" " Y %d"), _T(MSG_BELT_STATUS), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)), eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y))); menu_back_if_clicked(); } #endif //TMC2130 @@ -2035,7 +2035,7 @@ static void lcd_preheat_menu() //! If TMC2130 defined //! //! @code{.unparsed} -//! | Belt status | MSG_MENU_BELT_STATUS +//! | Belt status | MSG_BELT_STATUS //! @endcode //! //! @code{.unparsed} @@ -2159,7 +2159,7 @@ static void lcd_support_menu() MENU_ITEM_SUBMENU_P(_i("Sensor info"), lcd_menu_show_sensors_state);////MSG_INFO_SENSORS c=18 r=1 #ifdef TMC2130 - MENU_ITEM_SUBMENU_P(_i("Belt status"), lcd_menu_belt_status);////MSG_MENU_BELT_STATUS c=18 + MENU_ITEM_SUBMENU_P(_T(MSG_BELT_STATUS), lcd_menu_belt_status);////MSG_BELT_STATUS c=18 #endif //TMC2130 MENU_ITEM_SUBMENU_P(_i("Temperatures"), lcd_menu_temperatures);////MSG_MENU_TEMPERATURES c=18 r=1 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 469084d10..82ca2c0df 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -103,7 +103,7 @@ #MSG_BED "Bed" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" #MSG_RECOVER_PRINT c=20 r=2 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index f0b4f3522..994e43504 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -138,7 +138,7 @@ "Bed" "Podlozka" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" "Stav remenu" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 289fcba93..ef06194bf 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -138,7 +138,7 @@ "Bed" "Bett" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" "Gurtstatus" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1bb0c968e..8f7e271fc 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -138,7 +138,7 @@ "Bed" "Base" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" "Estado de correa" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 612c9756e..3e7c082b2 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -138,7 +138,7 @@ "Bed" "Lit" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" "Statut courroie" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8bf6ad409..63cfc3970 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -138,7 +138,7 @@ "Bed" "Piano" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" "Stato cinghie" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 32027934e..52968d47f 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -138,7 +138,7 @@ "Bed" "Stol" -#MSG_MENU_BELT_STATUS c=18 +#MSG_BELT_STATUS c=18 "Belt status" "Stan paskow" diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index bd92a7ecd..3c4d6fee1 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: Fri Sep 18 15:22:18 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:22:18 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:49:41 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:49:41 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr "" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr "" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr "" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr "" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "" # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "" # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "" # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 +#: ultralcd.cpp:2735 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "" @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "" # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "" # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "" @@ -190,123 +190,123 @@ msgstr "" msgid "Bed" msgstr "" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "" # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "" # MSG_CRASHDETECT c=13 -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "" # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "" # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "" @@ -316,372 +316,372 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "" # MSG_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "" # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "" # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "" # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "" # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "" # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" # -#: mmu.cpp:727 +#: mmu.cpp:726 msgid "Fix the issue and then press button on MMU unit." msgstr "" # MSG_FLOW -#: ultralcd.cpp:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "" # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "" # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "" # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "" # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "" # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "" # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "" @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "" # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "" # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "" # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "" # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "" # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "" # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "" # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "" # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "" # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "" # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "" # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "" # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "" @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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:5067 +#: ultralcd.cpp:4977 msgid "Now I will preheat nozzle for PLA." msgstr "" # MSG_NOZZLE -#: messages.c:59 +#: messages.c:60 msgid "Nozzle" msgstr "" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" # -#: ultralcd.cpp:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "" # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "" # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "" # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 msgid "Please open idler and remove filament manually." msgstr "" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:62 msgid "Please place steel sheet on heatbed." msgstr "" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:65 msgid "Please press the knob to unload filament" msgstr "" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:67 msgid "Please pull out filament immediately" msgstr "" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 msgid "Please remove filament and then press the knob." msgstr "" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:70 +#: messages.c:71 msgid "Please remove steel sheet from heatbed." msgstr "" # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "" # MSG_PLEASE_WAIT c=20 -#: messages.c:62 +#: messages.c:63 msgid "Please wait" msgstr "" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 msgid "Please remove shipping helpers first." msgstr "" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:64 msgid "Preheat the nozzle!" msgstr "" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "" # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "" # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "" # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "" # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "" # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "" # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "" # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "" # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "" # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "" # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "" # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "" # MSG_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "" # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" # -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "" # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: cardreader.cpp:739 msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." msgstr "" # MSG_SORT -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "" # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "" # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" # MSG_STATISTICS -#: ultralcd.cpp:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "" # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "" # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "" # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "" # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "" # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "" # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "" # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "" # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "" # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 msgid "Waiting for nozzle and bed cooling" msgstr "" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t msgstr "" # MSG_CHANGED_BOTH c=20 r=4 -#: Marlin_main.cpp:1525 +#: Marlin_main.cpp:1573 msgid "Warning: both printer type and motherboard type changed." msgstr "" # MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: Marlin_main.cpp:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "" @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "" # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3902 +#: ultralcd.cpp:3822 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3899 +#: ultralcd.cpp:3819 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" # MSG_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 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:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "" # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "" # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "" # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "" # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "" # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "" # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "" @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "" # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "" @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "" # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index dda52924b..a2b4dad7c 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: Fri Sep 18 15:22:53 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:22:53 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:49:46 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:49:46 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr " 0.3 nebo starsi" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "FS 0.3 nebo starsi" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "FS 0.4 a novejsi" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "neznamy stav" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "Doladeni Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "Vse OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "Okoli" # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 +#: ultralcd.cpp:2735 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:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Zahrivani bedu" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "Korekce podlozky" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "Test remenu " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "Jasny" # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "Podsviceni" @@ -190,123 +190,123 @@ msgstr "Podsviceni" msgid "Bed" msgstr "Podlozka" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "Stav remenu" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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." # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "Kalibrace OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "Zrusit" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "Barva neni cista" # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" # MSG_CRASHDETECT c=13 -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "Detekovan naraz." # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "Vypnout motory" @@ -316,372 +316,372 @@ 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_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "Pokr." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 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=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "Korekce E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "Vysunout filament" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "Ustrihnout" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "Strihani" # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "Strihani filamentu" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni." # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "Temny" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "CHYBA:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "Selhani MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "F. autozav." # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "Selhani" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "Rychlost vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "Test ventilatoru" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "Kontr. vent." # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "Fil. senzor" # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "Vypadky filam." # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "Filament nezaveden" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "Senzor filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "Spotrebovano filam." # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "Cas tisku" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "FS reakce" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "Dokoncovani pohybu" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 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:727 +#: mmu.cpp:726 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:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "Zahrivani OK." # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "Vymena ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "Kontrola hotend " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "Kontrola senzoru" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "Kontrola osy X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "Kontrola osy Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "Vyberte extruder:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "Vyber filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 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:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "Informace" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Vlozte filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "Posledni tisk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "Vlevo" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "Korekce lin." @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "Doladeni osy Z" # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "Cisteni barvy" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "Zavest do trysky" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "Hlavni nabidka" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "" # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Pokracuji v tisku..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "Merene zkoseni" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "Selhani MMU" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "Zavedeni MMU selhalo" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "MMU selhani zavadeni" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "Mod" # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "Tichy" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "MMU vypadky proudu" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "Tichy" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "Automaticky" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "Vys. vykon" # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "MMU2 pripojeno" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "Posunout Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "Zadna SD karta" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "Nezapojeno " @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "Vysla nova verze firmware:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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:5067 +#: ultralcd.cpp:4977 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:60 msgid "Nozzle" msgstr "Tryska" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "Vent. trysky" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "Pozastavit tisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "Nahrivani PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 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:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "Zkontrolujte :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 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:62 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:65 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:67 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 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:71 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 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:63 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:64 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "Predehrev" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "Predehrev trysky. Prosim cekejte." # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "Vypadky proudu" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "Tisk prerusen" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "Predehrev k zavedeni" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "Tiskovy vent.:" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "Tisk pozastaven" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 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." # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "Tiskovy vent." # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "Prosim nejdriv zavedte filament" # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "Vzadu [um]" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyjmete filament a zopakujte tuto akci" # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "Obnovovani tisku " # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "Pokracovat" # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "Vpravo [um]" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 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_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "Vpravo" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "Chyba Selftestu!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "Selftest selhal " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "Nastavte teplotu:" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "Stav senzoru" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: 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 -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "Trideni" # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "Zadne" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "Cas" # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "Tezke zkoseni:" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "Abeceda" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Trideni souboru" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "Hlasity" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "Lehke zkoseni:" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "Zvuk" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "Jednou" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "Rychlost" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "Toci se" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 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:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "Statistika " # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "Zastavit tisk" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "Prohozene" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "Zvolte filament:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "Tepl. kal." # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 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." # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "Teploty" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "Ladit" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "Vysunout" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "k vyjmuti filamentu" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "Vyjmout filament" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "Vysouvam filament" # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "neznamy" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1525 +#: Marlin_main.cpp:1573 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:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "Ano" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 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:3902 +#: ultralcd.cpp:3822 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:3899 +#: ultralcd.cpp:3819 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_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 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:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "Zavest vse" # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "Korekce Y:" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "Vyp" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "Zap" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "Zpet" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "Kontrola" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "Falesne spusteni" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "Prisne" # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "Varovat" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "HW nastaveni" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "Komp. magnetu" # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "Mesh Bed Leveling" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detekovan na tiskarne MK3" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "MMU mod" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "Probiha zmena modu..." # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "Tryska" @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "Predehrev ke strihu" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "Prejmenovat" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "Vybrat" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "Senzor info" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "Plat" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "Asist." # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "Tiskove platy" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "Korekce Z:" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "Pocet mereni Z" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index dc3c21284..497ca077d 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: Fri Sep 18 15:23:29 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:23:29 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:49:50 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:49:50 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr " 0.3 oder aelter" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "FS 0.3 oder aelter" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "FS 0.4 oder neuer" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "Status unbekannt" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr " von 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr ">Abbruch" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "Raumtemp." # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "AutoLaden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 +#: ultralcd.cpp:2735 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:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "Ausgleich Bett ok" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "Riementest " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset." # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "Hell" # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "Helligkeit" @@ -190,123 +190,123 @@ msgstr "Helligkeit" msgid "Bed" msgstr "Bett" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "Gurtstatus" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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." # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "Kalibrierung OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "Abbruch" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "Falsche Farbe" # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" # MSG_CRASHDETECT c=13 -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "Crash Erk." # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "Crash erkannt." # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "Motoren aus" @@ -316,372 +316,372 @@ 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_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 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=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "E-Korrektur:" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "Filamentauswurf" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "Fil. schneiden" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "Messer" # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "Schneide filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "Dimm" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "FEHLER:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "Extruder Info" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "MMU-Fehler" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "F. autoladen" # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "Fehlerstatistik" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "Luefter-Tempo" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "Lueftertest" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "Luefter Chk." # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "Fil. Sensor" # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "Filam. Maengel" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert mit richtiger Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "Fil. nicht geladen" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "Filamentsensor" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "Druckzeit" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "FS Aktion" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "Bewegung beenden" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 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:727 +#: mmu.cpp:726 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:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "Aufwaermen OK." # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "Wechsel ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "Pruefe Duese " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "Pruefe Sensoren " # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "Pruefe X Achse " # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "Pruefe Y Achse " # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "Pruefe Z Achse " # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "Extruder waehlen:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "Waehle Filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 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:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "Infoanzeige" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Filament einlegen" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "Letzter Druck" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "Z einstellen" # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf." # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "Lade Farbe" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "In Druckduese laden" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "Hauptmenue" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "Hell.wert" # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "Dimmwert" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Position wiederherstellen..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "Schraeglauf" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "MMU Fehler" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "MMU Ladefehler" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "MMU Ladefehler" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "Modus" # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-Firmware am MK3S-Drucker erkannt" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "Leise" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "MMU Netzfehler" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "Auto Leist" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "Hohe leist" # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "MMU2 verbunden" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "Bewege Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "Keine SD Karte" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "N/V" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "Neue Firmware- Version verfuegbar:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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:5067 +#: ultralcd.cpp:4977 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:60 msgid "Nozzle" msgstr "Duese" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 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:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "Duesevent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "Druck pausieren" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "PINDA erwaermen" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 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:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "Bitte pruefe:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 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:62 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:65 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:67 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 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:71 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:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 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:63 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:64 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "Vorheizen" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "Netzfehler" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "Druck abgebrochen" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "Heizen zum Laden" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "Druckvent.:" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "Knopf druecken zum" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "Druck pausiert" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 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." # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "Druckvent." # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "Bitte laden Sie zuerst das Filament." # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "Hinten [um]" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "Druck wiederherst " # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 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." @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "Ruecksetzen" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "Druck fortsetzen" # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "Rechts [um]" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 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_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "SD Karte" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "Rechts" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "Selbsttest Error " # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 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:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "Temp. einstellen:" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "Sensorstatus" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: 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 -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "Sort." # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "Ohne" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "Zeit" # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "Schwer.Schr:" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortiere Dateien" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "Laut" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "Leicht.Schr:" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "Ton" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "Einmal" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "Geschwindigkeit" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "Dreht sich" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 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:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "Statistiken " # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "Druck abbrechen" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "Ausgetauscht" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "Filament auswaehlen:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "Temp Kalib." # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "Waehlen Sie die Temperatur, die zu Ihrem Material passt." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 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." # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "Sensor ueberprueft, entladen Sie jetzt das Filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "Temperaturen" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "Feineinstellung" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "Entladen" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "Filament laden" # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "Filament entladen" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "Filament entladen" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "Filament auswerfen" # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "unbekannt" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 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:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1525 +#: Marlin_main.cpp:1573 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:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geaendert." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geaendert." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "Ja" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 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:3902 +#: ultralcd.cpp:3822 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:3899 +#: ultralcd.cpp:3819 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_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "Verzoegerung" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 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:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "Alle laden" # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "Y-Korrektur:" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "Aus" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "An" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "Zurueck" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "Kontrolle" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "Falschtriggerung" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "Strikt" # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "Warnen" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "HW Einstellungen" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "Magnet Komp." # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "Gitter" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "MeshBett Ausgleich" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-Firmware auf MK3-Drucker erkannt" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "MMU Modus" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "Moduswechsel erfolgt..." # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "Modell" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "Duese D." @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "Umbenennen" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "Auswahl" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "Sensor Info" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "Stahlblech" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "Stahlbleche" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "Z-Korrektur:" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index ce2fcdf3e..01ef35381 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: Fri Sep 18 15:24:02 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:24:02 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:49:54 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:49:54 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr " 0.3 o mayor" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "FS 0.3 o mayor" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "FS 0.4 o mas nueva" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "estado desconocido" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr ">Cancelar" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "Ajustar-Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "Todo bien" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "Ambiente" # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "Carga auto. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 +#: ultralcd.cpp:2735 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "Corr. de la cama" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "Test cinturon " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "Brill." # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "Brillo" @@ -190,123 +190,123 @@ msgstr "Brillo" msgid "Bed" msgstr "Base" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "Estado de correa" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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." # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "Calibracion OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "Cancelar" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "Color no homogeneo" # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" # MSG_CRASHDETECT c=13 -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "Det. choque" # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "Choque detectado." # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "Apagar motores" @@ -316,372 +316,372 @@ 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_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 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=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "Corregir-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "Expulsar fil." # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "Cortar filament" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "Cuchillo" # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "Corte de filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "Vent.extrusor:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "Info. del extrusor" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "Autocarg.fil." # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "Estadistica de fallos" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "Velocidad Vent" # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "Test ventiladores" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "Comprob.vent" # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "Sensor Fil." # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "Filam. acabado" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "Fil. no introducido" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "Sensor de filamento" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "Tiempo de imp.:" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "FS accion" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "Term. movimientos" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 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:727 +#: mmu.cpp:726 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:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "Calentando acabado." # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "Cambio correcto?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "Control fusor" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "Comprobando sensores" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "Control sensor X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "Control sensor Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "Elegir extrusor:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "Elije filamento:" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 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:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "Monitorizar" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Introducir filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "?Esta colocada la lamina sobre la base" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "Ultimas impresiones fallidas" # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "Ultima impresion" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "Micropaso Eje Z" # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial." # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "Cambiando color" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "Cargar a la boquilla" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "Menu principal" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "Valor brill." # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "Nivelacion Mesh Level" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Restaurando posicion..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "Desviacion med:" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "Fallos MMU" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "Carga MMU fallida" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "Carga MMU falla" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "Modo" # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detectado en impresora MK3S" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "Silencio" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "Fallo de energia en MMU" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "Silencio" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "Fuerza auto" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "Rend.pleno" # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "MMU2 conectado" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "Mover Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "No hay tarjeta SD" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "N/A" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "No hay conexion " @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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:5067 +#: ultralcd.cpp:4977 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:60 msgid "Nozzle" msgstr "Boquilla" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 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:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "Vent. capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "Pausar impresion" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "Calentando PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "Controla :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 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:62 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:65 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:67 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 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:71 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:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "Por favor realiza la calibracion XYZ primero." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 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:63 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 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:64 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "Precalentar" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "Actualize por favor" # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "Pausa" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "Cortes de energia" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "Impresion cancelada" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "Precalent. cargar" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "Precalent. descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "Vent.fusor:" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "Pulsa el dial" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "Impresion en pausa" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "Presiona el dial para continuar con la temperatura de la boquilla." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 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." # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "Vent. extr" # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "Por favor, cargar primero el filamento. " # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "Trasera [um]" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descargue el filamento, luego repita esta accion." # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Por favor comprueba la conexion del IR sensor y filamento esta descargado." # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "Recuper. impresion " # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 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." @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "Continuan. impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "Derecha [um]" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "Puerto RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 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_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "Tarj. SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "Derecha" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "Error Selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "Fallo Selftest" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 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:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "Establecer temp.:" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "Estado del sensor" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: 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 -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "Ordenar" # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "Ninguno" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "Fecha" # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "Incl.severa:" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "Alfabet" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordenando archivos" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "Alto" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "Liger.incl.:" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "Sonido" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "Una vez" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "Velocidad" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "Ventilador girando" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 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:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "Estadisticas " # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "Detener impresion" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "Intercambiado" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "Selecciona filamento:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "Cal. temp." # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 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." # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retire el filamento ahora." # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "Temperaturas" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "Filamento total" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "Tiempo total" # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "Ajustar" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "Descargar" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "para descargar el filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "Soltar filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "Soltando filamento" # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "desconocido" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 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:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1525 +#: Marlin_main.cpp:1573 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:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "Cuidado: el tipo de placa ha cambiado." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "Cuidado: Ha cambiado el tipo de impresora." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual por favor." # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 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:3902 +#: ultralcd.cpp:3822 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:3899 +#: ultralcd.cpp:3819 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_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "Expirar" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "Corregir-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 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:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "Intr. todos fil." # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retire el filamento e intente nuevamente." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "Corregir-Y:" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "Ina" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "Act" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "atras" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "Comprobaciones" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "Falsa activacion" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "FINDA:" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "Estrict" # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "Aviso" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "Configuracion HW" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "Comp. imanes" # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "Malla" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "Nivelacion Malla Base" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectado en impresora MK3" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "Modo MMU" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "Cambio de modo progresando ..." # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "Modelo" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "Diam. nozzl" @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "Precalent. laminar" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "Precalent. expulsar" @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "Renombrar" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "Seleccionar" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "Info sensor" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "Lamina" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "Asistido" # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "Lamina de acero" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "Corregir-Z:" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "Z-sensor nr." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index fd77f7afa..bf48c536d 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: Fri Sep 18 15:24:37 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:24:37 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:49:57 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:49:57 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "FS v0.3 ou +ancien" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "FS v0.4 ou +recent" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "Etat inconnu" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "Offset point [0;0]" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr ">Annuler" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "Ajuster Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne impression!" # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "Ambiant" # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "et appuyez sur le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "Autocharge du fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 +#: ultralcd.cpp:2735 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "Corr. niveau plateau" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "Test de courroie " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset." # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "Brill." # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "Luminosite" @@ -190,123 +190,123 @@ msgstr "Luminosite" msgid "Bed" msgstr "Lit" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impression?" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "Calibration Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "Calibration terminee" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "Annuler" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "Couleur incorrecte" # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "Copier la langue choisie?" # MSG_CRASHDETECT c=13 -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "Detect.crash" # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "Crash detecte." # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression?" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "Date:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -316,372 +316,372 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y 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_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "Correct-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "Remonter le fil." # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "Le fil. remonte" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire statique a ete ecrasee" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "Coupe filament" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "Coupeur" # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "Je coupe filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "ERREUR:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "Infos extrudeur" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "F. autocharg." # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "Stat. d'echec" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "Vitesse vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "Test du ventilateur" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "Verif vent." # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "Capteur Fil." # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "Fins filament" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "Filament non charge" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "Capteur de filament" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "Temps d'impression" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "Mouvement final" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 msgid "First, I will run the selftest to check most common assembly problems." msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." # -#: mmu.cpp:727 +#: mmu.cpp:726 msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." # MSG_FLOW -#: ultralcd.cpp:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "Ventilo impr avant?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "Chauffe terminee." # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "Change correctement?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "Verif. plateau chauf" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "Verification butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "Verif. du hotend" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "Verif. des capteurs" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "Verification axe X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "Verification axe Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "Choisir extrudeur:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "Choix du filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 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:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "Ecran d'info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Inserez le filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "Est la plaque sur le plat. chauffant?" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "Echecs derniere imp." # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "Derniere impres." # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "Ventilo gauche?" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "Correction lin." @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "Ajuster Z en dir." # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton." # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "Charg. de la couleur" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "Chargement du fil." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "Charger la buse" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "Menu principal" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "Niveau brill" # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Reprise de la position ..." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Rechauffage de la buse..." # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "Deviat.mesuree" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "Echecs MMU" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "Echec chargement MMU" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "Echecs charg. MMU" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "" # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detecte sur imprimante MK3S" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "Furtif" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "Echecs alim. MMU" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "Furtif" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "Puiss.auto" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "Haute puiss" # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "MMU2 connecte" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "Deplacer Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "Pas de carte SD" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "Non connecte" @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "Nouvelle version de firmware disponible:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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 la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:5067 +#: ultralcd.cpp:4977 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:60 msgid "Nozzle" msgstr "Buse" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "Vent. buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "Pause de l'impr." # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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 vite l'imprimante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez plateau chauffant en acier et appuyez sur le bouton." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 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:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "Verifiez:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." # MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 +#: messages.c:62 msgid "Please place steel sheet on heatbed." msgstr "Placez la plaque en acier sur le plateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 +#: messages.c:65 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 +#: messages.c:67 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 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:71 msgid "Please remove steel sheet from heatbed." msgstr "Retirez la plaque en acier du plateau chauffant." # MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 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:63 msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:64 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "Prechauffage" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "Coup.de courant" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "Impression annulee" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "Chauffe pour charger" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "Chauf.pour decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "Vent. impr:" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "Impr. depuis la SD" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "App. sur sur bouton" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "Impression en pause" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "Appuyez sur le bouton pour rechauffer la buse." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 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." # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "Vent. impr" # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "Arriere [um]" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "Recup. impression " # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 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." @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "Reinitialiser" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "Reprendre impression" # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "Droite [um]" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" # MSG_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "Carte SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "FlshAir" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "Droite" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du plateau chauffant" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "Erreur auto-test!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "Echec de l'auto-test" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "Regler temp.:" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "Etat capteur" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: 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 -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "Tri" # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "Aucun" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "Heure" # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "Deviat.sev.:" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Tri des fichiers" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "Fort" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "Deviat.leg.:" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "Son" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "Une fois" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "Vitesse" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "Tourne" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "Statistiques" # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "Arreter impression" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "Echange" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "Selectionnez le filament:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "Calib. Temp." # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "Echec de la calibration en temperature" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 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 activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "Regler" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "Decharger" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "pour decharger fil." # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "Decharger fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "Dechargement fil." # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "inconnu" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau chauffant" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t msgstr "Utilisez Remonter le fil. 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:1525 +#: Marlin_main.cpp:1573 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:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "Attention: Type de carte mere modifie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "Attention: Type d'imprimante modifie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "Oui" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3902 +#: ultralcd.cpp:3822 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:3899 +#: ultralcd.cpp:3819 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!" # MSG_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "Charger un par un" # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "Correct-Y:" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "Retour" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "Verifications" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "Faux declenchement" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "FINDA:" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "Stricte" # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "Avert" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "Config HW" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "IR:" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "Compens. aim." # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detecte sur imprimante MK3" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "Mode MMU" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "Changement de mode en cours..." # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "Modele" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "Diam. buse" @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "Chauffe pour couper" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "Chauf. pour remonter" @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "Renommer" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "Selectionner" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "Info capteur" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "Plaque" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "" # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "Plaques en acier" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "Correct-Z:" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "Mesurer x-fois" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 2c1a41d92..64fb01458 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: Fri Sep 18 15:25:10 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:25:10 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:50:01 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:50:01 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset" # MSG_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr " 0.3 o inferiore" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "FS 0.3 o inferiore" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr " 0.4 o superiore" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "FS 0.4 o superiore" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "stato sconosciuto" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr " su 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr " su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr ">Annulla" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "Nessun errore" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "Ambiente" # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 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:2802 +#: ultralcd.cpp:2735 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "Piano/Riscald." @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Riscald. piano" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "Correz. liv.piano" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "Test cinghie " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset." # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "Chiaro" # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "Luminosita'" @@ -190,123 +190,123 @@ msgstr "Luminosita'" msgid "Bed" msgstr "Piano" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "Stato cinghie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare la stampa?" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "Calibra XYZ" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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." # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "Calibrazione completa" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "Annulla" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "Colore non puro" # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" # MSG_CRASHDETECT c=13 -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "Rileva.crash" # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "Rilevato impatto." # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "Disabilita motori" @@ -316,372 +316,372 @@ 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 piano non ancora impostata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo strato." # MSG_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 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=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "Correzione-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "Espelli filamento" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "Espellendo filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "Finec. fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e' stata sovrascritta" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "Taglia filamento" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "Tagliatr." # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "Tagliando filam." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "Scuro" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "ERRORE:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "Ventola estr:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "Info estrusore" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "Autocar.fil." # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "Stat. fallimenti" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "Velocita vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "Test ventola" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "Control.vent" # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "Sensore fil." # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "Fil. esauriti" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "Filamento estruso e con colore corretto?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "Fil. non caricato" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "Sensore filam." # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "Fil. utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "Tempo di stampa" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "Azione FS" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "Finaliz. spostamenti" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "Cal. primo strato" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 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:727 +#: mmu.cpp:726 msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvere il problema e premere il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "Riscald./Termist." # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "Riscald. completo" # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "Cambio corretto?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "Verifica ugello" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "Controllo sensori" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "Verifica asse X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "Verifica asse Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "Seleziona estrusore:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "Scegliere filamento:" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 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:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "Schermata info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Inserire filamento" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "Piastra d'acciaio su piano riscaldato?" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "Fallimenti ultima stampa" # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "Ultima stampa" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "Sinistra [um]" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "Correzione lineare" @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "Compensazione Z" # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "Caricando colore" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "Carica ugello" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "M117 Calibr. primo strato" # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "Menu principale" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "Liv. Chiaro" # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "Liv. Scuro" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "Liv. grilia piano" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "MMU OK. riprendendo la posizione... " # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "Deviazione mis" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "Fallimenti MMU" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "Caricamento MMU fallito" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "Caricamenti MMU falliti" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "Mod." # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 rilevato su stampante MK3S" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "Normale" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "Silenzioso" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "Manc. corr. MMU" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "Silenziosa" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "Auto" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "Forte" # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "MMU2 connessa" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "Sposta Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "Nessuna SD" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "N/D" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "Non connesso" @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "Nuova versione firmware disponibile:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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:5067 +#: ultralcd.cpp:4977 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:60 msgid "Nozzle" msgstr "Ugello" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # -#: ultralcd.cpp:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "Metti in pausa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 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:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "Verifica:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 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:62 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:65 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:67 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 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:71 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:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima. " # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 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:63 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:64 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "Preriscalda" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "Prego aggiornare." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "Pausa" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "Mancanza corrente" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "Stampa interrotta" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "Preriscald. carico" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "Preriscald. scarico" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "Vent.stam:" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "Premere la manopola" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "Stampa in pausa" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "Premete la manopola per recuperare la temperatura dell'ugello." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 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." # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "Ventola di stampa" # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "Per favore prima carica il filamento." # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "Retro [um]" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Controllare il collegamento al sensore e rimuovere il filamento." # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "Recupero stampa " # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 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." @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "Riprendi stampa" # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "Destra [um]" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "Porta RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 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_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "Mem. SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "Destra" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "Autotest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "Errore Autotest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "Autotest fallito" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "Imposta temperatura" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "Stato sensore" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: 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 -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "Ordina" # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "Nessuno" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "Cron." # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "Devia.grave:" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "Alfabeti" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Ordinando i file" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "Forte" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "Devia.lieve:" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "Suono" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "Esaurim" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "Singolo" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "Velocita" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "Gira" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 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:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "Statistiche" # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "Arresta stampa" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "Scambiato" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "Seleziona il filamento:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "Calib. temp." # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 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." # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "Temperature" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "Tempo stampa totale" # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "Regola" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "Scarica" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "per scaricare il filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "Scarica filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "Scaricando filamento" # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "sconosciuto" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 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:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1525 +#: Marlin_main.cpp:1573 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:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 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:3902 +#: ultralcd.cpp:3822 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:3899 +#: ultralcd.cpp:3819 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_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 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:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "Caricare tutti" # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato." # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "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):" # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "Correzione-Y:" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "Indietro" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "Controlli" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "Falso innesco" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "Esatto" # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "Avviso" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "Impostazioni HW" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "Comp. Magneti" # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "Griglia" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "Liv. griglia piano" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S rilevato su stampante MK3" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "Mod. MMU" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "Cambio modalita in corso ..." # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "Modello" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "Diam.Ugello" @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "Preriscalda. taglio" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "Preriscalda. espuls." @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "atteso livello %s" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "Rinomina" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "Seleziona" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "Info Sensore" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "Piano" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "Assist." # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "Piani d'acciaio" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "Correzione-Z:" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "Nr. Z-test" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 3de78e7f7..fc50d7d3a 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: Fri Sep 18 15:25:45 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:25:45 CEST 2020\n" +"POT-Creation-Date: Mo 25. Jan 15:50:04 CET 2021\n" +"PO-Revision-Date: Mo 25. Jan 15:50:04 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,42 +21,42 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 +#: messages.c:145 msgid " 0.3 or older" msgstr " 0.3 lub starszy" # c=18 -#: Marlin_main.cpp:9463 +#: Marlin_main.cpp:9626 msgid "FS v0.3 or older" msgstr "FS 0.3 lub starszy" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 +#: messages.c:144 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" # c=18 -#: Marlin_main.cpp:9462 +#: Marlin_main.cpp:9625 msgid "FS v0.4 or newer" msgstr "FS 0.4 lub nowszy" # MSG_IR_UNKNOWN c=18 -#: messages.c:145 +#: messages.c:146 msgid "unknown state" msgstr "Stan nieznany" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 +#: messages.c:37 msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 +#: messages.c:57 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 +#: ultralcd.cpp:2993 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2451 +#: ultralcd.cpp:2415 msgid ">Cancel" msgstr ">Anuluj" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 +#: ultralcd.cpp:3113 msgid "Adjusting Z:" msgstr "Ustawianie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 +#: ultralcd.cpp:8395 msgid "All correct " msgstr "Wszystko OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 +#: messages.c:100 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:1956 +#: ultralcd.cpp:1907 msgid "Ambient" msgstr "Otoczenie" # MSG_AUTO c=6 -#: messages.c:140 +#: messages.c:141 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 +#: ultralcd.cpp:2572 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 +#: ultralcd.cpp:3434 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 +#: messages.c:109 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 +#: ultralcd.cpp:6721 msgid "AutoLoad filament" msgstr "Autoladowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 +#: ultralcd.cpp:4351 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 +#: ultralcd.cpp:2735 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:8371 +#: ultralcd.cpp:8078 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 +#: ultralcd.cpp:8079 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 +#: ultralcd.cpp:8036 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 +#: ultralcd.cpp:5807 msgid "Bed level correct" msgstr "Korekta stolu" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 +#: ultralcd.cpp:5787 msgid "Belt test " msgstr "Test paskow" @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset." # MSG_BRIGHT c=6 -#: messages.c:138 +#: messages.c:139 msgid "Bright" msgstr "Jasny" # MSG_BRIGHTNESS c=18 -#: messages.c:134 +#: messages.c:135 msgid "Brightness" msgstr "Jasnosc" @@ -190,123 +190,123 @@ msgstr "Jasnosc" msgid "Bed" msgstr "Stol" -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 +# MSG_BELT_STATUS c=18 +#: msgid "Belt status" msgstr "Stan paskow" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 +#: messages.c:68 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:8706 +#: ultralcd.cpp:8397 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 +#: ultralcd.cpp:5796 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" # MSG_HOMEYZ -#: messages.c:44 +#: messages.c:45 msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 +#: ultralcd.cpp:4543 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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." # MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 +#: messages.c:20 msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 +#: ultralcd.cpp:3397 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:865 +#: ultralcd.cpp:818 msgid "Calibration done" msgstr "Kalibracja OK" # MSG_MENU_CALIBRATION -#: messages.c:57 +#: messages.c:58 msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4811 +#: ultralcd.cpp:4721 msgid "Cancel" msgstr "Anuluj" # MSG_SD_REMOVED -#: ultralcd.cpp:9142 +#: ultralcd.cpp:8847 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2707 +#: ultralcd.cpp:2652 msgid "Color not correct" msgstr "Kolor zanieczysz." # MSG_COOLDOWN -#: messages.c:22 +#: messages.c:23 msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4566 +#: ultralcd.cpp:4476 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" # MSG_CRASHDETECT_ON -#: messages.c:24 +#: messages.c:25 msgid "Crash det." msgstr "Wykr.zderzen" # -#: ultralcd.cpp:4946 +#: ultralcd.cpp:4856 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 +#: messages.c:24 msgid "Crash detected." msgstr "Zderzenie wykryte" # -#: Marlin_main.cpp:605 +#: Marlin_main.cpp:657 msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" # -#: ultralcd.cpp:1785 +#: ultralcd.cpp:1736 msgid "Crash" msgstr "Zderzenie" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 +#: ultralcd.cpp:5938 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 +#: ultralcd.cpp:2117 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 +#: ultralcd.cpp:5688 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -316,372 +316,372 @@ 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_FS_CONTINUE c=5 -#: messages.c:132 +#: messages.c:133 msgid "Cont." msgstr "Kont." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 +#: ultralcd.cpp:5031 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=13 -#: ultralcd.cpp:5190 +#: ultralcd.cpp:5100 msgid "E-correct:" msgstr "Korekcja-E:" # MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 +#: messages.c:50 msgid "Eject filament" msgstr "Wysun filament" # MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 +#: mmu.cpp:1414 msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 +#: ultralcd.cpp:8054 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 +#: ultralcd.cpp:8049 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 +#: ultralcd.cpp:8040 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 +#: ultralcd.cpp:6758 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" # MSG_CUT_FILAMENT c=16 -#: messages.c:50 +#: messages.c:51 msgid "Cut filament" msgstr "Ciecie filamentu" # MSG_CUTTER c=9 -#: messages.c:109 +#: messages.c:110 msgid "Cutter" msgstr "Nozyk" # c=18 -#: mmu.cpp:1388 +#: mmu.cpp:1386 msgid "Cutting filament" msgstr "Obcinanie fil." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 +#: ultralcd.cpp:4364 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." # MSG_DIM c=6 -#: messages.c:139 +#: messages.c:140 msgid "Dim" msgstr "Sciemn" # MSG_ERROR -#: messages.c:25 +#: messages.c:26 msgid "ERROR:" msgstr "BLAD:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 +#: ultralcd.cpp:8403 msgid "Extruder fan:" msgstr "WentHotend:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 +#: ultralcd.cpp:2158 msgid "Extruder info" msgstr "Ekstruder - info" # MSG_MOVE_E -#: messages.c:26 +#: messages.c:27 msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:7017 +#: ultralcd.cpp:6745 msgid "Fail stats MMU" msgstr "Bledy MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 +#: messages.c:41 msgid "F. autoload" msgstr "Autolad. fil." # -#: ultralcd.cpp:7014 +#: ultralcd.cpp:6742 msgid "Fail stats" msgstr "Statystyki bledow" # MSG_FAN_SPEED c=14 -#: messages.c:28 +#: messages.c:29 msgid "Fan speed" msgstr "Predkosc went." # MSG_SELFTEST_FAN c=20 -#: messages.c:74 +#: messages.c:75 msgid "Fan test" msgstr "Test wentylatora" # MSG_FANS_CHECK -#: ultralcd.cpp:5777 +#: ultralcd.cpp:5696 msgid "Fans check" msgstr "Sprawd.went." # MSG_FSENSOR -#: messages.c:41 +#: messages.c:42 msgid "Fil. sensor" msgstr "Czuj. filam." # c=14 -#: ultralcd.cpp:1784 +#: ultralcd.cpp:1735 msgid "Filam. runouts" msgstr "Konc.filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 +#: messages.c:30 msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy,kolor jest ok?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 +#: ultralcd.cpp:2651 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 +#: messages.c:81 msgid "Filament sensor" msgstr "Czujnik filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 +#: ultralcd.cpp:2800 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 +#: ultralcd.cpp:2801 msgid "Print time" msgstr "Czas druku" # MSG_FS_ACTION c=10 -#: messages.c:131 +#: messages.c:132 msgid "FS Action" msgstr "Akcja FS" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 +#: ultralcd.cpp:8545 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 +#: messages.c:38 msgid "Finishing movements" msgstr "Konczenie druku" # MSG_V2_CALIBRATION c=18 -#: messages.c:103 +#: messages.c:104 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 +#: ultralcd.cpp:4952 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:727 +#: mmu.cpp:726 msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:7157 +#: ultralcd.cpp:6885 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2110 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 +#: messages.c:72 msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 +#: ultralcd.cpp:3195 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 +#: ultralcd.cpp:8084 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 +#: ultralcd.cpp:8032 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" # MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 +#: Marlin_main.cpp:9616 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" # MSG_HEATING_COMPLETE c=20 -#: messages.c:43 +#: messages.c:44 msgid "Heating done." msgstr "Grzanie zakonczone" # MSG_HEATING -#: messages.c:42 +#: messages.c:43 msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 +#: ultralcd.cpp:4931 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:2158 +#: ultralcd.cpp:2111 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:34 +#: messages.c:35 msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 +#: ultralcd.cpp:2581 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 +#: ultralcd.cpp:2649 msgid "Changed correctly?" msgstr "Wymiana ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 +#: messages.c:78 msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 +#: ultralcd.cpp:8386 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 +#: ultralcd.cpp:8392 msgid "Checking hotend " msgstr "Kontrola hotendu" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 +#: messages.c:79 msgid "Checking sensors " msgstr "Kontrola czujnikow" # MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 +#: ultralcd.cpp:7240 msgid "Checking X axis " msgstr "Kontrola osi X" # MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 +#: ultralcd.cpp:7249 msgid "Checking Y axis " msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 +#: ultralcd.cpp:8389 msgid "Checking Z axis " msgstr "Kontrola osi Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 +#: messages.c:46 msgid "Choose extruder:" msgstr "Wybierz ekstruder:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 +#: messages.c:47 msgid "Choose filament:" msgstr "Wybierz filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:27 +#: messages.c:28 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 +#: ultralcd.cpp:4961 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:5059 +#: ultralcd.cpp:4969 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WATCH -#: messages.c:97 +#: messages.c:98 msgid "Info screen" msgstr "Ekran informacyjny" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2569 msgid "Insert filament" msgstr "Wprowadz filament" # MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 +#: ultralcd.cpp:4741 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 +#: messages.c:91 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" # -#: ultralcd.cpp:1727 +#: ultralcd.cpp:1678 msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:5129 +#: ultralcd.cpp:5039 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." # -#: ultralcd.cpp:1704 +#: ultralcd.cpp:1655 msgid "Last print" msgstr "Ost. wydruk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 +#: messages.c:73 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2991 +#: ultralcd.cpp:2924 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 +#: ultralcd.cpp:3193 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5792 +#: ultralcd.cpp:5711 msgid "Lin. correction" msgstr "Korekcja liniowa" @@ -691,197 +691,197 @@ msgid "Live adjust Z" msgstr "Ustaw. Live Z" # c=20 r=6 -#: ultralcd.cpp:7559 +#: ultralcd.cpp:7285 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." # MSG_LOAD_FILAMENT c=17 -#: messages.c:47 +#: messages.c:48 msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2643 +#: ultralcd.cpp:2603 msgid "Loading color" msgstr "Czyszcz. koloru" # MSG_LOADING_FILAMENT c=20 -#: messages.c:48 +#: messages.c:49 msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 +#: ultralcd.cpp:8072 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6976 +#: ultralcd.cpp:6704 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 +#: messages.c:52 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" # MSG_MAIN -#: messages.c:52 +#: messages.c:53 msgid "Main" msgstr "Menu glowne" # MSG_BL_HIGH c=12 -#: messages.c:135 +#: messages.c:136 msgid "Level Bright" msgstr "Poziom jasn." # MSG_BL_LOW c=12 -#: messages.c:136 +#: messages.c:137 msgid "Level Dimmed" msgstr "Poziom ciem." # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 +#: messages.c:56 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" # MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 +#: ultralcd.cpp:5802 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu wg siatki" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 +#: mmu.cpp:764 msgid "MMU OK. Resuming position..." msgstr "MMU OK. Wznawianie pozycji." # MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 +#: mmu.cpp:757 msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:3032 +#: ultralcd.cpp:2965 msgid "Measured skew" msgstr "Zmierzony skos" # -#: ultralcd.cpp:1728 +#: ultralcd.cpp:1679 msgid "MMU fails" msgstr "Bledy MMU" # -#: mmu.cpp:1588 +#: mmu.cpp:1586 msgid "MMU load failed " msgstr "Blad ladowania MMU" # -#: ultralcd.cpp:1729 +#: ultralcd.cpp:1680 msgid "MMU load fails" msgstr "Bledy ladow. MMU" # MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 +#: mmu.cpp:775 msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." # MSG_MODE -#: messages.c:84 +#: messages.c:85 msgid "Mode" msgstr "Tryb" # c=20 r=3 -#: Marlin_main.cpp:884 +#: Marlin_main.cpp:934 msgid "MK3 firmware detected on MK3S printer" msgstr "Wykryto firmware MK3 w drukarce MK3S" # MSG_NORMAL -#: messages.c:88 +#: messages.c:89 msgid "Normal" msgstr "Normalni" # MSG_SILENT -#: messages.c:87 +#: messages.c:88 msgid "Silent" msgstr "Cichy" # -#: mmu.cpp:722 +#: mmu.cpp:721 msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." # -#: ultralcd.cpp:1755 +#: ultralcd.cpp:1706 msgid "MMU power fails" msgstr "Zaniki zasil. MMU" # MSG_STEALTH -#: messages.c:89 +#: messages.c:90 msgid "Stealth" msgstr "Cichy" # MSG_AUTO_POWER -#: messages.c:86 +#: messages.c:87 msgid "Auto power" msgstr "Automatycz" # MSG_HIGH_POWER -#: messages.c:85 +#: messages.c:86 msgid "High power" msgstr "Wysoka wyd." # -#: ultralcd.cpp:2176 +#: ultralcd.cpp:2129 msgid "MMU2 connected" msgstr "MMU podlaczone" # MSG_SELFTEST_MOTOR -#: messages.c:79 +#: messages.c:80 msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5767 +#: ultralcd.cpp:5686 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4357 +#: ultralcd.cpp:4267 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4358 +#: ultralcd.cpp:4268 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4359 +#: ultralcd.cpp:4269 msgid "Move Z" msgstr "Ruch osi Z" # MSG_NO_MOVE -#: Marlin_main.cpp:5555 +#: Marlin_main.cpp:5719 msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6943 +#: ultralcd.cpp:6678 msgid "No SD card" msgstr "Brak karty SD" # MSG_NA -#: messages.c:107 +#: messages.c:108 msgid "N/A" msgstr "N/D" # MSG_NO -#: messages.c:58 +#: messages.c:59 msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 +#: ultralcd.cpp:8033 msgid "Not connected" msgstr "Nie podlaczono " @@ -891,157 +891,157 @@ msgid "New firmware version available:" msgstr "Dostepna nowa wersja firmware:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 +#: messages.c:76 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 +#: ultralcd.cpp:4852 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:5067 +#: ultralcd.cpp:4977 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." # MSG_NOZZLE -#: messages.c:59 +#: messages.c:60 msgid "Nozzle" msgstr "Dysza" # MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 +#: Marlin_main.cpp:1581 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:5058 +#: ultralcd.cpp:4968 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # -#: ultralcd.cpp:1654 +#: ultralcd.cpp:1605 msgid "Nozzle FAN" msgstr "WentHotend" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 +#: ultralcd.cpp:6642 msgid "Pause print" msgstr "Wstrzymanie wydruku" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 +#: ultralcd.cpp:1490 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 +#: ultralcd.cpp:1496 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 +#: ultralcd.cpp:5808 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 +#: ultralcd.cpp:848 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:60 +#: messages.c:61 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:5124 +#: ultralcd.cpp:5034 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 +#: messages.c:22 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8303 +#: ultralcd.cpp:8027 msgid "Please check :" msgstr "Sprawdz :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 +#: messages.c:99 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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 +#: Marlin_main.cpp:3317 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:62 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:65 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:67 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" # MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 +#: mmu.cpp:1420 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:71 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:4601 +#: Marlin_main.cpp:4766 msgid "Please run XYZ calibration first." msgstr "Prosze najpierw uruchomic kalibracje XYZ" # MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 +#: mmu.cpp:1340 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:63 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:5057 +#: ultralcd.cpp:4967 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 +#: messages.c:64 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6620 msgid "Preheat" msgstr "Grzanie" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 +#: messages.c:101 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." # c=14 -#: ultralcd.cpp:1959 +#: ultralcd.cpp:1910 msgid "PINDA" msgstr "" @@ -1051,112 +1051,112 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac." # MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 +#: Marlin_main.cpp:11718 msgid "Press knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." # MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 +#: fsensor.cpp:728 msgid "Pause" msgstr "Pauza" # -#: ultralcd.cpp:1783 +#: ultralcd.cpp:1734 msgid "Power failures" msgstr "Zaniki zasilania" # MSG_PRINT_ABORTED c=20 -#: messages.c:65 +#: messages.c:66 msgid "Print aborted" msgstr "Druk przerwany" # c=20 -#: ultralcd.cpp:2433 +#: ultralcd.cpp:2395 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" # c=20 -#: ultralcd.cpp:2437 +#: ultralcd.cpp:2400 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 +#: ultralcd.cpp:8406 msgid "Print fan:" msgstr "WentWydruk:" # MSG_CARD_MENU -#: messages.c:20 +#: messages.c:21 msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2280 +#: ultralcd.cpp:2236 msgid "Press the knob" msgstr "Wcisnij pokretlo" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 +#: ultralcd.cpp:1070 msgid "Print paused" msgstr "Druk wstrzymany" # -#: mmu.cpp:726 +#: mmu.cpp:725 msgid "Press the knob to resume nozzle temperature." msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 +#: messages.c:39 msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # -#: ultralcd.cpp:1655 +#: ultralcd.cpp:1606 msgid "Print FAN" msgstr "WentWydruk" # -#: ultralcd.cpp:4922 +#: ultralcd.cpp:4832 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4917 +#: ultralcd.cpp:4827 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4839 +#: ultralcd.cpp:4749 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." # MSG_PRUSA3D -#: ultralcd.cpp:2156 +#: ultralcd.cpp:2109 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 +#: ultralcd.cpp:3196 msgid "Rear side [um]" msgstr "Tyl [um]" # c=20 r=4 -#: ultralcd.cpp:7583 +#: ultralcd.cpp:7309 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." # c=20 r=4 -#: ultralcd.cpp:7586 +#: ultralcd.cpp:7312 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." # MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 +#: Marlin_main.cpp:11076 msgid "Recovering print " msgstr "Wznawianie wydruku " # MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 +#: mmu.cpp:832 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." @@ -1166,102 +1166,102 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 +#: ultralcd.cpp:5813 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" # MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 +#: ultralcd.cpp:3197 msgid "Reset" msgstr "" # MSG_RESUME_PRINT -#: ultralcd.cpp:6893 +#: ultralcd.cpp:6628 msgid "Resume print" msgstr "Wznowic wydruk" # MSG_RESUMING_PRINT c=20 -#: messages.c:69 +#: messages.c:70 msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 +#: ultralcd.cpp:3194 msgid "Right side[um]" msgstr "Prawo [um]" # MSG_RPI_PORT -#: messages.c:123 +#: messages.c:124 msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 +#: ultralcd.cpp:4770 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_SD_CARD -#: messages.c:118 +#: messages.c:119 msgid "SD card" msgstr "Karta SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 +#: messages.c:120 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2992 +#: ultralcd.cpp:2925 msgid "Right" msgstr "Prawa" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 +#: messages.c:36 msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5726 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7858 +#: ultralcd.cpp:7584 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 +#: ultralcd.cpp:7352 msgid "Self test start " msgstr "Selftest startuje" # MSG_SELFTEST -#: ultralcd.cpp:5871 +#: ultralcd.cpp:5789 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 +#: ultralcd.cpp:8026 msgid "Selftest error !" msgstr "Blad selftest!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:73 +#: messages.c:74 msgid "Selftest failed " msgstr "Selftest nieudany" # MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 +#: Marlin_main.cpp:1613 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5008 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 +#: ultralcd.cpp:3214 msgid "Set temperature:" msgstr "Ustaw temperature:" @@ -1281,187 +1281,187 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:82 +#: messages.c:83 msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 +#: ultralcd.cpp:5810 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:4004 +#: ultralcd.cpp:3920 msgid "Sensor state" msgstr "Stan czujnikow" # MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 +#: 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 -#: messages.c:120 +#: messages.c:121 msgid "Sort" msgstr "Sortowanie" # MSG_NONE -#: messages.c:110 +#: messages.c:111 msgid "None" msgstr "Brak" # MSG_SORT_TIME -#: messages.c:121 +#: messages.c:122 msgid "Time" msgstr "Czas" # -#: ultralcd.cpp:3035 +#: ultralcd.cpp:2968 msgid "Severe skew:" msgstr "Znaczny skos:" # MSG_SORT_ALPHA -#: messages.c:122 +#: messages.c:123 msgid "Alphabet" msgstr "Alfab" # MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 +#: cardreader.cpp:746 msgid "Sorting files" msgstr "Sortowanie plikow" # MSG_SOUND_LOUD -#: messages.c:125 +#: messages.c:126 msgid "Loud" msgstr "Glosny" # -#: ultralcd.cpp:3034 +#: ultralcd.cpp:2967 msgid "Slight skew:" msgstr "Lekki skos:" # MSG_SOUND -#: messages.c:124 +#: messages.c:125 msgid "Sound" msgstr "Dzwiek" # c=7 -#: ultralcd.cpp:1822 +#: ultralcd.cpp:1773 msgid "Runouts" msgstr "Konce f" # -#: Marlin_main.cpp:5115 +#: Marlin_main.cpp:5280 msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." # MSG_SOUND_ONCE -#: messages.c:126 +#: messages.c:127 msgid "Once" msgstr "1-raz" # MSG_SPEED -#: ultralcd.cpp:7151 +#: ultralcd.cpp:6879 msgid "Speed" msgstr "Predkosc" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 +#: messages.c:77 msgid "Spinning" msgstr "Kreci sie" # MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 +#: Marlin_main.cpp:4779 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:7010 +#: ultralcd.cpp:6738 msgid "Statistics " msgstr "Statystyki" # MSG_STOP_PRINT -#: messages.c:91 +#: messages.c:92 msgid "Stop print" msgstr "Przerwanie druku" # MSG_STOPPED -#: messages.c:92 +#: messages.c:93 msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:7019 +#: ultralcd.cpp:6747 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 +#: ultralcd.cpp:8085 msgid "Swapped" msgstr "Zamieniono" # -#: ultralcd.cpp:4810 +#: ultralcd.cpp:4720 msgid "Select filament:" msgstr "Wybierz filament:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 +#: messages.c:94 msgid "Temp. cal." msgstr "Kalib. temp." # -#: ultralcd.cpp:4951 +#: ultralcd.cpp:4861 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 +#: ultralcd.cpp:5821 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 +#: ultralcd.cpp:3850 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 +#: messages.c:95 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." # c=20 r=3 -#: ultralcd.cpp:7590 +#: ultralcd.cpp:7316 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5765 +#: ultralcd.cpp:5684 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 +#: ultralcd.cpp:2165 msgid "Temperatures" msgstr "Temperatury" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 +#: messages.c:40 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." # -#: ultralcd.cpp:2889 +#: ultralcd.cpp:2822 msgid "Total filament" msgstr "Zuzycie filamentu" # -#: ultralcd.cpp:2890 +#: ultralcd.cpp:2823 msgid "Total print time" msgstr "Laczny czas druku" # MSG_TUNE -#: ultralcd.cpp:6882 +#: ultralcd.cpp:6617 msgid "Tune" msgstr "Strojenie" @@ -1471,62 +1471,62 @@ msgid "Unload" msgstr "Rozladuj" # -#: ultralcd.cpp:1752 +#: ultralcd.cpp:1703 msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2287 +#: ultralcd.cpp:2243 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2291 +#: ultralcd.cpp:2247 msgid "to unload filament" msgstr "aby rozlad. filament" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 +#: messages.c:96 msgid "Unload filament" msgstr "Rozladowanie fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 +#: messages.c:97 msgid "Unloading filament" msgstr "Rozladowuje filament" # -#: ultralcd.cpp:1705 +#: ultralcd.cpp:1656 msgid "Total" msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 +#: ultralcd.cpp:5937 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 +#: ultralcd.cpp:2168 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2184 +#: ultralcd.cpp:2137 msgid "unknown" msgstr "nieznane" # MSG_USERWAIT -#: Marlin_main.cpp:5525 +#: Marlin_main.cpp:5689 msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 +#: ultralcd.cpp:3362 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 +#: ultralcd.cpp:3323 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" @@ -1536,37 +1536,37 @@ msgid "Use unload to remove filament 1 if it protrudes outside of the rear MMU t 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:1525 +#: Marlin_main.cpp:1573 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:1517 +#: Marlin_main.cpp:1565 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." # MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 +#: Marlin_main.cpp:1569 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" # MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 +#: Marlin_main.cpp:3308 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:81 +#: messages.c:82 msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 +#: ultralcd.cpp:5780 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 +#: ultralcd.cpp:2157 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1576,182 +1576,182 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." # MSG_YES -#: messages.c:102 +#: messages.c:103 msgid "Yes" msgstr "Tak" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 +#: messages.c:102 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:3902 +#: ultralcd.cpp:3822 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:3899 +#: ultralcd.cpp:3819 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_TIMEOUT c=12 -#: messages.c:137 +#: messages.c:138 msgid "Timeout" msgstr "Wyl. czas." # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 +#: ultralcd.cpp:5096 msgid "X-correct:" msgstr "Korekcja-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 +#: ultralcd.cpp:3816 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:3880 +#: ultralcd.cpp:3800 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:3883 +#: ultralcd.cpp:3803 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 +#: ultralcd.cpp:6176 msgid "Load all" msgstr "Zalad. wszystkie" # -#: ultralcd.cpp:3862 +#: ultralcd.cpp:3782 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3868 +#: ultralcd.cpp:3788 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3871 +#: ultralcd.cpp:3791 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:2989 +#: ultralcd.cpp:2922 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:4954 +#: ultralcd.cpp:4864 msgid "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)." msgstr "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." # c=20 r=5 -#: ultralcd.cpp:7594 +#: ultralcd.cpp:7320 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 +#: ultralcd.cpp:5097 msgid "Y-correct:" msgstr "Korekcja-Y:" # MSG_OFF -#: messages.c:105 +#: messages.c:106 msgid "Off" msgstr "Wyl" # MSG_ON -#: messages.c:106 +#: messages.c:107 msgid "On" msgstr "Wl" # -#: messages.c:53 +#: messages.c:54 msgid "Back" msgstr "Wstecz" # -#: ultralcd.cpp:5742 +#: ultralcd.cpp:5652 msgid "Checks" msgstr "Testy" # -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8095 msgid "False triggering" msgstr "Falszywy alarm" # -#: ultralcd.cpp:4009 +#: ultralcd.cpp:3925 msgid "FINDA:" msgstr "" # MSG_FIRMWARE -#: language.h:23 +#: language.h:24 msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:112 +#: messages.c:113 msgid "Strict" msgstr "Restr." # MSG_WARN -#: messages.c:111 +#: messages.c:112 msgid "Warn" msgstr "Ostrzez" # -#: messages.c:83 +#: messages.c:84 msgid "HW Setup" msgstr "Ustawienia HW" # -#: ultralcd.cpp:4013 +#: ultralcd.cpp:3929 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:130 +#: messages.c:131 msgid "Magnets comp." msgstr "Kor. magnesow" # MSG_MESH -#: messages.c:128 +#: messages.c:129 msgid "Mesh" msgstr "Siatka" # -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5708 msgid "Mesh bed leveling" msgstr "Poziomowanie stolu" # -#: Marlin_main.cpp:877 +#: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Wykryto firmware MK3S w drukarce MK3" # MSG_MMU_MODE -#: messages.c:117 +#: messages.c:118 msgid "MMU Mode" msgstr "Tryb MMU" # -#: ultralcd.cpp:4490 +#: ultralcd.cpp:4400 msgid "Mode change in progress ..." msgstr "Trwa zmiana trybu..." # MSG_MODEL -#: messages.c:113 +#: messages.c:114 msgid "Model" msgstr "" # MSG_NOZZLE_DIAMETER -#: messages.c:116 +#: messages.c:117 msgid "Nozzle d." msgstr "Sr. dyszy" @@ -1786,17 +1786,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." # -#: ultralcd.cpp:4005 +#: ultralcd.cpp:3921 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2443 +#: ultralcd.cpp:2407 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" # c=20 -#: ultralcd.cpp:2440 +#: ultralcd.cpp:2404 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" @@ -1811,47 +1811,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." # c=20 -#: ultralcd.cpp:8401 +#: ultralcd.cpp:8100 msgid "%s level expected" msgstr "Oczekiwano wersji %s" # -#: ultralcd.cpp:6846 +#: ultralcd.cpp:6579 msgid "Rename" msgstr "Zmien nazwe" # -#: ultralcd.cpp:6839 +#: ultralcd.cpp:6572 msgid "Select" msgstr "Wybierz" # -#: ultralcd.cpp:2202 +#: ultralcd.cpp:2159 msgid "Sensor info" msgstr "Info o sensorach" # MSG_SHEET c=10 -#: messages.c:54 +#: messages.c:55 msgid "Sheet" msgstr "Plyta" # MSG_SOUND_BLIND -#: messages.c:127 +#: messages.c:128 msgid "Assist" msgstr "Asyst." # c=18 -#: ultralcd.cpp:5740 +#: ultralcd.cpp:5650 msgid "Steel sheets" msgstr "Plyty stalowe" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 +#: ultralcd.cpp:5098 msgid "Z-correct:" msgstr "Korekcja-Z:" # MSG_Z_PROBE_NR -#: messages.c:129 +#: messages.c:130 msgid "Z-probe nr." msgstr "Ilosc Pomiarow" From 223f32deae5bb681af4a85ae8c164e3a28edcf66 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 16:15:57 +0100 Subject: [PATCH 176/218] Remove duplicate string `HW Setup" using `MSG_HW_SETUP` --- Firmware/messages.c | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 2 +- 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 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 477213f09..c77c4c343 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -81,7 +81,7 @@ const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); //// const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 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_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18 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"); //// diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f0041b82f..92e612b20 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5605,7 +5605,7 @@ static void select_sheet_menu() static void sheets_menu() { MENU_BEGIN(); - MENU_ITEM_BACK_P(_i("HW Setup")); + MENU_ITEM_BACK_P(_T(MSG_HW_SETUP)); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], select_sheet_menu<0>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], select_sheet_menu<1>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], select_sheet_menu<2>); @@ -5695,7 +5695,7 @@ static void lcd_settings_menu() if(!farm_mode) { bSettings=true; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function - MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP + MENU_ITEM_SUBMENU_P(_T(MSG_HW_SETUP), lcd_hw_setup_menu); } SETTINGS_MMU_MODE; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 82ca2c0df..e2596e199 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1012,7 +1012,7 @@ #MSG_WARN "Warn" -# +#MSG_HW_SETUP c=18 "HW Setup" # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 994e43504..97409c2dd 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1350,7 +1350,7 @@ "Warn" "Varovat" -# +#MSG_HW_SETUP c=18 "HW Setup" "HW nastaveni" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index ef06194bf..2c72bea50 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1350,7 +1350,7 @@ "Warn" "Warnen" -# +#MSG_HW_SETUP c=18 "HW Setup" "HW Einstellungen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 8f7e271fc..9dc3ce647 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1350,7 +1350,7 @@ "Warn" "Aviso" -# +#MSG_HW_SETUP c=18 "HW Setup" "Configuracion HW" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 3e7c082b2..db1b9afad 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1350,7 +1350,7 @@ "Warn" "Avert" -# +#MSG_HW_SETUP c=18 "HW Setup" "Config HW" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 63cfc3970..bba041728 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1350,7 +1350,7 @@ "Warn" "Avviso" -# +#MSG_HW_SETUP c=18 "HW Setup" "Impostazioni HW" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 52968d47f..621bd9db4 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1350,7 +1350,7 @@ "Warn" "Ostrzez" -# +#MSG_HW_SETUP c=18 "HW Setup" "Ustawienia HW" From 7891d12a328cef00b39f9a62d4b3079f18b86ea5 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 16:44:55 +0100 Subject: [PATCH 177/218] Remove duplicate string `Is filament loaded?` using `MSG_FILAMENT_LOADED` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 6 +++--- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index c77c4c343..2fa3796c7 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -28,6 +28,7 @@ const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2 +const char MSG_FILAMENT_LOADED[] PROGMEM_I1 = ISTR("Is filament loaded?"); ////c=20 r=2 const char MSG_FILAMENT_LOADING_T0[] PROGMEM_I1 = ISTR("Insert filament into extruder 1. Click when done."); ////c=20 r=4 const char MSG_FILAMENT_LOADING_T1[] PROGMEM_I1 = ISTR("Insert filament into extruder 2. Click when done."); ////c=20 r=4 const char MSG_FILAMENT_LOADING_T2[] PROGMEM_I1 = ISTR("Insert filament into extruder 3. Click when done."); ////c=20 r=4 diff --git a/Firmware/messages.h b/Firmware/messages.h index 8e5d733de..f544c6073 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -29,6 +29,7 @@ extern const char MSG_EXTRUDER[]; extern const char MSG_FILAMENT[]; extern const char MSG_FAN_SPEED[]; extern const char MSG_FILAMENT_CLEAN[]; +extern const char MSG_FILAMENT_LOADED[]; extern const char MSG_FILAMENT_LOADING_T0[]; extern const char MSG_FILAMENT_LOADING_T1[]; extern const char MSG_FILAMENT_LOADING_T2[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 92e612b20..26cb63bfd 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4733,7 +4733,7 @@ void lcd_v2_calibration() } else { - loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), false, true);////MSG_PLA_FILAMENT_LOADED c=20 r=2 + loaded = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), false, true); lcd_update_enabled = true; } @@ -4986,10 +4986,10 @@ void lcd_wizard(WizState state) setTargetBed(PLA_PREHEAT_HPB_TEMP); if (mmu_enabled) { - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////c=20 r=2 + wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), true); } else { - wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Is filament loaded?"), true);////MSG_WIZARD_FILAMENT_LOADED c=20 r=2 + wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_FILAMENT_LOADED), true); } if (wizard_event) state = S::Lay1CalCold; else diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e2596e199..89996f85d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -373,7 +373,7 @@ #MSG_INSERT_FILAMENT c=20 "Insert filament" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" #MSG_STEEL_SHEET_CHECK c=20 r=2 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 97409c2dd..a06822541 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -498,7 +498,7 @@ "Insert filament" "Vlozte filament" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" "Je filament zaveden?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 2c72bea50..7df5e9ecb 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -498,7 +498,7 @@ "Insert filament" "Filament einlegen" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" "Ist das Filament geladen?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 9dc3ce647..02cd82a0b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -498,7 +498,7 @@ "Insert filament" "Introducir filamento" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" "Esta el filamento cargado?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index db1b9afad..a117bb6be 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -498,7 +498,7 @@ "Insert filament" "Inserez le filament" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" "Fil. est-il charge?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index bba041728..256e2ecff 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -498,7 +498,7 @@ "Insert filament" "Inserire filamento" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" "Il filamento e' stato caricato?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 621bd9db4..4659053ef 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -498,7 +498,7 @@ "Insert filament" "Wprowadz filament" -#MSG_WIZARD_FILAMENT_LOADED c=20 r=2 +#MSG_FILAMENT_LOADED c=20 r=2 "Is filament loaded?" "Filament jest zaladowany?" From fbb3fad64bf8fab1a27393d896a5f4c07d82586c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 16:54:26 +0100 Subject: [PATCH 178/218] Remove duplicate string `Last print` using `MSG_LAST_PRINT` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 8 ++++---- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 2fa3796c7..7cb304fc8 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -46,6 +46,7 @@ const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1 const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1 +const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16 diff --git a/Firmware/messages.h b/Firmware/messages.h index f544c6073..4a363ba40 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -47,6 +47,7 @@ extern const char MSG_HEATING_COMPLETE[]; extern const char MSG_HOMEYZ[]; extern const char MSG_CHOOSE_EXTRUDER[]; extern const char MSG_CHOOSE_FILAMENT[]; +extern const char MSG_LAST_PRINT[]; extern const char MSG_LOAD_FILAMENT[]; extern const char MSG_LOADING_FILAMENT[]; extern const char MSG_M117_V2_CALIBRATION[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 26cb63bfd..7d2e26d48 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1638,7 +1638,7 @@ void lcd_menu_extruder_info() // NOT static due to using ins //! @code{.unparsed} //! |01234567890123456789| //! | Main | c=18 r=1 -//! | Last print | c=18 r=1 +//! | Last print | MSG_LAST_PRINT c=18 //! | Total | c=18 r=1 //! | | //! ---------------------- @@ -1647,7 +1647,7 @@ static void lcd_menu_fails_stats_mmu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_mmu_print); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print); MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 MENU_END(); } @@ -1780,7 +1780,7 @@ static void lcd_menu_fails_stats_print() //! @code{.unparsed} //! |01234567890123456789| //! | Main | c=18 r=1 -//! | Last print | c=18 r=1 +//! | Last print | MSG_LAST_PRINT c=18 //! | Total | c=18 r=1 //! | | //! ---------------------- @@ -1790,7 +1790,7 @@ static void lcd_menu_fails_stats() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Last print"), lcd_menu_fails_stats_print); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1 MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); ////c=18 r=1 MENU_END(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 89996f85d..c10879ca2 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -385,7 +385,7 @@ # "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -# +#MSG_LAST_PRINT c=18 "Last print" #MSG_SELFTEST_EXTRUDER_FAN c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index a06822541..28d78c441 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" -# +#MSG_LAST_PRINT c=18 "Last print" "Posledni tisk" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 7df5e9ecb..893363ac4 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." -# +#MSG_LAST_PRINT c=18 "Last print" "Letzter Druck" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 02cd82a0b..9c860f27d 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." -# +#MSG_LAST_PRINT c=18 "Last print" "Ultima impresion" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index a117bb6be..43b810685 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." -# +#MSG_LAST_PRINT c=18 "Last print" "Derniere impres." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 256e2ecff..0043c6d09 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." -# +#MSG_LAST_PRINT c=18 "Last print" "Ultima stampa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 4659053ef..b3f6893bd 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -514,7 +514,7 @@ "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." -# +#MSG_LAST_PRINT c=18 "Last print" "Ost. wydruk" From 7222cf05cf5fc6db3949a90200324a64a0d450a4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 17:38:36 +0100 Subject: [PATCH 179/218] Remove duplicate string `MMU Fails` and `MMU Load Fails` using `MSG_MMU_FAILS` and `MSG_MMU_LOAD_FAILS` --- Firmware/messages.c | 3 +++ Firmware/messages.h | 3 +++ Firmware/ultralcd.cpp | 26 +++++++++++++------------- lang/lang_en.txt | 6 +++--- lang/lang_en_cz.txt | 6 +++--- lang/lang_en_de.txt | 6 +++--- lang/lang_en_es.txt | 6 +++--- lang/lang_en_fr.txt | 6 +++--- lang/lang_en_it.txt | 6 +++--- lang/lang_en_pl.txt | 6 +++--- 10 files changed, 40 insertions(+), 34 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 7cb304fc8..1ba6da702 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -58,11 +58,14 @@ const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14 const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); //// +const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=14 +const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=14 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); //// const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); //// const char MSG_PAPER[] PROGMEM_I1 = ISTR("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."); ////c=20 r=10 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 +const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=14 const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////c=20 r=4 const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 4a363ba40..d21f9403e 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -57,11 +57,14 @@ extern const char MSG_SHEET[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MENU_CALIBRATION[]; +extern const char MSG_MMU_FAILS[]; +extern const char MSG_MMU_LOAD_FAILS[]; extern const char MSG_NO[]; extern const char MSG_NOZZLE[]; extern const char MSG_PAPER[]; extern const char MSG_PLACE_STEEL_SHEET[]; extern const char MSG_PLEASE_WAIT[]; +extern const char MSG_POWER_FAILURES[]; extern const char MSG_PREHEAT_NOZZLE[]; extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRINT_ABORTED[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7d2e26d48..94cb9cea5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1657,8 +1657,8 @@ static void lcd_menu_fails_stats_mmu() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | MMU fails: 000| c=14 r=1 -//! | MMU load fails: 000| c=14 r=1 +//! | MMU fails: 000| MSG_MMU_FAILS c=14 +//! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14 //! | | //! ---------------------- //! @endcode @@ -1671,8 +1671,8 @@ static void lcd_menu_fails_stats_mmu_print() lcd_home(); lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Last print failures"), ////c=20 r=1 - _i("MMU fails"), fails, ////c=14 r=1 - _i("MMU load fails"), load_fails); ////c=14 r=1 + _T(MSG_MMU_FAILS), fails, ////c=14 r=1 + _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1681,8 +1681,8 @@ static void lcd_menu_fails_stats_mmu_print() //! @code{.unparsed} //! |01234567890123456789| //! |Total failures | c=20 r=1 -//! | MMU fails: 000| c=14 r=1 -//! | MMU load fails: 000| c=14 r=1 +//! | MMU fails: 000| MSG_MMU_FAILS c=14 +//! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14 //! | MMU power fails:000| c=14 r=1 //! ---------------------- //! @endcode @@ -1696,8 +1696,8 @@ static void lcd_menu_fails_stats_mmu_total() lcd_home(); lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), _i("Total failures"), ////c=20 r=1 - _i("MMU fails"), fails, ////c=14 r=1 - _i("MMU load fails"), load_fails, ////c=14 r=1 + _T(MSG_MMU_FAILS), fails, ////c=14 r=1 + _T(MSG_MMU_LOAD_FAILS), load_fails, ////c=14 r=1 _i("MMU power fails"), mmu_power_failures); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1710,7 +1710,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! @code{.unparsed} //! |01234567890123456789| //! |Total failures | c=20 r=1 -//! | Power failures: 000| c=14 r=1 +//! | Power failures: 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts: 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- @@ -1726,7 +1726,7 @@ static void lcd_menu_fails_stats_total() lcd_home(); lcd_printf_P(failStatsFmt, _i("Total failures"), ////c=20 r=1 - _i("Power failures"), power, ////c=14 r=1 + _T(MSG_POWER_FAILURES), power, ////c=14 r=1 _i("Filam. runouts"), filam, ////c=14 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1 menu_back_if_clicked_fb(); @@ -1737,7 +1737,7 @@ static void lcd_menu_fails_stats_total() //! @code{.unparsed} //! |01234567890123456789| //! |Last print failures | c=20 r=1 -//! | Power failures 000| c=14 r=1 +//! | Power failures 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 //! ---------------------- @@ -1754,7 +1754,7 @@ static void lcd_menu_fails_stats_print() #ifndef PAT9125 lcd_printf_P(failStatsFmt, _i("Last print failures"), ////c=20 r=1 - _i("Power failures"), power, ////c=14 r=1 + _T(MSG_POWER_FAILURES), power, ////c=14 r=1 _i("Filam. runouts"), filam, ////c=14 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1 #else @@ -1764,7 +1764,7 @@ static void lcd_menu_fails_stats_print() " %-7.7S H %-3d S %-3d\n" " %-7.7S X %-3d Y %-3d"), _i("Last print failures"), ////c=20 r=1 - _i("Power failures"), power, ////c=14 r=1 + _T(MSG_POWER_FAILURES), power, ////c=14 r=1 _i("Runouts"), filam, fsensor_softfail, //c=7 _i("Crash"), crashX, crashY); ////c=7 r=1 #endif diff --git a/lang/lang_en.txt b/lang/lang_en.txt index c10879ca2..57c880895 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -448,13 +448,13 @@ # "Measured skew" -# +#MSG_MMU_FAILS c=14 "MMU fails" # "MMU load failed " -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" #MSG_MMU_OK_RESUMING c=20 r=4 @@ -625,7 +625,7 @@ #MSG_FS_PAUSE c=5 "Pause" -# +#MSG_POWER_FAILURES c=14 "Power failures" #MSG_PRINT_ABORTED c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 28d78c441..1842e9678 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -598,7 +598,7 @@ "Measured skew" "Merene zkoseni" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Selhani MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Zavedeni MMU selhalo" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "MMU selhani zavadeni" @@ -834,7 +834,7 @@ "Pause" "\x00" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Vypadky proudu" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 893363ac4..963946294 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -598,7 +598,7 @@ "Measured skew" "Schraeglauf" -# +#MSG_MMU_FAILS c=14 "MMU fails" "MMU Fehler" @@ -606,7 +606,7 @@ "MMU load failed " "MMU Ladefehler" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "MMU Ladefehler" @@ -834,7 +834,7 @@ "Pause" "\x00" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Netzfehler" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 9c860f27d..9ff9788ef 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -598,7 +598,7 @@ "Measured skew" "Desviacion med:" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Fallos MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Carga MMU fallida" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Carga MMU falla" @@ -834,7 +834,7 @@ "Pause" "Pausa" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Cortes de energia" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 43b810685..61cd88ead 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -598,7 +598,7 @@ "Measured skew" "Deviat.mesuree" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Echecs MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Echec chargement MMU" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Echecs charg. MMU" @@ -834,7 +834,7 @@ "Pause" "\x00" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Coup.de courant" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0043c6d09..8943b8886 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -598,7 +598,7 @@ "Measured skew" "Deviazione mis" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Fallimenti MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Caricamento MMU fallito" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Caricamenti MMU falliti" @@ -834,7 +834,7 @@ "Pause" "Pausa" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Mancanza corrente" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index b3f6893bd..d6302a89c 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -598,7 +598,7 @@ "Measured skew" "Zmierzony skos" -# +#MSG_MMU_FAILS c=14 "MMU fails" "Bledy MMU" @@ -606,7 +606,7 @@ "MMU load failed " "Blad ladowania MMU" -# +#MSG_MMU_LOAD_FAILS c=14 "MMU load fails" "Bledy ladow. MMU" @@ -834,7 +834,7 @@ "Pause" "Pauza" -# +#MSG_POWER_FAILURES c=14 "Power failures" "Zaniki zasilania" From 8f0a45e8a42ad772c7ed0a45b46153de58ea0018 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 17:58:51 +0100 Subject: [PATCH 180/218] Remove duplicate string `Steel sheets` and `Total` using `MSG_STEEL_SHEETS` and `MSG_TOTAL` --- Firmware/messages.c | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 12 ++++++------ 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 ++-- 10 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 1ba6da702..56b0d38d2 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -55,6 +55,7 @@ const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); //// const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); //// const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10 +const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60 const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14 const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); //// @@ -86,6 +87,7 @@ const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); //// const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// +const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6 const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18 const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index d21f9403e..c30fa54e3 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -54,6 +54,7 @@ extern const char MSG_M117_V2_CALIBRATION[]; extern const char MSG_MAIN[]; extern const char MSG_BACK[]; extern const char MSG_SHEET[]; +extern const char MSG_STEEL_SHEETS[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[]; extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[]; extern const char MSG_MENU_CALIBRATION[]; @@ -86,6 +87,7 @@ extern const char MSG_SELFTEST_MOTOR[]; extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; +extern const char MSG_TOTAL[]; extern const char MSG_HW_SETUP[]; extern const char MSG_MODE[]; extern const char MSG_HIGH_POWER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 94cb9cea5..cde25dbba 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1639,7 +1639,7 @@ void lcd_menu_extruder_info() // NOT static due to using ins //! |01234567890123456789| //! | Main | c=18 r=1 //! | Last print | MSG_LAST_PRINT c=18 -//! | Total | c=18 r=1 +//! | Total | MSG_TOTAL c=6 //! | | //! ---------------------- //! @endcode @@ -1648,7 +1648,7 @@ static void lcd_menu_fails_stats_mmu() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print); - MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total); ////c=18 r=1 MENU_END(); } @@ -1781,7 +1781,7 @@ static void lcd_menu_fails_stats_print() //! |01234567890123456789| //! | Main | c=18 r=1 //! | Last print | MSG_LAST_PRINT c=18 -//! | Total | c=18 r=1 +//! | Total | MSG_TOTAL c=6 //! | | //! ---------------------- //! @endcode @@ -1791,7 +1791,7 @@ static void lcd_menu_fails_stats() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1 - MENU_ITEM_SUBMENU_P(_i("Total"), lcd_menu_fails_stats_total); ////c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total); ////c=18 r=1 MENU_END(); } @@ -5642,7 +5642,7 @@ void lcd_hw_setup_menu(void) // can not be "static" MENU_BEGIN(); MENU_ITEM_BACK_P(_T(bSettings?MSG_SETTINGS:MSG_BACK)); // i.e. default menu-item / menu-item after checking mismatch - MENU_ITEM_SUBMENU_P(_i("Steel sheets"), sheets_menu); ////MSG_STEEL_SHEETS c=18 + MENU_ITEM_SUBMENU_P(_T(MSG_STEEL_SHEETS), sheets_menu); SETTINGS_NOZZLE; MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); @@ -6561,7 +6561,7 @@ static void activate_calibrate_sheet() static void lcd_sheet_menu() { MENU_BEGIN(); - MENU_ITEM_BACK_P(_i("Steel sheets")); ////MSG_STEEL_SHEETS c=18 + MENU_ITEM_BACK_P(_T(MSG_STEEL_SHEETS)); if(eeprom_is_sheet_initialized(selected_sheet)){ MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 57c880895..5913d491c 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -886,7 +886,7 @@ #MSG_UNLOADING_FILAMENT c=20 r=1 "Unloading filament" -# +#MSG_TOTAL c=6 "Total" #MSG_USED c=19 r=1 @@ -1093,7 +1093,7 @@ #MSG_SOUND_BLIND "Assist" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" #MSG_Z_CORRECTION c=13 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 1842e9678..7fbefefb7 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Vysouvam filament" -# +#MSG_TOTAL c=6 "Total" "Celkem" @@ -1458,7 +1458,7 @@ "Assist" "Asist." -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Tiskove platy" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 963946294..e9b689329 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Filament auswerfen" -# +#MSG_TOTAL c=6 "Total" "Gesamt" @@ -1458,7 +1458,7 @@ "Assist" "\x00" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Stahlbleche" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 9ff9788ef..ef43b1491 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Soltando filamento" -# +#MSG_TOTAL c=6 "Total" "\x00" @@ -1458,7 +1458,7 @@ "Assist" "Asistido" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Lamina de acero" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 61cd88ead..06d5c49d3 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Dechargement fil." -# +#MSG_TOTAL c=6 "Total" "Totale" @@ -1458,7 +1458,7 @@ "Assist" "\x00" -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Plaques en acier" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8943b8886..567e92227 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Scaricando filamento" -# +#MSG_TOTAL c=6 "Total" "Totale" @@ -1458,7 +1458,7 @@ "Assist" "Assist." -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Piani d'acciaio" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index d6302a89c..f951c7d9e 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1182,7 +1182,7 @@ "Unloading filament" "Rozladowuje filament" -# +#MSG_TOTAL c=6 "Total" "Suma" @@ -1458,7 +1458,7 @@ "Assist" "Asyst." -# c=18 +#MSG_STEEL_SHEET c=18 "Steel sheets" "Plyty stalowe" From 99867c8fbd59c7ee5b6a918f40ca0b624fb5049e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 18:06:47 +0100 Subject: [PATCH 181/218] Remove duplicate string `Total failures` using `MSG_TOTAL_FAILURES` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 18 +++++++++--------- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 56b0d38d2..21e6b3903 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -88,6 +88,7 @@ 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_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6 +const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20 const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18 const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index c30fa54e3..356a0dd99 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -88,6 +88,7 @@ extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; extern const char MSG_TOTAL[]; +extern const char MSG_TOTAL_FAILURES[]; extern const char MSG_HW_SETUP[]; extern const char MSG_MODE[]; extern const char MSG_HIGH_POWER[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cde25dbba..c7093687e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1680,7 +1680,7 @@ static void lcd_menu_fails_stats_mmu_print() //! //! @code{.unparsed} //! |01234567890123456789| -//! |Total failures | c=20 r=1 +//! |Total failures | MSG_TOTAL_FAILURES c=20 //! | MMU fails: 000| MSG_MMU_FAILS c=14 //! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14 //! | MMU power fails:000| c=14 r=1 @@ -1695,9 +1695,9 @@ static void lcd_menu_fails_stats_mmu_total() uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL_TOT); lcd_home(); lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), - _i("Total failures"), ////c=20 r=1 - _T(MSG_MMU_FAILS), fails, ////c=14 r=1 - _T(MSG_MMU_LOAD_FAILS), load_fails, ////c=14 r=1 + _T(MSG_TOTAL_FAILURES), ////c=20 + _T(MSG_MMU_FAILS), fails, ////c=14 + _T(MSG_MMU_LOAD_FAILS), load_fails, ////c=14 _i("MMU power fails"), mmu_power_failures); ////c=14 r=1 menu_back_if_clicked_fb(); } @@ -1709,7 +1709,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! //! @code{.unparsed} //! |01234567890123456789| -//! |Total failures | c=20 r=1 +//! |Total failures | MSG_TOTAL_FAILURES c=20 //! | Power failures: 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts: 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 @@ -1725,8 +1725,8 @@ static void lcd_menu_fails_stats_total() uint16_t crashY = eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT); lcd_home(); lcd_printf_P(failStatsFmt, - _i("Total failures"), ////c=20 r=1 - _T(MSG_POWER_FAILURES), power, ////c=14 r=1 + _T(MSG_TOTAL_FAILURES), ////c=20 + _T(MSG_POWER_FAILURES), power, ////c=14 _i("Filam. runouts"), filam, ////c=14 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1 menu_back_if_clicked_fb(); @@ -1808,7 +1808,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-1 //! |01234567890123456789| //! |Last print failures | c=20 r=1 //! | Filam. runouts 000| c=14 r=1 -//! |Total failures | c=20 r=1 +//! |Total failures | MSG_TOTAL_FAILURES c=20 //! | Filam. runouts 000| c=14 r=1 //! ---------------------- //! @endcode @@ -1822,7 +1822,7 @@ static void lcd_menu_fails_stats() lcd_printf_P(failStatsFmt, _i("Last print failures"), ////c=20 r=1 _i("Filam. runouts"), filamentLast, ////c=14 r=1 - _i("Total failures"), ////c=20 r=1 + _T(MSG_TOTAL_FAILURES), ////c=20 _i("Filam. runouts"), filamentTotal); ////c=14 r=1 menu_back_if_clicked(); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 5913d491c..2784e68e6 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -871,7 +871,7 @@ # "Unload" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 7fbefefb7..5c263245b 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1162,7 +1162,7 @@ "Unload" "Vysunout" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" "Celkem selhani" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index e9b689329..eb7e42f01 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1162,7 +1162,7 @@ "Unload" "Entladen" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" "Gesamte Fehler" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ef43b1491..3977d378e 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1162,7 +1162,7 @@ "Unload" "Descargar" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" "Fallos totales" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 06d5c49d3..357ca7bed 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1162,7 +1162,7 @@ "Unload" "Decharger" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" "Total des echecs" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 567e92227..a45fde10b 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1162,7 +1162,7 @@ "Unload" "Scarica" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" "Totale fallimenti" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index f951c7d9e..d0805014d 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1162,7 +1162,7 @@ "Unload" "Rozladuj" -# +#MSG_TOTAL_FAILURES c=20 "Total failures" "Suma bledow" From 4878db73653d49386f6771d2bd65d33014799215 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 18:38:35 +0100 Subject: [PATCH 182/218] Remove duplicate string `Last print failures` using `MSG_LAST_PRINT_FAILURES` Fix too long translations in Spanish and Italian for this message --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 20 ++++++++++---------- 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 | 4 ++-- lang/lang_en_pl.txt | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 21e6b3903..b07bd3b5c 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -47,6 +47,7 @@ const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1 const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1 const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18 +const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////c=20 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16 diff --git a/Firmware/messages.h b/Firmware/messages.h index 356a0dd99..f6947e740 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -48,6 +48,7 @@ extern const char MSG_HOMEYZ[]; extern const char MSG_CHOOSE_EXTRUDER[]; extern const char MSG_CHOOSE_FILAMENT[]; extern const char MSG_LAST_PRINT[]; +extern const char MSG_LAST_PRINT_FAILURES[]; extern const char MSG_LOAD_FILAMENT[]; extern const char MSG_LOADING_FILAMENT[]; extern const char MSG_M117_V2_CALIBRATION[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c7093687e..288a81fe2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1656,7 +1656,7 @@ static void lcd_menu_fails_stats_mmu() //! //! @code{.unparsed} //! |01234567890123456789| -//! |Last print failures | c=20 r=1 +//! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 //! | MMU fails: 000| MSG_MMU_FAILS c=14 //! | MMU load fails: 000| MSG_MMU_LOAD_FAILS c=14 //! | | @@ -1670,9 +1670,9 @@ static void lcd_menu_fails_stats_mmu_print() uint16_t load_fails = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); lcd_home(); lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"), - _i("Last print failures"), ////c=20 r=1 - _T(MSG_MMU_FAILS), fails, ////c=14 r=1 - _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14 r=1 + _T(MSG_LAST_PRINT_FAILURES), ////c=20 + _T(MSG_MMU_FAILS), fails, ////c=14 + _T(MSG_MMU_LOAD_FAILS), load_fails); ////c=14 menu_back_if_clicked_fb(); } @@ -1736,7 +1736,7 @@ static void lcd_menu_fails_stats_total() //! //! @code{.unparsed} //! |01234567890123456789| -//! |Last print failures | c=20 r=1 +//! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 //! | Power failures 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts 000| c=14 r=1 //! | Crash X:000 Y:000| c=7 r=1 @@ -1753,8 +1753,8 @@ static void lcd_menu_fails_stats_print() lcd_home(); #ifndef PAT9125 lcd_printf_P(failStatsFmt, - _i("Last print failures"), ////c=20 r=1 - _T(MSG_POWER_FAILURES), power, ////c=14 r=1 + _T(MSG_LAST_PRINT_FAILURES), ////c=20 + _T(MSG_POWER_FAILURES), power, ////c=14 _i("Filam. runouts"), filam, ////c=14 r=1 _i("Crash"), crashX, crashY); ////c=7 r=1 #else @@ -1763,8 +1763,8 @@ static void lcd_menu_fails_stats_print() " %-16.16S%-3d\n" " %-7.7S H %-3d S %-3d\n" " %-7.7S X %-3d Y %-3d"), - _i("Last print failures"), ////c=20 r=1 - _T(MSG_POWER_FAILURES), power, ////c=14 r=1 + _T(MSG_LAST_PRINT_FAILURES), ////c=20 + _T(MSG_POWER_FAILURES), power, ////c=14 _i("Runouts"), filam, fsensor_softfail, //c=7 _i("Crash"), crashX, crashY); ////c=7 r=1 #endif @@ -1820,7 +1820,7 @@ static void lcd_menu_fails_stats() uint16_t filamentTotal = eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT); lcd_home(); lcd_printf_P(failStatsFmt, - _i("Last print failures"), ////c=20 r=1 + _T(MSG_LAST_PRINT_FAILURES), ////c=20 _i("Filam. runouts"), filamentLast, ////c=14 r=1 _T(MSG_TOTAL_FAILURES), ////c=20 _i("Filam. runouts"), filamentTotal); ////c=14 r=1 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 2784e68e6..cd2488780 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -379,7 +379,7 @@ #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 5c263245b..ca77d817d 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -506,7 +506,7 @@ "Is steel sheet on heatbed?" "Je tiskovy plat na podlozce?" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" "Selhani posl. tisku" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index eb7e42f01..5fa8d2bed 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -506,7 +506,7 @@ "Is steel sheet on heatbed?" "Liegt das Stahlblech auf dem Heizbett?" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" "Letzte Druckfehler" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3977d378e..806de2cb0 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -506,9 +506,9 @@ "Is steel sheet on heatbed?" "?Esta colocada la lamina sobre la base" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" -"Ultimas impresiones fallidas" +"Ultimos imp. fallos" # "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 357ca7bed..0abc7b1c4 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -506,7 +506,7 @@ "Is steel sheet on heatbed?" "Est la plaque sur le plat. chauffant?" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" "Echecs derniere imp." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index a45fde10b..c58f4102b 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -506,9 +506,9 @@ "Is steel sheet on heatbed?" "Piastra d'acciaio su piano riscaldato?" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" -"Fallimenti ultima stampa" +"Ultimi errori stampa" # "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index d0805014d..89bf2b993 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -506,7 +506,7 @@ "Is steel sheet on heatbed?" "Czy plyta stal. jest na podgrzew. stole?" -# +#MSG_LAST_PRINT_FAILURES c=20 "Last print failures" "Ostatnie bledy druku" From 10bbd64b41c2a42ad7ae718313ccc0c060bd5c3c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 18:53:53 +0100 Subject: [PATCH 183/218] Remove duplicate string `Crash` using `MSG_CRASH` Better Italian translation, thanks to @wavexx Fix Polish translation as it was too long for the menue and caused LCD issues. --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + 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 | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index b07bd3b5c..ce1023c89 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -21,6 +21,7 @@ const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r 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[] PROGMEM_I1 = ISTR("Crash"); ////c=7 const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index f6947e740..4e29986c0 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -22,6 +22,7 @@ extern const char MSG_CALIBRATE_Z_AUTO[]; extern const char MSG_CARD_MENU[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_COOLDOWN[]; +extern const char MSG_CRASH[]; extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT[]; extern const char MSG_ERROR[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 288a81fe2..a64f7d726 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1712,7 +1712,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! |Total failures | MSG_TOTAL_FAILURES c=20 //! | Power failures: 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts: 000| c=14 r=1 -//! | Crash X:000 Y:000| c=7 r=1 +//! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1728,7 +1728,7 @@ static void lcd_menu_fails_stats_total() _T(MSG_TOTAL_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 _i("Filam. runouts"), filam, ////c=14 r=1 - _i("Crash"), crashX, crashY); ////c=7 r=1 + _T(MSG_CRASH), crashX, crashY); ////c=7 menu_back_if_clicked_fb(); } @@ -1739,7 +1739,7 @@ static void lcd_menu_fails_stats_total() //! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 //! | Power failures 000| MSG_POWER_FAILURES c=14 //! | Filam. runouts 000| c=14 r=1 -//! | Crash X:000 Y:000| c=7 r=1 +//! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1756,7 +1756,7 @@ static void lcd_menu_fails_stats_print() _T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 _i("Filam. runouts"), filam, ////c=14 r=1 - _i("Crash"), crashX, crashY); ////c=7 r=1 + _T(MSG_CRASH), crashX, crashY); ////c=7 #else // On the MK3 include detailed PAT9125 statistics about soft failures lcd_printf_P(PSTR("%S\n" @@ -1766,7 +1766,7 @@ static void lcd_menu_fails_stats_print() _T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 _i("Runouts"), filam, fsensor_softfail, //c=7 - _i("Crash"), crashX, crashY); ////c=7 r=1 + _T(MSG_CRASH), crashX, crashY); ////c=7 #endif menu_back_if_clicked_fb(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index cd2488780..d8f94d159 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -163,7 +163,7 @@ # "Crash detected. Resume print?" -# +#MSG_CRASH c=7 "Crash" #MSG_CURRENT c=19 r=1 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index ca77d817d..e3b84a40d 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Detekovan naraz. Obnovit tisk?" -# +#MSG_CRASH c=7 "Crash" "Naraz" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5fa8d2bed..77821b67b 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Crash erkannt. Druck fortfuehren?" -# +#MSG_CRASH c=7 "Crash" "\x00" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 806de2cb0..afeaefce0 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Choque detectado. Continuar impresion?" -# +#MSG_CRASH c=7 "Crash" "Choque" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 0abc7b1c4..ca82fc6f7 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Crash detecte. Poursuivre l'impression?" -# +#MSG_CRASH c=7 "Crash" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index c58f4102b..e88a00e01 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -218,7 +218,7 @@ "Crash detected. Resume print?" "Scontro rilevato. Riprendere la stampa?" -# +#MSG_CRASH c=7 "Crash" "Impatto" @@ -508,7 +508,7 @@ #MSG_LAST_PRINT_FAILURES c=20 "Last print failures" -"Ultimi errori stampa" +"Errori ultima stampa" # "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 89bf2b993..050b17a16 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -218,9 +218,9 @@ "Crash detected. Resume print?" "Wykryto zderzenie. Wznowic druk?" -# +#MSG_CRASH c=7 "Crash" -"Zderzenie" +"Zderzen" #MSG_CURRENT c=19 r=1 "Current" From d117a299f7bc8f83b99ea263e2891549fedeef54 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 20:04:18 +0100 Subject: [PATCH 184/218] Remove duplicate string `Fil. runouts ` using `MSG_FIL_RUNOUTS` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 18 +++++++++--------- lang/lang_en.txt | 4 ++-- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 6 +++--- lang/lang_en_es.txt | 6 +++--- lang/lang_en_fr.txt | 6 +++--- lang/lang_en_it.txt | 6 +++--- lang/lang_en_pl.txt | 4 ++-- 10 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index ce1023c89..8594088c4 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -26,6 +26,7 @@ const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 +const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=14 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2 diff --git a/Firmware/messages.h b/Firmware/messages.h index 4e29986c0..0d0e1d706 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -27,6 +27,7 @@ extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; +extern const char MSG_FIL_RUNOUTS[]; extern const char MSG_FILAMENT[]; extern const char MSG_FAN_SPEED[]; extern const char MSG_FILAMENT_CLEAN[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a64f7d726..e14a8648b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1711,7 +1711,7 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" " %-16.16S%- //! |01234567890123456789| //! |Total failures | MSG_TOTAL_FAILURES c=20 //! | Power failures: 000| MSG_POWER_FAILURES c=14 -//! | Filam. runouts: 000| c=14 r=1 +//! | Fil. runouts : 000| MSG_FIL_RUNOUTS c=14 //! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode @@ -1727,7 +1727,7 @@ static void lcd_menu_fails_stats_total() lcd_printf_P(failStatsFmt, _T(MSG_TOTAL_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 - _i("Filam. runouts"), filam, ////c=14 r=1 + _T(MSG_FIL_RUNOUTS), filam, ////c=14 _T(MSG_CRASH), crashX, crashY); ////c=7 menu_back_if_clicked_fb(); } @@ -1738,7 +1738,7 @@ static void lcd_menu_fails_stats_total() //! |01234567890123456789| //! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 //! | Power failures 000| MSG_POWER_FAILURES c=14 -//! | Filam. runouts 000| c=14 r=1 +//! | Fil. runouts 000| MSG_FIL_RUNOUTS c=14 //! | Crash X:000 Y:000| MSG_CRASH c=7 //! ---------------------- //! @endcode @@ -1755,7 +1755,7 @@ static void lcd_menu_fails_stats_print() lcd_printf_P(failStatsFmt, _T(MSG_LAST_PRINT_FAILURES), ////c=20 _T(MSG_POWER_FAILURES), power, ////c=14 - _i("Filam. runouts"), filam, ////c=14 r=1 + _T(MSG_FIL_RUNOUTS), filam, ////c=14 _T(MSG_CRASH), crashX, crashY); ////c=7 #else // On the MK3 include detailed PAT9125 statistics about soft failures @@ -1806,10 +1806,10 @@ static const char failStatsFmt[] PROGMEM = "%S\n" " %-16.16S%-3d\n" "%S\n" " %-1 //! Example screen: //! @code{.unparsed} //! |01234567890123456789| -//! |Last print failures | c=20 r=1 -//! | Filam. runouts 000| c=14 r=1 +//! |Last print failures | MSG_LAST_PRINT_FAILURES c=20 +//! | Fil. runouts 000| MSG_FIL_RUNOUTS c=14 //! |Total failures | MSG_TOTAL_FAILURES c=20 -//! | Filam. runouts 000| c=14 r=1 +//! | Fil. runouts 000| MSG_FIL_RUNOUTS c=14 //! ---------------------- //! @endcode //! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations. @@ -1821,9 +1821,9 @@ static void lcd_menu_fails_stats() lcd_home(); lcd_printf_P(failStatsFmt, _T(MSG_LAST_PRINT_FAILURES), ////c=20 - _i("Filam. runouts"), filamentLast, ////c=14 r=1 + _T(MSG_FIL_RUNOUTS), filamentLast, ////c=14 _T(MSG_TOTAL_FAILURES), ////c=20 - _i("Filam. runouts"), filamentTotal); ////c=14 r=1 + _T(MSG_FIL_RUNOUTS), filamentTotal); ////c=14 menu_back_if_clicked(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index d8f94d159..d689e1212 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -253,8 +253,8 @@ #MSG_FSENSOR "Fil. sensor" -# c=14 -"Filam. runouts" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index e3b84a40d..7428364e2 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -338,8 +338,8 @@ "Fil. sensor" "Fil. senzor" -# c=14 -"Filam. runouts" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " "Vypadky filam." #MSG_FILAMENT_CLEAN c=20 r=2 diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 77821b67b..5cccf055f 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -338,9 +338,9 @@ "Fil. sensor" "Fil. Sensor" -# c=14 -"Filam. runouts" -"Filam. Maengel" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " +"Fil. Maengel " #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index afeaefce0..6dde32118 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -338,9 +338,9 @@ "Fil. sensor" "Sensor Fil." -# c=14 -"Filam. runouts" -"Filam. acabado" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " +"Fil. acabado " #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index ca82fc6f7..0bf46e827 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -338,9 +338,9 @@ "Fil. sensor" "Capteur Fil." -# c=14 -"Filam. runouts" -"Fins filament" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " +"Fins filament " #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index e88a00e01..ec9c6bed7 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -338,9 +338,9 @@ "Fil. sensor" "Sensore fil." -# c=14 -"Filam. runouts" -"Fil. esauriti" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " +"Fil. esauriti " #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 050b17a16..1eb1a630e 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -338,8 +338,8 @@ "Fil. sensor" "Czuj. filam." -# c=14 -"Filam. runouts" +#MSG_FIL_RUNOUTS c=14 +"Fil. runouts " "Konc.filamentu" #MSG_FILAMENT_CLEAN c=20 r=2 From 2d1e1e4ceef284e612411364f9452565c2f14d2d Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 20:13:12 +0100 Subject: [PATCH 185/218] Remove duplicate string `Fans check` using `MSG_FANS_CHECK` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 8594088c4..2eb814267 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -26,6 +26,7 @@ const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 +const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////c=13 const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=14 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 diff --git a/Firmware/messages.h b/Firmware/messages.h index 0d0e1d706..4db930439 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -27,6 +27,7 @@ extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASHDETECT[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; +extern const char MSG_FANS_CHECK[]; extern const char MSG_FIL_RUNOUTS[]; extern const char MSG_FILAMENT[]; extern const char MSG_FAN_SPEED[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e14a8648b..99920457e 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5688,7 +5688,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(_T(MSG_FANS_CHECK), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); SETTINGS_SILENT_MODE; @@ -6911,7 +6911,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(_T(MSG_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 d689e1212..3870a53b6 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -247,7 +247,7 @@ #MSG_SELFTEST_FAN c=20 "Fan test" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" #MSG_FSENSOR diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 7428364e2..2e1bceba4 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -330,7 +330,7 @@ "Fan test" "Test ventilatoru" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" "Kontr. vent." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5cccf055f..fa860fd4a 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -330,7 +330,7 @@ "Fan test" "Lueftertest" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" "Luefter Chk." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 6dde32118..79dc1ce55 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -330,7 +330,7 @@ "Fan test" "Test ventiladores" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" "Comprob.vent" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 0bf46e827..0ad82e755 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -330,7 +330,7 @@ "Fan test" "Test du ventilateur" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" "Verif vent." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index ec9c6bed7..158ae2bb1 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -330,7 +330,7 @@ "Fan test" "Test ventola" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" "Control.vent" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 1eb1a630e..177d6937f 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -330,7 +330,7 @@ "Fan test" "Test wentylatora" -#MSG_FANS_CHECK +#MSG_FANS_CHECK c=13 "Fans check" "Sprawd.went." From 797d8e74a359d67dabef381ffcb4055ee639957b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 07:10:57 +0100 Subject: [PATCH 186/218] Remove duplicate string `Checking X axis` and `Checking Y axis` using `MSG_CHECKING_X` and `MSG_CHECKING_Y` --- Firmware/messages.c | 2 ++ Firmware/messages.h | 2 ++ Firmware/ultralcd.cpp | 8 ++++---- 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 ++-- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 2eb814267..7af940906 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -19,6 +19,8 @@ const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt Status");////c=18 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2 const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// +const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20 +const char MSG_CHECKING_Y[] PROGMEM_I1 = ISTR("Checking Y axis"); ////c=20 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[] PROGMEM_I1 = ISTR("Crash"); ////c=7 diff --git a/Firmware/messages.h b/Firmware/messages.h index 4db930439..7c2882750 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -20,6 +20,8 @@ extern const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[]; extern const char MSG_BELT_STATUS[]; extern const char MSG_CALIBRATE_Z_AUTO[]; extern const char MSG_CARD_MENU[]; +extern const char MSG_CHECKING_X[]; +extern const char MSG_CHECKING_Y[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_COOLDOWN[]; extern const char MSG_CRASH[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 99920457e..f32cd962c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7232,7 +7232,7 @@ void lcd_belttest() uint16_t X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); uint16_t Y = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_Y)); - lcd_printf_P(_i("Checking X axis ")); // share message with selftest + lcd_printf_P(_T(MSG_CHECKING_X)); lcd_set_cursor(0,1), lcd_printf_P(PSTR("X: %u -> ..."),X); KEEPALIVE_STATE(IN_HANDLER); @@ -7241,7 +7241,7 @@ void lcd_belttest() if (lcd_selfcheck_axis_sg(X_AXIS)){ X = eeprom_read_word((uint16_t*)(EEPROM_BELTSTATUS_X)); lcd_set_cursor(10,1), lcd_printf_P(PSTR("%u"),X); // Show new X value next to old one. - lcd_puts_at_P(0,2,_i("Checking Y axis ")); + lcd_puts_at_P(0,2,_T(MSG_CHECKING_Y)); lcd_set_cursor(0,3), lcd_printf_P(PSTR("Y: %u -> ..."),Y); if (lcd_selfcheck_axis_sg(Y_AXIS)) { @@ -8379,8 +8379,8 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s if (screen == TestScreen::PrintFan) lcd_puts_P(_T(MSG_SELFTEST_FAN)); if (screen == TestScreen::FansOk) lcd_puts_P(_T(MSG_SELFTEST_FAN)); if (screen == TestScreen::EndStops) lcd_puts_P(_i("Checking endstops"));////MSG_SELFTEST_CHECK_ENDSTOPS c=20 - if (screen == TestScreen::AxisX) lcd_puts_P(_i("Checking X axis "));////MSG_SELFTEST_CHECK_X c=20 - if (screen == TestScreen::AxisY) lcd_puts_P(_i("Checking Y axis "));////MSG_SELFTEST_CHECK_Y c=20 + if (screen == TestScreen::AxisX) lcd_puts_P(_T(MSG_CHECKING_X)); + if (screen == TestScreen::AxisY) lcd_puts_P(_T(MSG_CHECKING_Y)); if (screen == TestScreen::AxisZ) lcd_puts_P(_i("Checking Z axis "));////MSG_SELFTEST_CHECK_Z c=20 if (screen == TestScreen::Bed) lcd_puts_P(_T(MSG_SELFTEST_CHECK_BED)); if (screen == TestScreen::Hotend diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 3870a53b6..0cb83dd38 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -343,10 +343,10 @@ #MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " #MSG_SELFTEST_CHECK_Z c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 2e1bceba4..a04ce1fad 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -458,11 +458,11 @@ "Checking sensors " "Kontrola senzoru" -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " "Kontrola osy X" -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " "Kontrola osy Y" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index fa860fd4a..74da8d3a0 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -458,11 +458,11 @@ "Checking sensors " "Pruefe Sensoren " -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " "Pruefe X Achse " -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " "Pruefe Y Achse " diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 79dc1ce55..4a5f44a87 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -458,11 +458,11 @@ "Checking sensors " "Comprobando sensores" -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " "Control sensor X" -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " "Control sensor Y" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 0ad82e755..5f928a982 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -458,11 +458,11 @@ "Checking sensors " "Verif. des capteurs" -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " "Verification axe X" -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " "Verification axe Y" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 158ae2bb1..b1357dac5 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -458,11 +458,11 @@ "Checking sensors " "Controllo sensori" -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " "Verifica asse X" -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " "Verifica asse Y" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 177d6937f..cafc3d098 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -458,11 +458,11 @@ "Checking sensors " "Kontrola czujnikow" -#MSG_SELFTEST_CHECK_X c=20 +#MSG_CHECKING_X c=20 "Checking X axis " "Kontrola osi X" -#MSG_SELFTEST_CHECK_Y c=20 +#MSG_CHECKING_Y c=20 "Checking Y axis " "Kontrola osi Y" From 269fabc33054023a2daf8cf93fa32a7fecdcd3bb Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 07:15:46 +0100 Subject: [PATCH 187/218] Remove duplicate string `Cut filament` using `MSG_CUT_FILAMENT` --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f32cd962c..cec9feed2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6702,7 +6702,7 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); MENU_ITEM_SUBMENU_P(_i("Eject filament"), mmu_fil_eject_menu); #ifdef MMU_HAS_CUTTER - MENU_ITEM_SUBMENU_P(_i("Cut filament"), mmu_cut_filament_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu); #endif //MMU_HAS_CUTTER } else From 348902240ed1b8005b5f46d86ec17e37c580516c Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 26 Jan 2021 08:02:33 +0100 Subject: [PATCH 188/218] Fix code_seen_P("fv") broken by one of the merges --- 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 248505ef0..a770531ca 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3985,7 +3985,7 @@ void process_commands() #elif defined(BOOTAPP) //this is a safety precaution. This is because the new bootloader turns off the heaters, but the old one doesn't. The watchdog should be used most of the time. asm volatile("jmp 0x3E000"); #endif - }else if (code_seen("fv")) { // PRUSA fv + }else if (code_seen_P("fv")) { // PRUSA fv // get file version #ifdef SDSUPPORT card.openFile(strchr_pointer + 3,true); From 530b9f50b8437ed994bb7eaaa28e6a3afe3623e8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 08:22:08 +0100 Subject: [PATCH 189/218] Remove duplicate string `Eject filament` using `MSG_EJECT_FILAMENT` Fix few translations --- Firmware/ultralcd.cpp | 2 +- lang/lang_en.txt | 8 ++++---- lang/lang_en_cz.txt | 10 +++++----- lang/lang_en_de.txt | 14 +++++++------- lang/lang_en_es.txt | 8 ++++---- lang/lang_en_fr.txt | 8 ++++---- lang/lang_en_it.txt | 10 +++++----- lang/lang_en_pl.txt | 8 ++++---- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cec9feed2..915a0d42f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6700,7 +6700,7 @@ static void lcd_main_menu() //-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload); //bFilamentFirstRun=true; MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); - MENU_ITEM_SUBMENU_P(_i("Eject filament"), mmu_fil_eject_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FILAMENT), mmu_fil_eject_menu); #ifdef MMU_HAS_CUTTER MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu); #endif //MMU_HAS_CUTTER diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 0cb83dd38..4696df46a 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -187,7 +187,7 @@ #MSG_EXTRUDER_CORRECTION c=13 "E-correct:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" #MSG_EJECTING_FILAMENT c=20 r=1 @@ -344,13 +344,13 @@ "Checking sensors " #MSG_CHECKING_X c=20 -"Checking X axis " +"Checking X axis" #MSG_CHECKING_Y c=20 -"Checking Y axis " +"Checking Y axis" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " +"Checking Z axis" #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index a04ce1fad..08421237e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -250,9 +250,9 @@ "E-correct:" "Korekce E:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" -"Vysunout filament" +"Vysunout fil." #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" @@ -459,15 +459,15 @@ "Kontrola senzoru" #MSG_CHECKING_X c=20 -"Checking X axis " +"Checking X axis" "Kontrola osy X" #MSG_CHECKING_Y c=20 -"Checking Y axis " +"Checking Y axis" "Kontrola osy Y" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " +"Checking Z axis" "Kontrola osy Z" #MSG_CHOOSE_EXTRUDER c=20 r=1 diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 74da8d3a0..8c3490dc2 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -250,7 +250,7 @@ "E-correct:" "E-Korrektur:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" "Filamentauswurf" @@ -459,16 +459,16 @@ "Pruefe Sensoren " #MSG_CHECKING_X c=20 -"Checking X axis " -"Pruefe X Achse " +"Checking X axis" +"Pruefe X Achse" #MSG_CHECKING_Y c=20 -"Checking Y axis " -"Pruefe Y Achse " +"Checking Y axis" +"Pruefe Y Achse" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " -"Pruefe Z Achse " +"Checking Z axis" +"Pruefe Z Achse" #MSG_CHOOSE_EXTRUDER c=20 r=1 "Choose extruder:" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 4a5f44a87..42b925bc4 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -250,7 +250,7 @@ "E-correct:" "Corregir-E:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" "Expulsar fil." @@ -459,15 +459,15 @@ "Comprobando sensores" #MSG_CHECKING_X c=20 -"Checking X axis " +"Checking X axis" "Control sensor X" #MSG_CHECKING_Y c=20 -"Checking Y axis " +"Checking Y axis" "Control sensor Y" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " +"Checking Z axis" "Control sensor Z" #MSG_CHOOSE_EXTRUDER c=20 r=1 diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 5f928a982..341e215db 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -250,7 +250,7 @@ "E-correct:" "Correct-E:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" "Remonter le fil." @@ -459,15 +459,15 @@ "Verif. des capteurs" #MSG_CHECKING_X c=20 -"Checking X axis " +"Checking X axis" "Verification axe X" #MSG_CHECKING_Y c=20 -"Checking Y axis " +"Checking Y axis" "Verification axe Y" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " +"Checking Z axis" "Verification axe Z" #MSG_CHOOSE_EXTRUDER c=20 r=1 diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b1357dac5..cb72754f1 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -250,9 +250,9 @@ "E-correct:" "Correzione-E:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" -"Espelli filamento" +"Espelli fil." #MSG_EJECTING_FILAMENT c=20 r=1 "Ejecting filament" @@ -459,15 +459,15 @@ "Controllo sensori" #MSG_CHECKING_X c=20 -"Checking X axis " +"Checking X axis" "Verifica asse X" #MSG_CHECKING_Y c=20 -"Checking Y axis " +"Checking Y axis" "Verifica asse Y" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " +"Checking Z axis" "Verifica asse Z" #MSG_CHOOSE_EXTRUDER c=20 r=1 diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index cafc3d098..5e208411e 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -250,7 +250,7 @@ "E-correct:" "Korekcja-E:" -#MSG_EJECT_FILAMENT c=17 r=1 +#MSG_EJECT_FILAMENT c=16 "Eject filament" "Wysun filament" @@ -459,15 +459,15 @@ "Kontrola czujnikow" #MSG_CHECKING_X c=20 -"Checking X axis " +"Checking X axis" "Kontrola osi X" #MSG_CHECKING_Y c=20 -"Checking Y axis " +"Checking Y axis" "Kontrola osi Y" #MSG_SELFTEST_CHECK_Z c=20 -"Checking Z axis " +"Checking Z axis" "Kontrola osi Z" #MSG_CHOOSE_EXTRUDER c=20 r=1 From c6588193adb6c9ee1f6fe7ad24b64cc5819428ce Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Tue, 26 Jan 2021 09:24:18 +0200 Subject: [PATCH 190/218] Fix some more stuff in cardreader.cpp Saved 4B of flash and 60B of RAM --- Firmware/cardreader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 566347efe..fd0ca2732 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -427,7 +427,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru SERIAL_PROTOCOLLNRPGM(_N("File selected"));////MSG_SD_FILE_SELECTED getfilename(0, fname); lcd_setstatus(longFilename[0] ? longFilename : fname); - lcd_setstatus("SD-PRINTING "); + lcd_setstatuspgm(PSTR("SD-PRINTING")); } else { @@ -478,7 +478,7 @@ void CardReader::removeFile(const char* name) { SERIAL_PROTOCOLPGM("Deletion failed, File: "); SERIAL_PROTOCOL(fname); - SERIAL_PROTOCOLLNPGM("."); + SERIAL_PROTOCOLLN('.'); } } @@ -546,7 +546,7 @@ void CardReader::write_command_no_newline(char *buf) { SERIAL_ERROR_START; SERIAL_ERRORLNRPGM(MSG_SD_ERR_WRITE_TO_FILE); - MYSERIAL.println("An error while writing to the SD Card."); + SERIAL_PROTOCOLLNPGM("An error while writing to the SD Card."); } } From bce8501eea0a32cedc738dabb2fc60f664dc36b4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 08:31:21 +0100 Subject: [PATCH 191/218] Remove duplicate string `Extruder` using `MSG_Extruder` --- Firmware/messages.c | 2 +- Firmware/ultralcd.cpp | 2 +- lang/lang_en.txt | 2 +- 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 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 7af940906..b720d9e62 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -27,7 +27,7 @@ const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7 const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// -const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 +const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////c=13 const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=14 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 915a0d42f..2c0950242 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4262,7 +4262,7 @@ void lcd_move_menu_axis() MENU_ITEM_SUBMENU_P(_i("Move X"), lcd_move_x);////MSG_MOVE_X MENU_ITEM_SUBMENU_P(_i("Move Y"), lcd_move_y);////MSG_MOVE_Y MENU_ITEM_SUBMENU_P(_i("Move Z"), lcd_move_z);////MSG_MOVE_Z - MENU_ITEM_SUBMENU_P(_i("Extruder"), lcd_move_e);////MSG_MOVE_E + MENU_ITEM_SUBMENU_P(_T(MSG_EXTRUDER), lcd_move_e);////MSG_EXTRUDER MENU_END(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 4696df46a..e069677d0 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -229,7 +229,7 @@ #MSG_INFO_EXTRUDER c=18 "Extruder info" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 08421237e..3517dd139 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -306,7 +306,7 @@ "Extruder info" "\x00" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 8c3490dc2..9494ff728 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -306,7 +306,7 @@ "Extruder info" "Extruder Info" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" "\x00" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 42b925bc4..aae73f267 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -306,7 +306,7 @@ "Extruder info" "Info. del extrusor" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" "Extruir" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 341e215db..91eba1942 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -306,7 +306,7 @@ "Extruder info" "Infos extrudeur" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" "Extrudeur" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index cb72754f1..1573772f0 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -306,7 +306,7 @@ "Extruder info" "Info estrusore" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" "Estrusore" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 5e208411e..3fca06148 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -306,7 +306,7 @@ "Extruder info" "Ekstruder - info" -#MSG_MOVE_E +#MSG_EXTRUDER c=17 "Extruder" "Ekstruder" From ab5aad636f9ad71c06a1273585f23ec21c33012f Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 09:05:38 +0100 Subject: [PATCH 192/218] Remove duplicate string `Mesh Bed Leveling` and `Mesh bed leveling` using `MSG_MESH_BED_LEVELING` Fixed few too long translations --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 5 +---- lang/lang_en_cz.txt | 6 +----- lang/lang_en_de.txt | 6 +----- lang/lang_en_es.txt | 8 ++------ lang/lang_en_fr.txt | 6 +----- lang/lang_en_it.txt | 6 +----- lang/lang_en_pl.txt | 8 ++------ 10 files changed, 13 insertions(+), 38 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index b720d9e62..ed5858fbf 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -141,6 +141,7 @@ 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_MESH_BED_LEVELING[] PROGMEM_I1 = ISTR("Mesh Bed Leveling"); ////c=18 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"); ////c=10 diff --git a/Firmware/messages.h b/Firmware/messages.h index 7c2882750..40294a337 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -141,6 +141,7 @@ 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_MESH_BED_LEVELING[]; extern const char MSG_Z_PROBE_NR[]; extern const char MSG_MAGNETS_COMP[]; extern const char MSG_FS_ACTION[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2c0950242..545788753 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5700,7 +5700,7 @@ static void lcd_settings_menu() SETTINGS_MMU_MODE; - MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_MBL_SETTINGS c=18 r=1 + MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bed_leveling_settings); #if defined (TMC2130) && defined (LINEARITY_CORRECTION) MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); @@ -5795,7 +5795,7 @@ static void lcd_calibration_menu() //MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1 #endif // "Mesh Bed Leveling" - MENU_ITEM_SUBMENU_P(_i("Mesh Bed Leveling"), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING + MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING #endif //MK1BP diff --git a/lang/lang_en.txt b/lang/lang_en.txt index e069677d0..a0ab70d09 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -436,7 +436,7 @@ #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 @@ -1024,9 +1024,6 @@ #MSG_MESH "Mesh" -# -"Mesh bed leveling" - # "MK3S firmware detected on MK3 printer" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3517dd139..31350c0ab 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Merim referencni vysku kalibracniho bodu" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "\x00" @@ -1366,10 +1366,6 @@ "Mesh" "\x00" -# -"Mesh bed leveling" -"Mesh Bed Leveling" - # "MK3S firmware detected on MK3 printer" "MK3S firmware detekovan na tiskarne MK3" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9494ff728..d1da88d84 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Messen der Referenzhoehe des Kalibrierpunktes" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "MeshBett Ausgleich" @@ -1366,10 +1366,6 @@ "Mesh" "Gitter" -# -"Mesh bed leveling" -"MeshBett Ausgleich" - # "MK3S firmware detected on MK3 printer" "MK3S-Firmware auf MK3-Drucker erkannt" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index aae73f267..aa33c217e 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -582,9 +582,9 @@ "Measuring reference height of calibration point" "Midiendo altura del punto de calibracion" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" -"Nivelacion Mesh Level" +"Nivela. Mesh Level" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." @@ -1366,10 +1366,6 @@ "Mesh" "Malla" -# -"Mesh bed leveling" -"Nivelacion Malla Base" - # "MK3S firmware detected on MK3 printer" "Firmware MK3S detectado en impresora MK3" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 91eba1942..13868553d 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Je mesure la hauteur de reference du point de calibrage" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "\x00" @@ -1366,10 +1366,6 @@ "Mesh" "\x00" -# -"Mesh bed leveling" -"\x00" - # "MK3S firmware detected on MK3 printer" "Firmware MK3S detecte sur imprimante MK3" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1573772f0..efeed6a10 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -582,7 +582,7 @@ "Measuring reference height of calibration point" "Misura altezza di rif. del punto di calib." -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" "Liv. grilia piano" @@ -1366,10 +1366,6 @@ "Mesh" "Griglia" -# -"Mesh bed leveling" -"Liv. griglia piano" - # "MK3S firmware detected on MK3 printer" "Firmware MK3S rilevato su stampante MK3" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 3fca06148..09224d8c1 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -582,9 +582,9 @@ "Measuring reference height of calibration point" "Okreslam wysokosc odniesienia punktu kalibracyjnego" -#MSG_MESH_BED_LEVELING +#MSG_MESH_BED_LEVELING c=18 "Mesh Bed Leveling" -"Poziomowanie stolu wg siatki" +"Poziomowanie stolu" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 "MMU OK. Resuming position..." @@ -1366,10 +1366,6 @@ "Mesh" "Siatka" -# -"Mesh bed leveling" -"Poziomowanie stolu" - # "MK3S firmware detected on MK3 printer" "Wykryto firmware MK3S w drukarce MK3" From c6a01b3806114cadfe3b1973ea31b1acef73afff Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 09:15:46 +0100 Subject: [PATCH 193/218] Remove duplicate string `Reset` using `MSG_RESET` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 6 +++--- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index ed5858fbf..b681cfd3b 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -79,6 +79,7 @@ const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4 const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2 const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); //// +const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14 const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); //// const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index 40294a337..ea2ddeea7 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -77,6 +77,7 @@ extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRINT_ABORTED[]; extern const char MSG_PULL_OUT_FILAMENT[]; extern const char MSG_RECOVER_PRINT[]; +extern const char MSG_RESET[]; extern const char MSG_REFRESH[]; extern const char MSG_REMOVE_STEEL_SHEET[]; extern const char MSG_RESUMING_PRINT[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 545788753..dd3f70267 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3189,7 +3189,7 @@ void lcd_adjust_bed(void) MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Front side[um]"), &_md->front, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Rear side [um]"), &_md->rear, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_REAR c=14 r=1 - MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_adjust_bed_reset);////MSG_BED_CORRECTION_RESET + MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_adjust_bed_reset);////MSG_RESET c=14 MENU_END(); } @@ -5795,7 +5795,7 @@ static void lcd_calibration_menu() //MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1 #endif // "Mesh Bed Leveling" - MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING + MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling); #endif //MK1BP @@ -6572,7 +6572,7 @@ static void lcd_sheet_menu() MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet);////MSG_V2_CALIBRATION c=18 } MENU_ITEM_SUBMENU_P(_i("Rename"), lcd_rename_sheet_menu); //// c=18 - MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_reset_sheet); //// c=18 + MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_reset_sheet); ////MSG_RESET c=14 MENU_END(); } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index a0ab70d09..8c5453463 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -691,7 +691,7 @@ #MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" #MSG_RESUME_PRINT diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 31350c0ab..b4e4a4fbf 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -922,7 +922,7 @@ "Reset XYZ calibr." "Reset XYZ kalibr." -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index d1da88d84..9164a4cac 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -922,7 +922,7 @@ "Reset XYZ calibr." "Reset XYZ Kalibr." -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" "Ruecksetzen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index aa33c217e..1cb9a7c86 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -922,7 +922,7 @@ "Reset XYZ calibr." "\x00" -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" "\x00" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 13868553d..7e7e3e138 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -922,7 +922,7 @@ "Reset XYZ calibr." "Reinit. calib. XYZ" -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" "Reinitialiser" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index efeed6a10..6c4175cbc 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -922,7 +922,7 @@ "Reset XYZ calibr." "Reset calibrazione XYZ." -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 09224d8c1..4705c688c 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -922,7 +922,7 @@ "Reset XYZ calibr." "Reset kalibr. XYZ" -#MSG_BED_CORRECTION_RESET +#MSG_RESET c=14 "Reset" "\x00" From ba8386573aeab96328c6001a3475468263587c02 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 09:23:55 +0100 Subject: [PATCH 194/218] Remove duplicate string `Resume print` using `MSG_RESUME_PRINT` --- Firmware/messages.c | 5 +++-- Firmware/messages.h | 3 ++- Firmware/ultralcd.cpp | 8 ++++---- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index b681cfd3b..433f2e7f8 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -79,9 +79,10 @@ const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4 const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2 const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); //// -const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14 -const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); //// const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 +const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14 +const char MSG_RESUME_PRINT[] PROGMEM_I1 = ISTR("Resume print"); ////c=18 +const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); //// const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index ea2ddeea7..e397ea0aa 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -77,9 +77,10 @@ extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRINT_ABORTED[]; extern const char MSG_PULL_OUT_FILAMENT[]; extern const char MSG_RECOVER_PRINT[]; -extern const char MSG_RESET[]; extern const char MSG_REFRESH[]; extern const char MSG_REMOVE_STEEL_SHEET[]; +extern const char MSG_RESET[]; +extern const char MSG_RESUME_PRINT[]; extern const char MSG_RESUMING_PRINT[]; extern const char MSG_SD_WORKDIR_FAIL[]; extern const char MSG_SELFTEST_COOLING_FAN[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dd3f70267..81bb0f3ca 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6620,9 +6620,9 @@ static void lcd_main_menu() { #ifdef FANCHECK if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #else - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #endif } @@ -6640,9 +6640,9 @@ static void lcd_main_menu() { #ifdef FANCHECK if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #else - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #endif } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8c5453463..21688a9d5 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -694,7 +694,7 @@ #MSG_RESET c=14 "Reset" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" #MSG_RESUMING_PRINT c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index b4e4a4fbf..6be8dba70 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Pokracovat" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9164a4cac..65c78d7ce 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -926,7 +926,7 @@ "Reset" "Ruecksetzen" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Druck fortsetzen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1cb9a7c86..e009c3f94 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Reanudar impres." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7e7e3e138..dfc7c1dcd 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -926,7 +926,7 @@ "Reset" "Reinitialiser" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Reprendre impression" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 6c4175cbc..336efb68c 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Riprendi stampa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 4705c688c..2feacf141 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Wznowic wydruk" From 0eb7261e29ca55be4a4db44fb9c32fdd4194f200 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 26 Jan 2021 09:29:17 +0100 Subject: [PATCH 195/218] Save ~100B on menu implementation --- Firmware/menu.cpp | 9 ++++++--- Firmware/menu.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 9c7704e6f..efa880734 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -252,8 +252,7 @@ static void menu_draw_item_puts_P(char type_char, const char* str, char num) lcd_set_cursor(0, menu_row); lcd_printf_P(PSTR("%c%-.16S "), menu_selection_mark(), str); lcd_putc(num); - lcd_set_cursor(19, menu_row); - lcd_putc(type_char); + lcd_putc_at(19, menu_row, type_char); } /* @@ -312,7 +311,7 @@ uint8_t menu_item_submenu_E(const Sheet &sheet, menu_func_t submenu) return 0; } -uint8_t menu_item_function_E(const Sheet &sheet, menu_func_t func) +uint8_t __attribute__((noinline)) menu_item_function_E(const Sheet &sheet, menu_func_t func) { if (menu_item == menu_line) { @@ -346,6 +345,10 @@ uint8_t menu_item_back_P(const char* str) return 0; } +bool __attribute__((noinline)) menu_item_leave(){ + return ((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving; +} + uint8_t menu_item_function_P(const char* str, menu_func_t func) { if (menu_item == menu_line) diff --git a/Firmware/menu.h b/Firmware/menu.h index 88363359b..c255393d1 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -112,7 +112,8 @@ extern uint8_t menu_item_function_E(const Sheet &sheet, menu_func_t func); extern uint8_t menu_item_back_P(const char* str); // leaving menu - this condition must be immediately before MENU_ITEM_BACK_P -#define ON_MENU_LEAVE(func) do { if (((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving){ func } } while (0) +#define ON_MENU_LEAVE(func) do { if (menu_item_leave()){ func } } while (0) +extern bool menu_item_leave(); #define MENU_ITEM_FUNCTION_P(str, func) do { if (menu_item_function_P(str, func)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, menu_func_t func); From 51d1e0bd8a533409d9eae4f44349abd1d8c76da2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 10:42:56 +0100 Subject: [PATCH 196/218] Remove duplicate string `G-code sliced for a different printer type. Continue?` using `MSG_GCODE_DIFF_PRINTER_CONTINUE` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/util.cpp | 4 ++-- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 433f2e7f8..bd1d81551 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -130,6 +130,7 @@ 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_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////c=20 r=5 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"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index e397ea0aa..11f731831 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -130,6 +130,7 @@ extern const char MSG_STRICT[]; extern const char MSG_MODEL[]; extern const char MSG_FIRMWARE[]; extern const char MSG_GCODE[]; +extern const char MSG_GCODE_DIFF_PRINTER_CONTINUE[]; extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_MMU_MODE[]; extern const char MSG_SD_CARD[]; diff --git a/Firmware/util.cpp b/Firmware/util.cpp index aac72ee0c..325db4660 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -428,7 +428,7 @@ switch(oCheckModel) { case ClCheckModel::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer model differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("G-code sliced for a different printer type. Continue?")); +lcd_display_message_fullscreen_P(_T(MSG_GCODE_DIFF_PRINTER_CONTINUE)); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery @@ -577,7 +577,7 @@ switch(oCheckModel) { case ClCheckModel::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer model differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("G-code sliced for a different printer type. Continue?")); +lcd_display_message_fullscreen_P(_T(MSG_GCODE_DIFF_PRINTER_CONTINUE)); lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 21688a9d5..207d08460 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1045,7 +1045,7 @@ # "G-code sliced for a different level. Please re-slice the model again. Print cancelled." -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 6be8dba70..320d2b99a 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1394,7 +1394,7 @@ "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "\x00" -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 65c78d7ce..9967e6d85 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1394,7 +1394,7 @@ "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." -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index e009c3f94..d2837bc97 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1394,7 +1394,7 @@ "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." -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" "Codigo G laminado para un tipo de impresora diferente. ?Continuar?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index dfc7c1dcd..8b6f88c50 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1394,7 +1394,7 @@ "G-code sliced for a different level. Please re-slice the model again. Print cancelled." "Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee." -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" "Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 336efb68c..b36c7a394 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1394,7 +1394,7 @@ "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." -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" "G-code processato per una stampante diversa. Continuare?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 2feacf141..cc78b676b 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1394,7 +1394,7 @@ "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." -# +#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" "G-code pociety dla innej drukarki. Kontynuowac?" From c555907a12c72dca4994895cba7a221bdad51d6d Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 11:01:50 +0100 Subject: [PATCH 197/218] Remove duplicate string `G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.` using `MSG_GCODE_DIFF_PRINTER_CANCELLED` --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/util.cpp | 4 ++-- lang/lang_en.txt | 2 +- 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 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index bd1d81551..0b1d58e04 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -131,6 +131,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_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////c=20 r=5 +const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); ////c=20 r=6 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"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 11f731831..0a05c58f5 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -131,6 +131,7 @@ extern const char MSG_MODEL[]; extern const char MSG_FIRMWARE[]; extern const char MSG_GCODE[]; extern const char MSG_GCODE_DIFF_PRINTER_CONTINUE[]; +extern const char MSG_GCODE_DIFF_PRINTER_CANCELLED[]; extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_MMU_MODE[]; extern const char MSG_SD_CARD[]; diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 325db4660..e335793a0 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -434,7 +434,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); lcd_update_enable(true); // display / status-line recovery break; case ClCheckModel::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_T(MSG_GCODE_DIFF_PRINTER_CANCELLED)); lcd_print_stop(); break; case ClCheckModel::_None: @@ -583,7 +583,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); lcd_update_enable(true); // display / status-line recovery break; case ClCheckModel::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_T(MSG_GCODE_DIFF_PRINTER_CANCELLED)); lcd_print_stop(); break; case ClCheckModel::_None: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 207d08460..bcb0a4444 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1048,7 +1048,7 @@ #MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 320d2b99a..0b3d7b14f 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "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." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9967e6d85..0a436a9ee 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "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." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index d2837bc97..2e29fa20a 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "Codigo G laminado para un tipo de impresora diferente. ?Continuar?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "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." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 8b6f88c50..cc0cbb95b 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "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." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b36c7a394..8cd939082 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-code processato per una stampante diversa. Continuare?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "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." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index cc78b676b..38d1421f7 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-code pociety dla innej drukarki. Kontynuowac?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "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." From 0aae433bda910d350175649cb6eafc70c09589a8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 26 Jan 2021 11:08:57 +0100 Subject: [PATCH 198/218] Update po files after all these changes --- lang/po/Firmware.pot | 667 ++++---- lang/po/Firmware_cs.po | 669 ++++---- lang/po/Firmware_de.po | 675 ++++---- lang/po/Firmware_es.po | 673 ++++---- lang/po/Firmware_fr.po | 669 ++++---- lang/po/Firmware_it.po | 673 ++++---- lang/po/Firmware_pl.po | 671 ++++---- lang/po/new/cs.po | 3709 ++++++++++++++++++++-------------------- lang/po/new/de.po | 3709 ++++++++++++++++++++-------------------- lang/po/new/es.po | 3709 ++++++++++++++++++++-------------------- lang/po/new/fr.po | 3709 ++++++++++++++++++++-------------------- lang/po/new/it.po | 3709 ++++++++++++++++++++-------------------- lang/po/new/pl.po | 3709 ++++++++++++++++++++-------------------- 13 files changed, 13443 insertions(+), 13508 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 3c4d6fee1..8878397a9 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: Mo 25. Jan 15:49:41 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:49:41 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:03:54 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:03:54 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr "" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr "" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr "" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr "" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "" # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "" # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "" # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2735 +#: ultralcd.cpp:2730 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "" # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "" @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "" # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "" # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 msgid "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." msgstr "" @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "" # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "" # MSG_CRASHDETECT c=13 -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "" # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "" @@ -290,23 +290,23 @@ msgstr "" msgid "Crash detected. Resume print?" msgstr "" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "" @@ -316,22 +316,22 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y msgstr "" # MSG_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" msgstr "" @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "" @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "" # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "" # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "" # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "" # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "" -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " msgstr "" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" @@ -501,32 +501,32 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "" # MSG_FLOW -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "" @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "" # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "" # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "" -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" msgstr "" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" msgstr "" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " +#: +msgid "Checking Z axis" msgstr "" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 msgid "I will run xyz calibration now. It will take approx. 12 mins." msgstr "" # MSG_WIZARD_Z_CAL c=20 r=8 -#: ultralcd.cpp:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "" # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" msgstr "" # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "" -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "" @@ -691,62 +691,62 @@ msgid "Live adjust Z" msgstr "" # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "" # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "" # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "" # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "" # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "" -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" msgstr "" @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "" # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "" @@ -775,8 +775,8 @@ msgstr "" msgid "MMU load failed " msgstr "" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "" # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "" @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "" # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "" # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "" @@ -866,22 +866,22 @@ msgid "No move." msgstr "" # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "" @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "" # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "" @@ -916,62 +916,62 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" # -#: ultralcd.cpp:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "" # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "" # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "" @@ -981,17 +981,17 @@ msgid "Please open idler and remove filament manually." msgstr "" # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:62 +#: messages.c:73 msgid "Please place steel sheet on heatbed." msgstr "" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:65 +#: messages.c:77 msgid "Please press the knob to unload filament" msgstr "" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "" @@ -1001,7 +1001,7 @@ msgid "Please remove filament and then press the knob." msgstr "" # MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: messages.c:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "" @@ -1016,32 +1016,32 @@ msgid "Please update firmware in your MMU2. Waiting for reset." msgstr "" # MSG_PLEASE_WAIT c=20 -#: messages.c:63 +#: messages.c:74 msgid "Please wait" msgstr "" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "" # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "" msgid "Pause" msgstr "" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "" # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "" # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "" # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "" # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "" # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "" # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "" # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "" -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "" # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "" # MSG_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "" # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "" @@ -1256,12 +1256,12 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" # -#: ultralcd.cpp:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "" # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "" # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "" # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "" # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "" @@ -1376,92 +1376,92 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" # MSG_STATISTICS -#: ultralcd.cpp:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "" # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "" # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "" # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "" # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 msgid "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." msgstr "" # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "" # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "" # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "" # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "" @@ -1470,48 +1470,48 @@ msgstr "" msgid "Unload" msgstr "" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "" # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "" -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 msgid "Waiting for nozzle and bed cooling" msgstr "" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "" @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "" # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3822 +#: ultralcd.cpp:3817 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ultralcd.cpp:3819 +#: ultralcd.cpp:3814 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" # MSG_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 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:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "" # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "" # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "" # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "" # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "" # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "" # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "" @@ -1765,13 +1760,13 @@ msgstr "" msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." msgstr "" -# -#: util.cpp:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 msgid "G-code sliced for a different printer type. Continue?" msgstr "" -# -#: util.cpp:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." msgstr "" @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "" # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "" @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "" # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "" -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index a2b4dad7c..545723c72 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: Mo 25. Jan 15:49:46 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:49:46 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:03:57 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:03:57 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr " 0.3 nebo starsi" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "FS 0.3 nebo starsi" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "FS 0.4 a novejsi" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "neznamy stav" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr ">Zrusit" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "Doladeni Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "Vse OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "Vse je hotovo." # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "Okoli" # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "a stisknete tlacitko" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2735 +#: ultralcd.cpp:2730 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:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "Delka osy" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "Osa" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "Podlozka / Topeni" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Zahrivani bedu" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "Korekce podlozky" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "Test remenu " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "Jasny" # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "Podsviceni" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "Stav remenu" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu.Obnovit tisk?" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "Kalibruji vychozi poz." # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "Kalibrovat Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "Zkalibrovat" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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." @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "Kalibruji Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibrace OK" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "Kalibrace" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "Zrusit" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "Karta vyjmuta" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "Barva neni cista" # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "Zchladit" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" # MSG_CRASHDETECT c=13 -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "" # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "Detekovan naraz." @@ -290,23 +290,23 @@ msgstr "Detekovan naraz." msgid "Crash detected. Resume print?" msgstr "Detekovan naraz. Obnovit tisk?" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" msgstr "Naraz" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "Pouze aktualni" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "Vypnout motory" @@ -316,24 +316,24 @@ 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_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "Pokr." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 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=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "Korekce E:" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" -msgstr "Vysunout filament" +msgstr "Vysunout fil." # MSG_EJECTING_FILAMENT c=20 r=1 #: mmu.cpp:1414 @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "Koncovy spinac" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "Konc. spinace" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "Chyba - Doslo k prepisu staticke pameti!" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "Ustrihnout" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "Strihani" @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "Strihani filamentu" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni." # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "Temny" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "CHYBA:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "Levy vent.:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "Selhani MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "F. autozav." # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "Selhani" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "Rychlost vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "Test ventilatoru" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "Kontr. vent." # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "Fil. senzor" -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " msgstr "Vypadky filam." # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "Filament nezaveden" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "Senzor filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "Spotrebovano filam." # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "Cas tisku" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "FS reakce" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "Dokoncovani pohybu" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "Kal. prvni vrstvy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny." @@ -501,32 +501,32 @@ 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:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "Prutok" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "Predni tiskovy vent?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "Vpredu [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "Predni/levy vent." # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "Zahrivani OK." # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "Zahrivani" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "Vymenit filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "Zmena uspesna!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "Vymena ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "Kontrola podlozky" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "Kontrola endstopu" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "Kontrola hotend " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "Kontrola senzoru" -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" msgstr "Kontrola osy X" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" msgstr "Kontrola osy Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " +#: +msgid "Checking Z axis" msgstr "Kontrola osy Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "Vyberte extruder:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "Vyber filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 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:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "Informace" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "Vlozte filament" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "Je filament zaveden?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" msgstr "Selhani posl. tisku" # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "Posledni tisk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "Vlevo" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "Vlevo [um]" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "Korekce lin." @@ -691,62 +691,62 @@ msgid "Live adjust Z" msgstr "Doladeni osy Z" # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "Zavest filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "Cisteni barvy" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "Zavadeni filamentu" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "Uvolnena remenicka" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "Zavest do trysky" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "M117 Kal. prvni vrstvy" # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "Hlavni nabidka" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "" # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" msgstr "" @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Pokracuji v nahrivani..." # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "Merene zkoseni" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "Selhani MMU" @@ -775,8 +775,8 @@ msgstr "Selhani MMU" msgid "MMU load failed " msgstr "Zavedeni MMU selhalo" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "MMU selhani zavadeni" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "MMU OK. Pokracuji..." # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "Mod" @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "Tichy" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "MMU potrebuje zasah uzivatele." # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "MMU vypadky proudu" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "Tichy" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "Automaticky" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "Vys. vykon" # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "MMU2 pripojeno" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "Posunout osu" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "Posunout X" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "Posunout Y" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "Posunout Z" @@ -866,22 +866,22 @@ msgid "No move." msgstr "Bez pohybu." # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "Zadna SD karta" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "Ne" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "Nezapojeno " @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "Vysla nova verze firmware:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "Netoci se" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "Tryska" @@ -916,62 +916,62 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." # -#: ultralcd.cpp:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "Vent. trysky" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "Pozastavit tisk" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "PID kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "PID kal. ukoncena" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "PID kalibrace" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Nahrivani PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistete podlozku a stisknete tlacitko." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 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:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "Zkontrolujte :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 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." @@ -981,17 +981,17 @@ 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:62 +#: messages.c:73 msgid "Please place steel sheet on heatbed." msgstr "Umistete prosim tiskovy plat na podlozku" # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:65 +#: messages.c:77 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:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "Prosim vyjmete urychlene filament" @@ -1001,7 +1001,7 @@ 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:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim tiskovy plat z podlozky." @@ -1016,32 +1016,32 @@ 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:63 +#: messages.c:74 msgid "Please wait" msgstr "Prosim cekejte" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "Nejprve prosim sundejte transportni soucastky." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "Predehrev" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "Predehrev trysky. Prosim cekejte." # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." msgid "Pause" msgstr "" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "Vypadky proudu" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "Tisk prerusen" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "Predehrev k zavedeni" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "Tiskovy vent.:" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "Tisk z SD" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "Stisknete hl. tlacitko" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "Tisk pozastaven" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 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." # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "Tiskovy vent." # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "Prosim nejdriv zavedte filament" # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "Vzadu [um]" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyjmete filament a zopakujte tuto akci" # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "Pokracovat" # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "Obnoveni tisku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "Vpravo [um]" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 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_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "Vpravo" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "Vyber jazyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "Self test start " # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "Chyba Selftestu!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "Selftest selhal " @@ -1256,12 +1256,12 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." # -#: ultralcd.cpp:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "Nastavte teplotu:" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "Nastaveni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "Stav konc. spin." # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "Stav senzoru" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "Trideni" # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "Zadne" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "Cas" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "Tezke zkoseni:" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "Abeceda" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "Trideni souboru" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "Hlasity" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "Lehke zkoseni:" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "Zvuk" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "Jednou" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "Rychlost" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "Toci se" @@ -1376,92 +1376,92 @@ 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:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "Statistika " # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "Zastavit tisk" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "ZASTAVENO." # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "Podpora" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "Prohozene" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "Zvolte filament:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "Tepl. kal." # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "Teplot. kalibrace" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "Teplotni kalibrace selhala" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 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." # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "Teplota" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "Teploty" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "Filament celkem" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "Celkovy cas tisku" # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "Ladit" @@ -1470,48 +1470,48 @@ msgstr "Ladit" msgid "Unload" msgstr "Vysunout" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "Celkem selhani" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "k zavedeni filamentu" # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "k vyjmuti filamentu" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "Vyjmout filament" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "Vysouvam filament" -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "Celkem" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "Pouzite behem tisku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "Napeti" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "neznamy" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "Ceka se na uzivatele..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "Chyba zapojeni" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "Pruvodce" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "Ano" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 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:3822 +#: ultralcd.cpp:3817 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:3819 +#: ultralcd.cpp:3814 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_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "Korekce X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 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:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "Zavest vse" # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "Y vzdalenost od min" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "Korekce Y:" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "Vyp" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "Zap" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "Zpet" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "Kontrola" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "Falesne spusteni" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "Prisne" # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "Varovat" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "HW nastaveni" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "Komp. magnetu" # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "Mesh Bed Leveling" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detekovan na tiskarne MK3" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "MMU mod" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "Probiha zmena modu..." # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "Tryska" @@ -1765,13 +1760,13 @@ msgstr "" msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." msgstr "" -# -#: util.cpp:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" -# -#: util.cpp:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 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." @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen." # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "Predehrev ke strihu" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen." # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "Prejmenovat" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "Vybrat" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "Senzor info" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "Plat" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "Asist." -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "Tiskove platy" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "Korekce Z:" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "Pocet mereni Z" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 497ca077d..18f9b1ec5 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: Mo 25. Jan 15:49:50 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:49:50 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:04:01 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:01 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr " 0.3 oder aelter" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "FS 0.3 oder aelter" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "FS 0.4 oder neuer" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "Status unbekannt" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr " von 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr " von 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr ">Abbruch" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "Z Anpassen:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "Alles richtig " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "Raumtemp." # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "und Knopf druecken" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Startposition" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "AutoLaden Filament" # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2735 +#: ultralcd.cpp:2730 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:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "Achsenlaenge" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "Achse" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "Bett / Heizung" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Bett aufwaermen" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "Ausgleich Bett ok" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "Riementest " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset." # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "Hell" # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "Helligkeit" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "Gurtstatus" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "Kalibriere Start" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "Kalibrierung Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "Kalibrieren" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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." @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "Kalibrierung Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibrierung OK" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "Kalibrierung" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "Abbruch" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "SD Karte entfernt" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "Falsche Farbe" # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "Abkuehlen" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "Gewaehlte Sprache kopieren?" # MSG_CRASHDETECT c=13 -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "Crash Erk." # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "Crash erkannt." @@ -290,23 +290,23 @@ msgstr "Crash erkannt." msgid "Crash detected. Resume print?" msgstr "Crash erkannt. Druck fortfuehren?" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "Aktuelles" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "Datum:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "Motoren aus" @@ -316,22 +316,22 @@ 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_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 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=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "E-Korrektur:" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" msgstr "Filamentauswurf" @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "werfe Filament aus" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "Ende nicht getroffen" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "Endanschlag" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "Endschalter" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "Fehler - statischer Speicher wurde ueberschrieben" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "Fil. schneiden" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "Messer" @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "Schneide filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "Dimm" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "FEHLER:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "Extruder Luefter:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "Extruder Info" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "MMU-Fehler" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "F. autoladen" # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "Fehlerstatistik" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "Luefter-Tempo" # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "Lueftertest" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "Luefter Chk." # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "Fil. Sensor" -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" -msgstr "Filam. Maengel" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fil. Maengel " # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert mit richtiger Farbe?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "Fil. nicht geladen" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "Filamentsensor" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "Filament benutzt" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "Druckzeit" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "FS Aktion" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollstaendig Trotzdem fortfahren?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "Bewegung beenden" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "Erste-Schicht Kal." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 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." @@ -501,32 +501,32 @@ 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:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "Durchfluss" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "Vorderer Luefter?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "Vorne [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "Vorderer/linke Luefter" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "Aufwaermen OK." # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "Aufwaermen" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "Filament-Wechsel" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "Wechsel erfolgr.!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "Wechsel ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "Pruefe Bett " # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "Pruefe Endschalter" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "Pruefe Duese " # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "Pruefe Sensoren " -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " -msgstr "Pruefe X Achse " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Pruefe X Achse" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " -msgstr "Pruefe Y Achse " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Pruefe Y Achse" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " -msgstr "Pruefe Z Achse " +#: +msgid "Checking Z axis" +msgstr "Pruefe Z Achse" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "Extruder waehlen:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "Waehle Filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 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:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "Infoanzeige" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "Filament einlegen" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" msgstr "Letzte Druckfehler" # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "Letzter Druck" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "Linker Luefter?" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "Links" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "Links [um]" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "Lineare Korrektur" @@ -691,62 +691,62 @@ msgid "Live adjust Z" msgstr "Z einstellen" # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf." # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "Filament laden" # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "Lade Farbe" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "Filament laedt" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "Lose Riemenscheibe" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "In Druckduese laden" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "M117 Erste-Schicht Kal." # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "Hauptmenue" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "Hell.wert" # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "Dimmwert" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhoehe des Kalibrierpunktes" -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Temperatur wiederherstellen..." # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "Schraeglauf" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "MMU Fehler" @@ -775,8 +775,8 @@ msgstr "MMU Fehler" msgid "MMU load failed " msgstr "MMU Ladefehler" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "MMU Ladefehler" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "MMU OK. Weiterdrucken..." # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "Modus" @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-Firmware am MK3S-Drucker erkannt" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "Leise" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "MMU erfordert Benutzereingriff." # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "MMU Netzfehler" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "Auto Leist" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "Hohe leist" # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "MMU2 verbunden" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "Achse bewegen" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "Bewege X" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "Bewege Y" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "Bewege Z" @@ -866,22 +866,22 @@ msgid "No move." msgstr "Keine Bewegung." # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "Keine SD Karte" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "N/V" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "Nein" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "Nicht angeschlossen" @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "Neue Firmware- Version verfuegbar:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "Dreht sich nicht" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "Duese" @@ -916,62 +916,62 @@ 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:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "Duesevent." # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "Druck pausieren" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "PID Kal. " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "PID Kalib. fertig" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "PID Kalibrierung" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "PINDA erwaermen" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 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:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "Bitte pruefe:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 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." @@ -981,17 +981,17 @@ 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:62 +#: messages.c:73 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:65 +#: messages.c:77 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:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "Bitte ziehen Sie das Filament sofort heraus" @@ -1001,7 +1001,7 @@ 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:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "Bitte entfernen Sie das Stahlblech vom Heizbett." @@ -1016,32 +1016,32 @@ 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:63 +#: messages.c:74 msgid "Please wait" msgstr "Bitte warten" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "Bitte zuerst Transportsicherungen entfernen." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "Duese vorheizen!" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "Vorheizen" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Duese. Bitte warten." # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." msgid "Pause" msgstr "" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "Netzfehler" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "Druck abgebrochen" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "Heizen zum Laden" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "Heizen zum Entladen" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "Druckvent.:" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "Drucken von SD" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "Knopf druecken zum" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "Druck pausiert" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 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." # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "Druckvent." # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "Bitte laden Sie zuerst das Filament." # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "Hinten [um]" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "Ruecksetzen" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "Druck fortsetzen" # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "Druck fortgesetzt" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "Rechts [um]" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 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_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "SD Karte" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "Rechts" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "Waehle Sprache" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "Selbsttest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "Selbsttest start " # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "Selbsttest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "Selbsttest Fehler!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "Selbsttest Error " @@ -1256,12 +1256,12 @@ 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:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "Temp. einstellen:" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "Einstellungen" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "Endschalter Status" # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "Sensorstatus" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "Sort." # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "Ohne" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "Zeit" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "Schwer.Schr:" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "Sortiere Dateien" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "Laut" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "Leicht.Schr:" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "Ton" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "Einmal" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "Geschwindigkeit" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "Dreht sich" @@ -1376,92 +1376,92 @@ 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:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "Statistiken " # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "Druck abbrechen" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "GESTOPPT." # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "Ausgetauscht" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "Filament auswaehlen:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "Temp Kalib." # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "Waehlen Sie die Temperatur, die zu Ihrem Material passt." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "Temp. kalibrieren" # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "Temperaturkalibrierung fehlgeschlagen" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 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." # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "Sensor ueberprueft, entladen Sie jetzt das Filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "Temperatur" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "Temperaturen" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "Gesamtes Filament" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "Gesamte Druckzeit" # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "Feineinstellung" @@ -1470,48 +1470,48 @@ msgstr "Feineinstellung" msgid "Unload" msgstr "Entladen" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "Gesamte Fehler" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "Filament laden" # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "Filament entladen" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "Filament entladen" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "Filament auswerfen" -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "Gesamt" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "Beim Druck benutzt" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "Spannungen" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "unbekannt" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "Warte auf Benutzer.." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 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:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "Verdrahtungsfehler" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "Assistent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "Ja" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 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:3822 +#: ultralcd.cpp:3817 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:3819 +#: ultralcd.cpp:3814 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_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "Verzoegerung" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "X-Korrektur:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 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:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "Alle laden" # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "Y Entfernung vom Min" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "Y-Korrektur:" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "Aus" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "An" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "Zurueck" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "Kontrolle" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "Falschtriggerung" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "Strikt" # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "Warnen" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "HW Einstellungen" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "Magnet Komp." # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "Gitter" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "MeshBett Ausgleich" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-Firmware auf MK3-Drucker erkannt" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "MMU Modus" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "Moduswechsel erfolgt..." # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "Modell" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "Duese D." @@ -1765,13 +1760,13 @@ msgstr "G-Code ist fuer einen anderen Level geslict. Fortfahren?" msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." msgstr "G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." -# -#: util.cpp:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" -# -#: util.cpp:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." msgstr "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen." # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "Umbenennen" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "Auswahl" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "Sensor Info" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "Stahlblech" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "" -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "Stahlbleche" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "Z-Korrektur:" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 01ef35381..af884505a 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: Mo 25. Jan 15:49:54 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:49:54 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:04:04 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:04 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr " 0.3 o mayor" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "FS 0.3 o mayor" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "FS 0.4 o mas nueva" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "estado desconocido" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr ">Cancelar" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "Ajustar-Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "Todo bien" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "Terminado! Feliz impresion!" # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "Ambiente" # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "Haz clic" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Llevar al origen" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "Carga auto. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "La carga automatica solo funciona si el sensor de filamento esta activado..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2735 +#: ultralcd.cpp:2730 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "La carga automatica esta activada, pulse el dial e inserte el filamento..." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "Longitud del eje" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "Eje" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "Base / Calentador" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Calentando Base" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "Corr. de la cama" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "Test cinturon " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "Brill." # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "Brillo" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "Estado de correa" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. ?Reanudar la impresion?" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "Calibrando posicion inicial" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "Calibrar Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "Calibrar" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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." @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibracion OK" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "Calibracion" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "Cancelar" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "Tarjeta retirada" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "Color no homogeneo" # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "Enfriar" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" # MSG_CRASHDETECT c=13 -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "Det. choque" # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "Choque detectado." @@ -290,23 +290,23 @@ msgstr "Choque detectado." msgid "Crash detected. Resume print?" msgstr "Choque detectado. Continuar impresion?" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" msgstr "Choque" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "Actual" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "Fecha:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "Apagar motores" @@ -316,22 +316,22 @@ 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_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 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=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "Corregir-E:" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" msgstr "Expulsar fil." @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "Endstop no alcanzado" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "Error - se ha sobre-escrito la memoria estatica" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "Cortar filament" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "Cuchillo" @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "Corte de filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "Vent.extrusor:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "Info. del extrusor" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "Extruir" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "Estadistica de fallos MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "Autocarg.fil." # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "Estadistica de fallos" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "Velocidad Vent" # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "Test ventiladores" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "Comprob.vent" # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "Sensor Fil." -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" -msgstr "Filam. acabado" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fil. acabado " # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "Fil. no introducido" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "Sensor de filamento" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "Filamento usado" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "Tiempo de imp.:" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "FS accion" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. ?Continuar de todos modos?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "Term. movimientos" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "Cal. primera cap." # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 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." @@ -501,32 +501,32 @@ 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:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "Flujo" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "Vent. frontal?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "Frontal [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "Ventiladores frontal/izquierdo" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "Calentando acabado." # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "Calentando..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "Cambiar filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "Cambio correcto" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "Cambio correcto?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "Control base cal." # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "Control endstops" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "Control fusor" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "Comprobando sensores" -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" msgstr "Control sensor X" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" msgstr "Control sensor Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " +#: +msgid "Checking Z axis" msgstr "Control sensor Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "Elegir extrusor:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "Elije filamento:" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 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:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "Monitorizar" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "Introducir filamento" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "?Esta colocada la lamina sobre la base" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" -msgstr "Ultimas impresiones fallidas" +msgstr "Ultimos imp. fallos" # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "Ultima impresion" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "Izquierda" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "Izquierda [um]" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "Correccion de Linealidad" @@ -691,64 +691,64 @@ msgid "Live adjust Z" msgstr "Micropaso Eje Z" # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial." # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "Introducir filam." # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "Cambiando color" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "Introduciendo filam." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "Polea suelta" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "Cargar a la boquilla" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "M117 Cal. primera cap." # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "Menu principal" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "Valor brill." # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" -msgstr "Nivelacion Mesh Level" +msgstr "Nivela. Mesh Level" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 #: mmu.cpp:764 @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Restaurando temperatura..." # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "Desviacion med:" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "Fallos MMU" @@ -775,8 +775,8 @@ msgstr "Fallos MMU" msgid "MMU load failed " msgstr "Carga MMU fallida" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "Carga MMU falla" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "MMU OK. Resumiendo..." # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "Modo" @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detectado en impresora MK3S" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "Silencio" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "MMU necesita atencion del usuario." # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "Fallo de energia en MMU" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "Silencio" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "Fuerza auto" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "Rend.pleno" # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "MMU2 conectado" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "Mover ejes" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "Mover X" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "Mover Y" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "Mover Z" @@ -866,22 +866,22 @@ msgid "No move." msgstr "Sin movimiento" # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "No hay tarjeta SD" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "N/A" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "No hay conexion " @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "Ventilador no gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "Boquilla" @@ -916,62 +916,62 @@ 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:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "Vent. capa" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "Pausar impresion" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "Cal. PID " # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "Cal. PID terminada" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "Calibracion PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Calentando PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, por favor, y haz clic" # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Click cuando acabes." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "Controla :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 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" @@ -981,17 +981,17 @@ 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:62 +#: messages.c:73 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:65 +#: messages.c:77 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:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "Por favor retire el filamento de inmediato" @@ -1001,7 +1001,7 @@ 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:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "Por favor retire la chapa de acero de la base calefactable." @@ -1016,32 +1016,32 @@ 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:63 +#: messages.c:74 msgid "Please wait" msgstr "Por Favor Espere" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "Por favor retira los soportes de envio primero." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "Precalentar" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "Pulsa el dial para precalentar la boquilla y continue." msgid "Pause" msgstr "Pausa" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "Cortes de energia" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "Impresion cancelada" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "Precalent. cargar" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "Precalent. descargar" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "Vent.fusor:" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "Menu tarjeta SD" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "Pulsa el dial" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "Impresion en pausa" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "Presiona el dial para continuar con la temperatura de la boquilla." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 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." # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "Vent. extr" # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "Por favor, cargar primero el filamento. " # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "prusa3d.es" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "Trasera [um]" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descargue el filamento, luego repita esta accion." # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Por favor comprueba la conexion del IR sensor y filamento esta descargado." @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "" -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "Reanudar impres." # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "Continuan. impresion" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "Derecha [um]" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "Puerto RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 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_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "Tarj. SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "Derecha" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "Cambiar el idioma" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "Iniciar Selftest" # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "Error Selftest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "Fallo Selftest" @@ -1256,12 +1256,12 @@ 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:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "Establecer temp.:" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "Configuracion" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "Mostrar endstops" # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "Estado del sensor" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "Ordenar" # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "Ninguno" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "Fecha" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "Incl.severa:" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "Alfabet" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "Ordenando archivos" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "Alto" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "Liger.incl.:" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "Sonido" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "Una vez" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "Velocidad" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "Ventilador girando" @@ -1376,92 +1376,92 @@ 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:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "Estadisticas " # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "Detener impresion" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "PARADA" # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "Soporte" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "Intercambiado" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "Selecciona filamento:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "Cal. temp." # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "Calibracion temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "Fallo de la calibracion de temperatura" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 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." # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retire el filamento ahora." # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "Temperaturas" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "Filamento total" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "Tiempo total" # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "Ajustar" @@ -1470,48 +1470,48 @@ msgstr "Ajustar" msgid "Unload" msgstr "Descargar" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "Fallos totales" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "para cargar el filamento" # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "para descargar el filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "Soltar filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "Soltando filamento" -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "Usado en impresion" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "Voltajes" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "desconocido" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "Esperando ordenes" # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 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:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "?Se cargocon exito el filamento?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "Error de conexion" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual por favor." # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 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:3822 +#: ultralcd.cpp:3817 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:3819 +#: ultralcd.cpp:3814 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_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "Expirar" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "Corregir-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 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:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "Intr. todos fil." # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "Distancia en Y desde el min" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retire el filamento e intente nuevamente." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "Corregir-Y:" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "Ina" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "Act" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "atras" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "Comprobaciones" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "Falsa activacion" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "FINDA:" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "Estrict" # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "Aviso" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "Configuracion HW" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "Comp. imanes" # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "Malla" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "Nivelacion Malla Base" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectado en impresora MK3" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "Modo MMU" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "Cambio de modo progresando ..." # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "Modelo" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "Diam. nozzl" @@ -1765,13 +1760,13 @@ msgstr "Codigo G laminado para un nivel diferente. ?Continuar?" msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." msgstr "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." -# -#: util.cpp:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 msgid "G-code sliced for a different printer type. Continue?" msgstr "Codigo G laminado para un tipo de impresora diferente. ?Continuar?" -# -#: util.cpp:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." msgstr "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "Precalent. laminar" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "Precalent. expulsar" @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada." # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "Renombrar" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "Seleccionar" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "Info sensor" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "Lamina" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "Asistido" -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "Lamina de acero" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "Corregir-Z:" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "Z-sensor nr." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index bf48c536d..8517e99dc 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: Mo 25. Jan 15:49:57 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:49:57 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:04:08 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:08 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "FS v0.3 ou +ancien" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "FS v0.4 ou +recent" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "Etat inconnu" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr " de 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr " de 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "Offset point [0;0]" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr ">Annuler" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "Ajuster Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "Tout est correct" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne impression!" # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "Ambiant" # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "et appuyez sur le bouton" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Mise a 0 des axes" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "Autocharge du fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Chargement auto du filament uniquement si le capteur de filament est active." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2735 +#: ultralcd.cpp:2730 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "Longueur de l'axe" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "Axe" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "Lit / Chauffage" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Chauffe du lit" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "Corr. niveau plateau" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "Test de courroie " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset." # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "Brill." # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "Luminosite" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "Statut courroie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impression?" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "Calib. mise a 0" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "Calibrer Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "Calibrer" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "Calibration Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." # MSG_HOMEYZ_DONE -#: ultralcd.cpp:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibration terminee" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "Annuler" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "Carte retiree" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "Couleur incorrecte" # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "Refroidissement" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "Copier la langue choisie?" # MSG_CRASHDETECT c=13 -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "Detect.crash" # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "Crash detecte." @@ -290,23 +290,23 @@ msgstr "Crash detecte." msgid "Crash detected. Resume print?" msgstr "Crash detecte. Poursuivre l'impression?" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" msgstr "" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "Actuel" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "Date:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -316,22 +316,22 @@ msgid "Distance between tip of the nozzle and the bed surface has not been set y 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_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" msgstr "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?" # MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "Correct-E:" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" msgstr "Remonter le fil." @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "Le fil. remonte" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "Butee non atteinte" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "Butee" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "Butees" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "Erreur - la memoire statique a ete ecrasee" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "Coupe filament" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "Coupeur" @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "Je coupe filament" # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "ERREUR:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "Ventilo extrudeur:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "Infos extrudeur" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "Extrudeur" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "F. autocharg." # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "Stat. d'echec" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "Vitesse vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "Test du ventilateur" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "Verif vent." # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "Capteur Fil." -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" -msgstr "Fins filament" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fins filament " # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "Filament non charge" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "Capteur de filament" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "Filament utilise" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "Temps d'impression" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "Mouvement final" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "Cal. 1ere couche" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 msgid "First, I will run the selftest to check most common assembly problems." msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." @@ -501,32 +501,32 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." # MSG_FLOW -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "Flux" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "Ventilo impr avant?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "Avant [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "Ventilos avt/gauche" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "Chauffe terminee." # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "Chauffe" # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "Changer filament" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "Changement reussi!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "Change correctement?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "Verif. plateau chauf" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "Verification butees" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "Verif. du hotend" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "Verif. des capteurs" -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" msgstr "Verification axe X" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" msgstr "Verification axe Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " +#: +msgid "Checking Z axis" msgstr "Verification axe Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "Choisir extrudeur:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "Choix du filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 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:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "Ecran d'info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "Inserez le filament" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "Est la plaque sur le plat. chauffant?" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" msgstr "Echecs derniere imp." # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "Derniere impres." # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "Ventilo gauche?" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "Gauche" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "Gauche [um]" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "Correction lin." @@ -691,62 +691,62 @@ msgid "Live adjust Z" msgstr "Ajuster Z en dir." # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton." # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "Charger filament" # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "Charg. de la couleur" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "Chargement du fil." # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "Poulie lache" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "Charger la buse" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "M117 Cal. 1ere couche" # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "Menu principal" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "Niveau brill" # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" msgstr "" @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Rechauffage de la buse..." # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "Deviat.mesuree" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "Echecs MMU" @@ -775,8 +775,8 @@ msgstr "Echecs MMU" msgid "MMU load failed " msgstr "Echec chargement MMU" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "Echecs charg. MMU" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "MMU OK. Reprise ..." # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "" @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detecte sur imprimante MK3S" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "Furtif" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "Le MMU necessite l'attention de l'utilisateur." # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "Echecs alim. MMU" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "Furtif" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "Puiss.auto" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "Haute puiss" # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "MMU2 connecte" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "Moteur" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "Deplacer l'axe" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "Deplacer X" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "Deplacer Y" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "Deplacer Z" @@ -866,22 +866,22 @@ msgid "No move." msgstr "Pas de mouvement." # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "Pas de carte SD" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "Non" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "Non connecte" @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "Nouvelle version de firmware disponible:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "Ne tourne pas" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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 la surface du plateau chauffant." # MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "Buse" @@ -916,62 +916,62 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" # -#: ultralcd.cpp:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "Vent. buse" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "Pause de l'impr." # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "Calib. PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "Calib. PID terminee" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "Calibration PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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 vite l'imprimante." # MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez plateau chauffant en acier et appuyez sur le bouton." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 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:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "Verifiez:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." @@ -981,17 +981,17 @@ msgid "Please open idler and remove filament manually." msgstr "Ouvrez l'idler et retirez le filament manuellement." # MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:62 +#: messages.c:73 msgid "Please place steel sheet on heatbed." msgstr "Placez la plaque en acier sur le plateau chauffant." # MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:65 +#: messages.c:77 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" @@ -1001,7 +1001,7 @@ 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:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "Retirez la plaque en acier du plateau chauffant." @@ -1016,32 +1016,32 @@ 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:63 +#: messages.c:74 msgid "Please wait" msgstr "Merci de patienter" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "Prechauffage" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." msgid "Pause" msgstr "" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "Coup.de courant" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "Impression annulee" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "Chauffe pour charger" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "Chauf.pour decharger" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "Vent. impr:" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "Impr. depuis la SD" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "App. sur sur bouton" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "Impression en pause" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "Appuyez sur le bouton pour rechauffer la buse." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 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." # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "Vent. impr" # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "Arriere [um]" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "Reinitialiser" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "Reprendre impression" # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "Reprise de l'impr." # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "Droite [um]" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" msgstr "Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" # MSG_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "Carte SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "FlshAir" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "Droite" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "Recherche du point de calibration du plateau chauffant" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "Choisir langue" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "Auto-test OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "Debut auto-test" # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "Auto-test" # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "Erreur auto-test!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "Echec de l'auto-test" @@ -1256,12 +1256,12 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" # -#: ultralcd.cpp:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "Regler temp.:" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "Reglages" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "Afficher butees" # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "Etat capteur" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "Tri" # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "Aucun" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "Heure" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "Deviat.sev.:" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "Tri des fichiers" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "Fort" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "Deviat.leg.:" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "Son" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "Une fois" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "Vitesse" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "Tourne" @@ -1376,92 +1376,92 @@ msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." # MSG_STATISTICS -#: ultralcd.cpp:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "Statistiques" # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "Arreter impression" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "ARRETE." # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "Echange" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "Selectionnez le filament:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "Calib. Temp." # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "Calibration temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "Echec de la calibration en temperature" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 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 activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "Filament total" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "Temps total impr." # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "Regler" @@ -1470,48 +1470,48 @@ msgstr "Regler" msgid "Unload" msgstr "Decharger" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "Total des echecs" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "pour charger le fil." # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "pour decharger fil." # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "Decharger fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "Dechargement fil." -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "Utilise pdt impr." # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "Tensions" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "inconnu" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "Attente utilisateur..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau chauffant" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "Erreur de cablage" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "Assistant" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "Details calib. XYZ" @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "Oui" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." # MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3822 +#: ultralcd.cpp:3817 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:3819 +#: ultralcd.cpp:3814 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!" # MSG_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "Correct-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." # MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "Charger un par un" # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "Distance Y du min" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "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)." # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "Correct-Y:" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "Retour" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "Verifications" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "Faux declenchement" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "FINDA:" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "Stricte" # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "Avert" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "Config HW" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "IR:" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "Compens. aim." # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detecte sur imprimante MK3" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "Mode MMU" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "Changement de mode en cours..." # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "Modele" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "Diam. buse" @@ -1765,13 +1760,13 @@ msgstr "Le G-code a ete prepare pour un niveau different. Continuer?" msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." msgstr "Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee." -# -#: util.cpp:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 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:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 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." @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee." # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "PINDA:" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "Chauffe pour couper" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "Chauf. pour remonter" @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "Renommer" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "Selectionner" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "Info capteur" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "Plaque" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "" -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "Plaques en acier" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "Correct-Z:" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "Mesurer x-fois" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 64fb01458..e6315bc56 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: Mo 25. Jan 15:50:01 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:50:01 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:04:11 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:11 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset" # MSG_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr " 0.3 o inferiore" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "FS 0.3 o inferiore" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr " 0.4 o superiore" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "FS 0.4 o superiore" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "stato sconosciuto" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr " su 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr " su 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "[0;0] punto offset" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr ">Annulla" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "Compensaz. Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "Nessun errore" # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "Ambiente" # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "e cliccare manopola" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Trova origine" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "Autocaric. filam." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 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:2735 +#: ultralcd.cpp:2730 msgid "Autoloading filament is active, just press the knob and insert filament..." msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." # MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "Lunghezza dell'asse" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "Assi" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "Piano/Riscald." @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Riscald. piano" # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "Correz. liv.piano" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "Test cinghie " @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset." # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "Chiaro" # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "Luminosita'" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "Stato cinghie" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare la stampa?" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "Calibrazione Home" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "Calibra XYZ" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "Calibra Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "Calibra" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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." @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "Calibrando Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Calibrazione completa" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "Calibrazione" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "Annulla" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "SD rimossa" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "Colore non puro" # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "Raffredda" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" # MSG_CRASHDETECT c=13 -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "Rileva.crash" # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "Rilevato impatto." @@ -290,23 +290,23 @@ msgstr "Rilevato impatto." msgid "Crash detected. Resume print?" msgstr "Scontro rilevato. Riprendere la stampa?" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" msgstr "Impatto" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "Attuale" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "Disabilita motori" @@ -316,24 +316,24 @@ 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 piano non ancora impostata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo strato." # MSG_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "" # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 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=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "Correzione-E:" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" -msgstr "Espelli filamento" +msgstr "Espelli fil." # MSG_EJECTING_FILAMENT c=20 r=1 #: mmu.cpp:1414 @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "Espellendo filamento" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "Finec. fuori portata" # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "Finecorsa" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "Finecorsa" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "Errore - la memoria statica e' stata sovrascritta" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "Taglia filamento" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "Tagliatr." @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "Tagliando filam." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "Scuro" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "ERRORE:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "Ventola estr:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "Info estrusore" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "Estrusore" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "Autocar.fil." # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "Stat. fallimenti" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "Velocita vent." # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "Test ventola" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "Control.vent" # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "Sensore fil." -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" -msgstr "Fil. esauriti" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fil. esauriti " # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "Filamento estruso e con colore corretto?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "Fil. non caricato" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "Sensore filam." # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "Fil. utilizzato" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "Tempo di stampa" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "Azione FS" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "Finaliz. spostamenti" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "Cal. primo strato" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 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." @@ -501,32 +501,32 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Risolvere il problema e premere il bottone sull'unita MMU. " # MSG_FLOW -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "Flusso" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "Ventola frontale?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "Fronte [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "Ventola frontale/sinistra" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "Riscald./Termist." @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "Riscald. completo" # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "Riscaldamento..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "Cambia filamento" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "Cambio riuscito!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "Cambio corretto?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "Verifica piano" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "Verifica finecorsa" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "Verifica ugello" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "Controllo sensori" -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" msgstr "Verifica asse X" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" msgstr "Verifica asse Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " +#: +msgid "Checking Z axis" msgstr "Verifica asse Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "Seleziona estrusore:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "Scegliere filamento:" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "Filamento" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 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:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "Schermata info" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "Inserire filamento" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "Piastra d'acciaio su piano riscaldato?" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" -msgstr "Fallimenti ultima stampa" +msgstr "Errori ultima stampa" # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "Ultima stampa" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "Vent SX hotend?" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "Sinistra" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "Sinistra [um]" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "Correzione lineare" @@ -691,62 +691,62 @@ msgid "Live adjust Z" msgstr "Compensazione Z" # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "Carica filamento" # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "Caricando colore" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "Caricando filamento" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "Puleggia lenta" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "Carica ugello" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "M117 Calibr. primo strato" # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "Menu principale" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "Liv. Chiaro" # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "Liv. Scuro" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" msgstr "Liv. grilia piano" @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Ripristino temperatura... " # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "Deviazione mis" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "Fallimenti MMU" @@ -775,8 +775,8 @@ msgstr "Fallimenti MMU" msgid "MMU load failed " msgstr "Caricamento MMU fallito" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "Caricamenti MMU falliti" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "MMU OK. Riprendendo... " # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "Mod." @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 rilevato su stampante MK3S" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "Normale" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "Silenzioso" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "Il MMU richiede attenzione dall'utente." # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "Manc. corr. MMU" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "Silenziosa" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "Auto" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "Forte" # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "MMU2 connessa" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "Motore" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "Muovi asse" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "Sposta X" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "Sposta Y" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "Sposta Z" @@ -866,22 +866,22 @@ msgid "No move." msgstr "Nessun movimento." # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "Nessuna SD" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "N/D" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "Non connesso" @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "Nuova versione firmware disponibile:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "Non gira" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "Ugello" @@ -916,62 +916,62 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." # -#: ultralcd.cpp:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "Ventola estrusore" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "Metti in pausa" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "Calibrazione PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "Calib. PID completa" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "Calibrazione PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "Per favore pulisci il piatto, poi premi la manopola." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 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:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "Verifica:" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 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." @@ -981,17 +981,17 @@ 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:62 +#: messages.c:73 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:65 +#: messages.c:77 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:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" @@ -1001,7 +1001,7 @@ 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:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" @@ -1016,32 +1016,32 @@ 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:63 +#: messages.c:74 msgid "Please wait" msgstr "Attendere" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "Per favore rimuovete i materiali da spedizione" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "Preriscalda" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "Premete la manopola per preriscaldare l'ugello e continuare." msgid "Pause" msgstr "Pausa" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "Mancanza corrente" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "Stampa interrotta" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "Preriscald. carico" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "Preriscald. scarico" # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "Vent.stam:" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "Stampa da SD" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "Premere la manopola" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "Stampa in pausa" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "Premete la manopola per recuperare la temperatura dell'ugello." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 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." # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "Ventola di stampa" # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "Per favore prima carica il filamento." # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "Retro [um]" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Controllare il collegamento al sensore e rimuovere il filamento." @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "Reset calibrazione XYZ." -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "Riprendi stampa" # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "Riprendi stampa" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "Destra [um]" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "Porta RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 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_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "Mem. SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "Destra" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "Ricerca dei punti di calibrazione del piano" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "Seleziona lingua" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "Autotest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "Avvia autotest" # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "Autotest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "Errore Autotest !" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "Autotest fallito" @@ -1256,12 +1256,12 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" # -#: ultralcd.cpp:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "Imposta temperatura" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "Impostazioni" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "Stato finecorsa" # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "Stato sensore" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "Ordina" # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "Nessuno" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "Cron." # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "Devia.grave:" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "Alfabeti" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "Ordinando i file" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "Forte" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "Devia.lieve:" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "Suono" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "Esaurim" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "Singolo" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "Velocita" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "Gira" @@ -1376,92 +1376,92 @@ 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:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "Statistiche" # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "Arresta stampa" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "ARRESTATO." # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "Supporto" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "Scambiato" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "Seleziona il filamento:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "Calib. temp." # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "Calib. Temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "Calibrazione temperatura fallita" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 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." # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "Temperature" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "Filamento totale" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "Tempo stampa totale" # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "Regola" @@ -1470,48 +1470,48 @@ msgstr "Regola" msgid "Unload" msgstr "Scarica" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "Totale fallimenti" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "per caricare il filamento" # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "per scaricare il filamento" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "Scarica filamento" # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "Scaricando filamento" -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "Totale" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "Usati nella stampa" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "Voltaggi" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "sconosciuto" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "Attendendo utente..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 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:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "Errore cablaggio" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "Si" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 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:3822 +#: ultralcd.cpp:3817 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:3819 +#: ultralcd.cpp:3814 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_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "" # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "Correzione-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 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:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "Caricare tutti" # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato." # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "Distanza Y dal min" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "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):" # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "Correzione-Y:" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "Indietro" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "Controlli" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "Falso innesco" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "Esatto" # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "Avviso" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "Impostazioni HW" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "Comp. Magneti" # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "Griglia" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "Liv. griglia piano" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S rilevato su stampante MK3" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "Mod. MMU" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "Cambio modalita in corso ..." # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "Modello" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "Diam.Ugello" @@ -1765,13 +1760,13 @@ msgstr "G-code processato per un livello diverso. Continuare?" 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:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code processato per una stampante diversa. Continuare?" -# -#: util.cpp:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 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." @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "Preriscalda. taglio" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "Preriscalda. espuls." @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata." # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "atteso livello %s" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "Rinomina" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "Seleziona" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "Info Sensore" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "Piano" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "Assist." -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "Piani d'acciaio" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "Correzione-Z:" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "Nr. Z-test" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index fc50d7d3a..0b89e7e78 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: Mo 25. Jan 15:50:04 CET 2021\n" -"PO-Revision-Date: Mo 25. Jan 15:50:04 CET 2021\n" +"POT-Creation-Date: Di 26. Jan 11:04:15 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:15 CET 2021\n" "Language-Team: \n" "X-Generator: Poedit 2.0.7\n" "X-Poedit-SourceCharset: UTF-8\n" @@ -21,7 +21,7 @@ msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cCont msgstr "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" # MSG_IR_03_OR_OLDER c=18 -#: messages.c:145 +#: messages.c:164 msgid " 0.3 or older" msgstr " 0.3 lub starszy" @@ -31,7 +31,7 @@ msgid "FS v0.3 or older" msgstr "FS 0.3 lub starszy" # MSG_IR_04_OR_NEWER c=18 -#: messages.c:144 +#: messages.c:163 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" @@ -41,22 +41,22 @@ msgid "FS v0.4 or newer" msgstr "FS 0.4 lub nowszy" # MSG_IR_UNKNOWN c=18 -#: messages.c:146 +#: messages.c:165 msgid "unknown state" msgstr "Stan nieznany" # MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:37 +#: messages.c:43 msgid " of 4" msgstr " z 4" # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:57 +#: messages.c:66 msgid " of 9" msgstr " z 9" # MSG_MEASURED_OFFSET -#: ultralcd.cpp:2993 +#: ultralcd.cpp:2988 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" @@ -71,47 +71,47 @@ msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" # -#: ultralcd.cpp:2415 +#: ultralcd.cpp:2410 msgid ">Cancel" msgstr ">Anuluj" # MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3113 +#: ultralcd.cpp:3108 msgid "Adjusting Z:" msgstr "Ustawianie Z:" # MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8395 +#: ultralcd.cpp:8390 msgid "All correct " msgstr "Wszystko OK " # MSG_WIZARD_DONE c=20 r=8 -#: messages.c:100 +#: messages.c:116 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" # -#: ultralcd.cpp:1907 +#: ultralcd.cpp:1902 msgid "Ambient" msgstr "Otoczenie" # MSG_AUTO c=6 -#: messages.c:141 +#: messages.c:160 msgid "Auto" msgstr "" # MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2572 +#: ultralcd.cpp:2567 msgid "and press the knob" msgstr "i nacisnij pokretlo" # MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3434 +#: ultralcd.cpp:3429 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" # MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:109 +#: messages.c:125 msgid "SpoolJoin" msgstr "" @@ -121,32 +121,32 @@ msgid "Auto home" msgstr "Auto zerowanie" # MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6721 +#: ultralcd.cpp:6716 msgid "AutoLoad filament" msgstr "Autoladowanie fil." # MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4351 +#: ultralcd.cpp:4346 msgid "Autoloading filament available only when filament sensor is turned on..." msgstr "Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." # MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2735 +#: ultralcd.cpp:2730 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:8078 +#: ultralcd.cpp:8073 msgid "Axis length" msgstr "Dlugosc osi" # MSG_SELFTEST_AXIS -#: ultralcd.cpp:8079 +#: ultralcd.cpp:8074 msgid "Axis" msgstr "Os" # MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8036 +#: ultralcd.cpp:8031 msgid "Bed / Heater" msgstr "Stol / Grzanie" @@ -161,12 +161,12 @@ msgid "Bed Heating" msgstr "Grzanie stolu.." # MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5807 +#: ultralcd.cpp:5802 msgid "Bed level correct" msgstr "Korekta stolu" # MSG_BELTTEST c=17 -#: ultralcd.cpp:5787 +#: ultralcd.cpp:5782 msgid "Belt test " msgstr "Test paskow" @@ -176,12 +176,12 @@ msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for msgstr "Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset." # MSG_BRIGHT c=6 -#: messages.c:139 +#: messages.c:158 msgid "Bright" msgstr "Jasny" # MSG_BRIGHTNESS c=18 -#: messages.c:135 +#: messages.c:154 msgid "Brightness" msgstr "Jasnosc" @@ -196,32 +196,32 @@ msgid "Belt status" msgstr "Stan paskow" # MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:68 +#: messages.c:80 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia. Kontynowac?" # -#: ultralcd.cpp:8397 +#: ultralcd.cpp:8392 msgid "Calibrating home" msgstr "Zerowanie osi" # MSG_CALIBRATE_BED -#: ultralcd.cpp:5796 +#: ultralcd.cpp:5791 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" # MSG_HOMEYZ -#: messages.c:45 +#: messages.c:51 msgid "Calibrate Z" msgstr "Kalibruj Z" # MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4543 +#: ultralcd.cpp:4538 msgid "Calibrate" msgstr "Kalibruj" # MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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." @@ -231,57 +231,57 @@ msgid "Calibrating Z" msgstr "Kalibruje Z" # MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3397 +#: ultralcd.cpp:3392 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:818 +#: ultralcd.cpp:813 msgid "Calibration done" msgstr "Kalibracja OK" # MSG_MENU_CALIBRATION -#: messages.c:58 +#: messages.c:67 msgid "Calibration" msgstr "Kalibracja" # -#: ultralcd.cpp:4721 +#: ultralcd.cpp:4716 msgid "Cancel" msgstr "Anuluj" # MSG_SD_REMOVED -#: ultralcd.cpp:8847 +#: ultralcd.cpp:8842 msgid "Card removed" msgstr "Karta wyjeta" # MSG_NOT_COLOR -#: ultralcd.cpp:2652 +#: ultralcd.cpp:2647 msgid "Color not correct" msgstr "Kolor zanieczysz." # MSG_COOLDOWN -#: messages.c:23 +#: messages.c:25 msgid "Cooldown" msgstr "Chlodzenie" # -#: ultralcd.cpp:4476 +#: ultralcd.cpp:4471 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" # MSG_CRASHDETECT_ON -#: messages.c:25 +#: messages.c:28 msgid "Crash det." msgstr "Wykr.zderzen" # -#: ultralcd.cpp:4856 +#: ultralcd.cpp:4851 msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." # MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:24 +#: messages.c:27 msgid "Crash detected." msgstr "Zderzenie wykryte" @@ -290,23 +290,23 @@ msgstr "Zderzenie wykryte" msgid "Crash detected. Resume print?" msgstr "Wykryto zderzenie. Wznowic druk?" -# -#: ultralcd.cpp:1736 +# MSG_CRASH c=7 +#: messages.c:26 msgid "Crash" -msgstr "Zderzenie" +msgstr "Zderzen" # MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:5938 +#: ultralcd.cpp:5933 msgid "Current" msgstr "Aktualne" # MSG_DATE c=17 r=1 -#: ultralcd.cpp:2117 +#: ultralcd.cpp:2112 msgid "Date:" msgstr "Data:" # MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5688 +#: ultralcd.cpp:5683 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -316,22 +316,22 @@ 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_FS_CONTINUE c=5 -#: messages.c:133 +#: messages.c:152 msgid "Cont." msgstr "Kont." # MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5031 +#: ultralcd.cpp:5026 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=13 -#: ultralcd.cpp:5100 +#: ultralcd.cpp:5095 msgid "E-correct:" msgstr "Korekcja-E:" -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:50 +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 msgid "Eject filament" msgstr "Wysun filament" @@ -341,32 +341,32 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" # MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8054 +#: ultralcd.cpp:8049 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." # MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8049 +#: ultralcd.cpp:8044 msgid "Endstop" msgstr "Krancowka" # MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8040 +#: ultralcd.cpp:8035 msgid "Endstops" msgstr "Krancowki" # MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:6758 +#: ultralcd.cpp:6753 msgid "Error - static memory has been overwritten" msgstr "Blad - pamiec statyczna zostala nadpisana" # MSG_CUT_FILAMENT c=16 -#: messages.c:51 +#: messages.c:59 msgid "Cut filament" msgstr "Ciecie filamentu" # MSG_CUTTER c=9 -#: messages.c:110 +#: messages.c:126 msgid "Cutter" msgstr "Nozyk" @@ -376,122 +376,122 @@ msgid "Cutting filament" msgstr "Obcinanie fil." # MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4364 +#: ultralcd.cpp:4359 msgid "ERROR: Filament sensor is not responding, please check connection." msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." # MSG_DIM c=6 -#: messages.c:140 +#: messages.c:159 msgid "Dim" msgstr "Sciemn" # MSG_ERROR -#: messages.c:26 +#: messages.c:29 msgid "ERROR:" msgstr "BLAD:" # MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8403 +#: ultralcd.cpp:8398 msgid "Extruder fan:" msgstr "WentHotend:" # MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2158 +#: ultralcd.cpp:2153 msgid "Extruder info" msgstr "Ekstruder - info" -# MSG_MOVE_E -#: messages.c:27 +# MSG_EXTRUDER c=17 +#: messages.c:30 msgid "Extruder" msgstr "Ekstruder" # -#: ultralcd.cpp:6745 +#: ultralcd.cpp:6740 msgid "Fail stats MMU" msgstr "Bledy MMU" # MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:41 +#: messages.c:47 msgid "F. autoload" msgstr "Autolad. fil." # -#: ultralcd.cpp:6742 +#: ultralcd.cpp:6737 msgid "Fail stats" msgstr "Statystyki bledow" # MSG_FAN_SPEED c=14 -#: messages.c:29 +#: messages.c:34 msgid "Fan speed" msgstr "Predkosc went." # MSG_SELFTEST_FAN c=20 -#: messages.c:75 +#: messages.c:89 msgid "Fan test" msgstr "Test wentylatora" -# MSG_FANS_CHECK -#: ultralcd.cpp:5696 +# MSG_FANS_CHECK c=13 +#: messages.c:31 msgid "Fans check" msgstr "Sprawd.went." # MSG_FSENSOR -#: messages.c:42 +#: messages.c:48 msgid "Fil. sensor" msgstr "Czuj. filam." -# c=14 -#: ultralcd.cpp:1735 -msgid "Filam. runouts" +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " msgstr "Konc.filamentu" # MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:30 +#: messages.c:35 msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy,kolor jest ok?" # MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2651 +#: ultralcd.cpp:2646 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" # MSG_FILAMENT_SENSOR c=20 -#: messages.c:81 +#: messages.c:95 msgid "Filament sensor" msgstr "Czujnik filamentu" # MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2800 +#: ultralcd.cpp:2795 msgid "Filament used" msgstr "Uzyty filament" # MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2801 +#: ultralcd.cpp:2796 msgid "Print time" msgstr "Czas druku" # MSG_FS_ACTION c=10 -#: messages.c:132 +#: messages.c:151 msgid "FS Action" msgstr "Akcja FS" # MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8545 +#: ultralcd.cpp:8540 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" # MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:38 +#: messages.c:44 msgid "Finishing movements" msgstr "Konczenie druku" # MSG_V2_CALIBRATION c=18 -#: messages.c:104 +#: messages.c:120 msgid "First layer cal." msgstr "Kal. 1. warstwy" # MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:4952 +#: ultralcd.cpp:4947 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu." @@ -501,32 +501,32 @@ msgid "Fix the issue and then press button on MMU unit." msgstr "Rozwiaz problem i wcisnij przycisk na MMU." # MSG_FLOW -#: ultralcd.cpp:6885 +#: ultralcd.cpp:6880 msgid "Flow" msgstr "Przeplyw" # MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2110 +#: ultralcd.cpp:2105 msgid "forum.prusa3d.com" msgstr "" # MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:72 +#: messages.c:86 msgid "Front print fan?" msgstr "Przedni went. druku?" # MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3195 +#: ultralcd.cpp:3190 msgid "Front side[um]" msgstr "Przod [um]" # MSG_SELFTEST_FANS -#: ultralcd.cpp:8084 +#: ultralcd.cpp:8079 msgid "Front/left fans" msgstr "Przedni/lewy wentylator" # MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8032 +#: ultralcd.cpp:8027 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" @@ -536,152 +536,152 @@ msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" # MSG_HEATING_COMPLETE c=20 -#: messages.c:44 +#: messages.c:50 msgid "Heating done." msgstr "Grzanie zakonczone" # MSG_HEATING -#: messages.c:43 +#: messages.c:49 msgid "Heating" msgstr "Grzanie..." # MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:4931 +#: ultralcd.cpp:4926 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:2111 +#: ultralcd.cpp:2106 msgid "howto.prusa3d.com" msgstr "" # MSG_FILAMENTCHANGE -#: messages.c:35 +#: messages.c:41 msgid "Change filament" msgstr "Wymiana filamentu" # MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2581 +#: ultralcd.cpp:2576 msgid "Change success!" msgstr "Wymiana ok!" # MSG_CORRECTLY c=20 -#: ultralcd.cpp:2649 +#: ultralcd.cpp:2644 msgid "Changed correctly?" msgstr "Wymiana ok?" # MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:78 +#: messages.c:92 msgid "Checking bed " msgstr "Kontrola stolu" # MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8386 +#: ultralcd.cpp:8381 msgid "Checking endstops" msgstr "Kontrola krancowek" # MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8392 +#: ultralcd.cpp:8387 msgid "Checking hotend " msgstr "Kontrola hotendu" # MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:79 +#: messages.c:93 msgid "Checking sensors " msgstr "Kontrola czujnikow" -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7240 -msgid "Checking X axis " +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" msgstr "Kontrola osi X" -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7249 -msgid "Checking Y axis " +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" msgstr "Kontrola osi Y" # MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8389 -msgid "Checking Z axis " +#: +msgid "Checking Z axis" msgstr "Kontrola osi Z" # MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:46 +#: messages.c:52 msgid "Choose extruder:" msgstr "Wybierz ekstruder:" # MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:47 +#: messages.c:53 msgid "Choose filament:" msgstr "Wybierz filament:" # MSG_FILAMENT c=17 r=1 -#: messages.c:28 +#: messages.c:33 msgid "Filament" msgstr "" # MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:4961 +#: ultralcd.cpp:4956 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:4969 +#: ultralcd.cpp:4964 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." # MSG_WATCH -#: messages.c:98 +#: messages.c:114 msgid "Info screen" msgstr "Ekran informacyjny" # MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2569 +#: ultralcd.cpp:2564 msgid "Insert filament" msgstr "Wprowadz filament" -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4741 +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" # MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:91 +#: messages.c:107 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" -# -#: ultralcd.cpp:1678 +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 msgid "Last print failures" msgstr "Ostatnie bledy druku" # -#: ultralcd.cpp:5039 +#: ultralcd.cpp:5034 msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." msgstr "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." -# -#: ultralcd.cpp:1655 +# MSG_LAST_PRINT c=18 +#: messages.c:54 msgid "Last print" msgstr "Ost. wydruk" # MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:73 +#: messages.c:87 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" # -#: ultralcd.cpp:2924 +#: ultralcd.cpp:2919 msgid "Left" msgstr "Lewa" # MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3193 +#: ultralcd.cpp:3188 msgid "Left side [um]" msgstr "Lewo [um]" # -#: ultralcd.cpp:5711 +#: ultralcd.cpp:5706 msgid "Lin. correction" msgstr "Korekcja liniowa" @@ -691,64 +691,64 @@ msgid "Live adjust Z" msgstr "Ustaw. Live Z" # c=20 r=6 -#: ultralcd.cpp:7285 +#: ultralcd.cpp:7280 msgid "Insert the filament (do not load it) into the extruder and then press the knob." msgstr "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." # MSG_LOAD_FILAMENT c=17 -#: messages.c:48 +#: messages.c:56 msgid "Load filament" msgstr "Ladowanie fil." # MSG_LOADING_COLOR -#: ultralcd.cpp:2603 +#: ultralcd.cpp:2598 msgid "Loading color" msgstr "Czyszcz. koloru" # MSG_LOADING_FILAMENT c=20 -#: messages.c:49 +#: messages.c:57 msgid "Loading filament" msgstr "Laduje filament" # MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8072 +#: ultralcd.cpp:8067 msgid "Loose pulley" msgstr "Luzne kolo pasowe" # -#: ultralcd.cpp:6704 +#: ultralcd.cpp:6699 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" # MSG_M117_V2_CALIBRATION c=25 -#: messages.c:52 +#: messages.c:60 msgid "M117 First layer cal." msgstr "M117 Kal. 1. warstwy" # MSG_MAIN -#: messages.c:53 +#: messages.c:61 msgid "Main" msgstr "Menu glowne" # MSG_BL_HIGH c=12 -#: messages.c:136 +#: messages.c:155 msgid "Level Bright" msgstr "Poziom jasn." # MSG_BL_LOW c=12 -#: messages.c:137 +#: messages.c:156 msgid "Level Dimmed" msgstr "Poziom ciem." # MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:56 +#: messages.c:65 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5802 +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 msgid "Mesh Bed Leveling" -msgstr "Poziomowanie stolu wg siatki" +msgstr "Poziomowanie stolu" # MSG_MMU_OK_RESUMING_POSITION c=20 r=4 #: mmu.cpp:764 @@ -761,12 +761,12 @@ msgid "MMU OK. Resuming temperature..." msgstr "MMU OK. Wznawiam nagrzewanie..." # -#: ultralcd.cpp:2965 +#: ultralcd.cpp:2960 msgid "Measured skew" msgstr "Zmierzony skos" -# -#: ultralcd.cpp:1679 +# MSG_MMU_FAILS c=14 +#: messages.c:68 msgid "MMU fails" msgstr "Bledy MMU" @@ -775,8 +775,8 @@ msgstr "Bledy MMU" msgid "MMU load failed " msgstr "Blad ladowania MMU" -# -#: ultralcd.cpp:1680 +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 msgid "MMU load fails" msgstr "Bledy ladow. MMU" @@ -786,7 +786,7 @@ msgid "MMU OK. Resuming..." msgstr "MMU OK. Wznawianie..." # MSG_MODE -#: messages.c:85 +#: messages.c:101 msgid "Mode" msgstr "Tryb" @@ -796,12 +796,12 @@ msgid "MK3 firmware detected on MK3S printer" msgstr "Wykryto firmware MK3 w drukarce MK3S" # MSG_NORMAL -#: messages.c:89 +#: messages.c:105 msgid "Normal" msgstr "Normalni" # MSG_SILENT -#: messages.c:88 +#: messages.c:104 msgid "Silent" msgstr "Cichy" @@ -811,52 +811,52 @@ msgid "MMU needs user attention." msgstr "MMU wymaga uwagi uzytkownika." # -#: ultralcd.cpp:1706 +#: ultralcd.cpp:1701 msgid "MMU power fails" msgstr "Zaniki zasil. MMU" # MSG_STEALTH -#: messages.c:90 +#: messages.c:106 msgid "Stealth" msgstr "Cichy" # MSG_AUTO_POWER -#: messages.c:87 +#: messages.c:103 msgid "Auto power" msgstr "Automatycz" # MSG_HIGH_POWER -#: messages.c:86 +#: messages.c:102 msgid "High power" msgstr "Wysoka wyd." # -#: ultralcd.cpp:2129 +#: ultralcd.cpp:2124 msgid "MMU2 connected" msgstr "MMU podlaczone" # MSG_SELFTEST_MOTOR -#: messages.c:80 +#: messages.c:94 msgid "Motor" msgstr "Silnik" # MSG_MOVE_AXIS -#: ultralcd.cpp:5686 +#: ultralcd.cpp:5681 msgid "Move axis" msgstr "Ruch osi" # MSG_MOVE_X -#: ultralcd.cpp:4267 +#: ultralcd.cpp:4262 msgid "Move X" msgstr "Ruch osi X" # MSG_MOVE_Y -#: ultralcd.cpp:4268 +#: ultralcd.cpp:4263 msgid "Move Y" msgstr "Ruch osi Y" # MSG_MOVE_Z -#: ultralcd.cpp:4269 +#: ultralcd.cpp:4264 msgid "Move Z" msgstr "Ruch osi Z" @@ -866,22 +866,22 @@ msgid "No move." msgstr "Brak ruchu." # MSG_NO_CARD -#: ultralcd.cpp:6678 +#: ultralcd.cpp:6673 msgid "No SD card" msgstr "Brak karty SD" # MSG_NA -#: messages.c:108 +#: messages.c:124 msgid "N/A" msgstr "N/D" # MSG_NO -#: messages.c:59 +#: messages.c:70 msgid "No" msgstr "Nie" # MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8033 +#: ultralcd.cpp:8028 msgid "Not connected" msgstr "Nie podlaczono " @@ -891,22 +891,22 @@ msgid "New firmware version available:" msgstr "Dostepna nowa wersja firmware:" # MSG_SELFTEST_FAN_NO c=19 -#: messages.c:76 +#: messages.c:90 msgid "Not spinning" msgstr "Nie kreci sie" # MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4852 +#: ultralcd.cpp:4847 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:4977 +#: ultralcd.cpp:4972 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." # MSG_NOZZLE -#: messages.c:60 +#: messages.c:71 msgid "Nozzle" msgstr "Dysza" @@ -916,62 +916,62 @@ msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." # -#: ultralcd.cpp:4968 +#: ultralcd.cpp:4963 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." # -#: ultralcd.cpp:1605 +#: ultralcd.cpp:1600 msgid "Nozzle FAN" msgstr "WentHotend" # MSG_PAUSE_PRINT -#: ultralcd.cpp:6642 +#: ultralcd.cpp:6637 msgid "Pause print" msgstr "Wstrzymanie wydruku" # MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1490 +#: ultralcd.cpp:1485 msgid "PID cal. " msgstr "Kalibracja PID" # MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1496 +#: ultralcd.cpp:1491 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" # MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5808 +#: ultralcd.cpp:5803 msgid "PID calibration" msgstr "Kalibracja PID" # MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:848 +#: ultralcd.cpp:843 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" # MSG_PAPER c=20 r=10 -#: messages.c:61 +#: messages.c:72 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:5034 +#: ultralcd.cpp:5029 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." # MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:22 +#: messages.c:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." # MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8027 +#: ultralcd.cpp:8022 msgid "Please check :" msgstr "Sprawdz :" # MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:99 +#: messages.c:115 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." @@ -981,17 +981,17 @@ 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:62 +#: messages.c:73 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:65 +#: messages.c:77 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" # MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:67 +#: messages.c:79 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" @@ -1001,7 +1001,7 @@ 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:71 +#: messages.c:82 msgid "Please remove steel sheet from heatbed." msgstr "Prosze zdjac plyte stalowa z podgrzewanego stolu." @@ -1016,32 +1016,32 @@ 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:63 +#: messages.c:74 msgid "Please wait" msgstr "Prosze czekac" # -#: ultralcd.cpp:4967 +#: ultralcd.cpp:4962 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" # MSG_PREHEAT_NOZZLE c=20 -#: messages.c:64 +#: messages.c:76 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" # MSG_PREHEAT -#: ultralcd.cpp:6620 +#: ultralcd.cpp:6615 msgid "Preheat" msgstr "Grzanie" # MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:101 +#: messages.c:117 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." # c=14 -#: ultralcd.cpp:1910 +#: ultralcd.cpp:1905 msgid "PINDA" msgstr "" @@ -1060,28 +1060,28 @@ msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." msgid "Pause" msgstr "Pauza" -# -#: ultralcd.cpp:1734 +# MSG_POWER_FAILURES c=14 +#: messages.c:75 msgid "Power failures" msgstr "Zaniki zasilania" # MSG_PRINT_ABORTED c=20 -#: messages.c:66 +#: messages.c:78 msgid "Print aborted" msgstr "Druk przerwany" # c=20 -#: ultralcd.cpp:2395 +#: ultralcd.cpp:2390 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" # c=20 -#: ultralcd.cpp:2400 +#: ultralcd.cpp:2395 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." # MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8406 +#: ultralcd.cpp:8401 msgid "Print fan:" msgstr "WentWydruk:" @@ -1091,12 +1091,12 @@ msgid "Print from SD" msgstr "Druk z karty SD" # -#: ultralcd.cpp:2236 +#: ultralcd.cpp:2231 msgid "Press the knob" msgstr "Wcisnij pokretlo" # MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1070 +#: ultralcd.cpp:1065 msgid "Print paused" msgstr "Druk wstrzymany" @@ -1106,47 +1106,47 @@ msgid "Press the knob to resume nozzle temperature." msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." # MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:39 +#: messages.c:45 msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." # -#: ultralcd.cpp:1606 +#: ultralcd.cpp:1601 msgid "Print FAN" msgstr "WentWydruk" # -#: ultralcd.cpp:4832 +#: ultralcd.cpp:4827 msgid "Please insert filament into the extruder, then press the knob to load it." msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4827 +#: ultralcd.cpp:4822 msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." msgstr "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." # -#: ultralcd.cpp:4749 +#: ultralcd.cpp:4744 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." # MSG_PRUSA3D -#: ultralcd.cpp:2109 +#: ultralcd.cpp:2104 msgid "prusa3d.com" msgstr "" # MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3196 +#: ultralcd.cpp:3191 msgid "Rear side [um]" msgstr "Tyl [um]" # c=20 r=4 -#: ultralcd.cpp:7309 +#: ultralcd.cpp:7304 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." # c=20 r=4 -#: ultralcd.cpp:7312 +#: ultralcd.cpp:7307 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." @@ -1166,87 +1166,87 @@ msgid "Prusa i3 MK3S OK." msgstr "" # MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5813 +#: ultralcd.cpp:5808 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3197 +# MSG_RESET c=14 +#: messages.c:83 msgid "Reset" msgstr "" -# MSG_RESUME_PRINT -#: ultralcd.cpp:6628 +# MSG_RESUME_PRINT c=18 +#: messages.c:84 msgid "Resume print" msgstr "Wznowic wydruk" # MSG_RESUMING_PRINT c=20 -#: messages.c:70 +#: messages.c:85 msgid "Resuming print" msgstr "Wznawianie druku" # MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3194 +#: ultralcd.cpp:3189 msgid "Right side[um]" msgstr "Prawo [um]" # MSG_RPI_PORT -#: messages.c:124 +#: messages.c:142 msgid "RPi port" msgstr "Port RPi" # MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4770 +#: ultralcd.cpp:4765 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_SD_CARD -#: messages.c:119 +#: messages.c:137 msgid "SD card" msgstr "Karta SD" # MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:120 +#: messages.c:138 msgid "FlashAir" msgstr "" # -#: ultralcd.cpp:2925 +#: ultralcd.cpp:2920 msgid "Right" msgstr "Prawa" # MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:36 +#: messages.c:42 msgid "Searching bed calibration point" msgstr "Szukam punktu kalibracyjnego na stole" # MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5726 +#: ultralcd.cpp:5721 msgid "Select language" msgstr "Wybor jezyka" # MSG_SELFTEST_OK -#: ultralcd.cpp:7584 +#: ultralcd.cpp:7579 msgid "Self test OK" msgstr "Selftest OK" # MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7352 +#: ultralcd.cpp:7347 msgid "Self test start " msgstr "Selftest startuje" # MSG_SELFTEST -#: ultralcd.cpp:5789 +#: ultralcd.cpp:5784 msgid "Selftest " msgstr "Selftest " # MSG_SELFTEST_ERROR -#: ultralcd.cpp:8026 +#: ultralcd.cpp:8021 msgid "Selftest error !" msgstr "Blad selftest!" # MSG_SELFTEST_FAILED c=20 -#: messages.c:74 +#: messages.c:88 msgid "Selftest failed " msgstr "Selftest nieudany" @@ -1256,12 +1256,12 @@ msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" # -#: ultralcd.cpp:5008 +#: ultralcd.cpp:5003 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." # MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3214 +#: ultralcd.cpp:3209 msgid "Set temperature:" msgstr "Ustaw temperature:" @@ -1281,17 +1281,17 @@ msgid "Prusa i3 MK3 OK." msgstr "" # MSG_SETTINGS -#: messages.c:83 +#: messages.c:97 msgid "Settings" msgstr "Ustawienia" # MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5810 +#: ultralcd.cpp:5805 msgid "Show end stops" msgstr "Pokaz krancowki" # -#: ultralcd.cpp:3920 +#: ultralcd.cpp:3915 msgid "Sensor state" msgstr "Stan czujnikow" @@ -1301,27 +1301,27 @@ msgid "Some files will not be sorted. Max. No. of files in 1 folder for sorting msgstr "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." # MSG_SORT -#: messages.c:121 +#: messages.c:139 msgid "Sort" msgstr "Sortowanie" # MSG_NONE -#: messages.c:111 +#: messages.c:127 msgid "None" msgstr "Brak" # MSG_SORT_TIME -#: messages.c:122 +#: messages.c:140 msgid "Time" msgstr "Czas" # -#: ultralcd.cpp:2968 +#: ultralcd.cpp:2963 msgid "Severe skew:" msgstr "Znaczny skos:" # MSG_SORT_ALPHA -#: messages.c:123 +#: messages.c:141 msgid "Alphabet" msgstr "Alfab" @@ -1331,22 +1331,22 @@ msgid "Sorting files" msgstr "Sortowanie plikow" # MSG_SOUND_LOUD -#: messages.c:126 +#: messages.c:144 msgid "Loud" msgstr "Glosny" # -#: ultralcd.cpp:2967 +#: ultralcd.cpp:2962 msgid "Slight skew:" msgstr "Lekki skos:" # MSG_SOUND -#: messages.c:125 +#: messages.c:143 msgid "Sound" msgstr "Dzwiek" # c=7 -#: ultralcd.cpp:1773 +#: ultralcd.cpp:1768 msgid "Runouts" msgstr "Konce f" @@ -1356,17 +1356,17 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." # MSG_SOUND_ONCE -#: messages.c:127 +#: messages.c:145 msgid "Once" msgstr "1-raz" # MSG_SPEED -#: ultralcd.cpp:6879 +#: ultralcd.cpp:6874 msgid "Speed" msgstr "Predkosc" # MSG_SELFTEST_FAN_YES c=19 -#: messages.c:77 +#: messages.c:91 msgid "Spinning" msgstr "Kreci sie" @@ -1376,92 +1376,92 @@ 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:6738 +#: ultralcd.cpp:6733 msgid "Statistics " msgstr "Statystyki" # MSG_STOP_PRINT -#: messages.c:92 +#: messages.c:108 msgid "Stop print" msgstr "Przerwanie druku" # MSG_STOPPED -#: messages.c:93 +#: messages.c:109 msgid "STOPPED. " msgstr "ZATRZYMANO." # MSG_SUPPORT -#: ultralcd.cpp:6747 +#: ultralcd.cpp:6742 msgid "Support" msgstr "Wsparcie" # MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8085 +#: ultralcd.cpp:8080 msgid "Swapped" msgstr "Zamieniono" # -#: ultralcd.cpp:4720 +#: ultralcd.cpp:4715 msgid "Select filament:" msgstr "Wybierz filament:" # MSG_TEMP_CALIBRATION c=14 -#: messages.c:94 +#: messages.c:110 msgid "Temp. cal." msgstr "Kalib. temp." # -#: ultralcd.cpp:4861 +#: ultralcd.cpp:4856 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." # MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5821 +#: ultralcd.cpp:5816 msgid "Temp. calibration" msgstr "Kalibracja temp." # MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3850 +#: ultralcd.cpp:3845 msgid "Temperature calibration failed" msgstr "Kalibracja temperaturowa nieudana" # MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:95 +#: messages.c:111 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." # c=20 r=3 -#: ultralcd.cpp:7316 +#: ultralcd.cpp:7311 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." # MSG_TEMPERATURE -#: ultralcd.cpp:5684 +#: ultralcd.cpp:5679 msgid "Temperature" msgstr "Temperatura" # MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2165 +#: ultralcd.cpp:2160 msgid "Temperatures" msgstr "Temperatury" # MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:40 +#: messages.c:46 msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." # -#: ultralcd.cpp:2822 +#: ultralcd.cpp:2817 msgid "Total filament" msgstr "Zuzycie filamentu" # -#: ultralcd.cpp:2823 +#: ultralcd.cpp:2818 msgid "Total print time" msgstr "Laczny czas druku" # MSG_TUNE -#: ultralcd.cpp:6617 +#: ultralcd.cpp:6612 msgid "Tune" msgstr "Strojenie" @@ -1470,48 +1470,48 @@ msgstr "Strojenie" msgid "Unload" msgstr "Rozladuj" -# -#: ultralcd.cpp:1703 +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 msgid "Total failures" msgstr "Suma bledow" # -#: ultralcd.cpp:2243 +#: ultralcd.cpp:2238 msgid "to load filament" msgstr "aby zaladow. fil." # -#: ultralcd.cpp:2247 +#: ultralcd.cpp:2242 msgid "to unload filament" msgstr "aby rozlad. filament" # MSG_UNLOAD_FILAMENT c=17 -#: messages.c:96 +#: messages.c:112 msgid "Unload filament" msgstr "Rozladowanie fil." # MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:97 +#: messages.c:113 msgid "Unloading filament" msgstr "Rozladowuje filament" -# -#: ultralcd.cpp:1656 +# MSG_TOTAL c=6 +#: messages.c:98 msgid "Total" msgstr "Suma" # MSG_USED c=19 r=1 -#: ultralcd.cpp:5937 +#: ultralcd.cpp:5932 msgid "Used during print" msgstr "Uzyte podczas druku" # MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2168 +#: ultralcd.cpp:2163 msgid "Voltages" msgstr "Napiecia" # -#: ultralcd.cpp:2137 +#: ultralcd.cpp:2132 msgid "unknown" msgstr "nieznane" @@ -1521,12 +1521,12 @@ msgid "Wait for user..." msgstr "Czekam na uzytkownika..." # MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3362 +#: ultralcd.cpp:3357 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" # MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3323 +#: ultralcd.cpp:3318 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" @@ -1556,17 +1556,17 @@ msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" # MSG_SELFTEST_WIRINGERROR -#: messages.c:82 +#: messages.c:96 msgid "Wiring error" msgstr "Blad polaczenia" # MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5780 +#: ultralcd.cpp:5775 msgid "Wizard" msgstr "Asystent" # MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2157 +#: ultralcd.cpp:2152 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" @@ -1576,117 +1576,117 @@ msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." # MSG_YES -#: messages.c:103 +#: messages.c:119 msgid "Yes" msgstr "Tak" # MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:102 +#: messages.c:118 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:3822 +#: ultralcd.cpp:3817 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:3819 +#: ultralcd.cpp:3814 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_TIMEOUT c=12 -#: messages.c:138 +#: messages.c:157 msgid "Timeout" msgstr "Wyl. czas." # MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5096 +#: ultralcd.cpp:5091 msgid "X-correct:" msgstr "Korekcja-X:" # MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3816 +#: ultralcd.cpp:3811 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:3800 +#: ultralcd.cpp:3795 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:3803 +#: ultralcd.cpp:3798 msgid "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." # MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6176 +#: ultralcd.cpp:6171 msgid "Load all" msgstr "Zalad. wszystkie" # -#: ultralcd.cpp:3782 +#: ultralcd.cpp:3777 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." # -#: ultralcd.cpp:3788 +#: ultralcd.cpp:3783 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:3791 +#: ultralcd.cpp:3786 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." # -#: ultralcd.cpp:2922 +#: ultralcd.cpp:2917 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" # -#: ultralcd.cpp:4864 +#: ultralcd.cpp:4859 msgid "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)." msgstr "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." # c=20 r=5 -#: ultralcd.cpp:7320 +#: ultralcd.cpp:7315 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." # MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5097 +#: ultralcd.cpp:5092 msgid "Y-correct:" msgstr "Korekcja-Y:" # MSG_OFF -#: messages.c:106 +#: messages.c:122 msgid "Off" msgstr "Wyl" # MSG_ON -#: messages.c:107 +#: messages.c:123 msgid "On" msgstr "Wl" # -#: messages.c:54 +#: messages.c:62 msgid "Back" msgstr "Wstecz" # -#: ultralcd.cpp:5652 +#: ultralcd.cpp:5647 msgid "Checks" msgstr "Testy" # -#: ultralcd.cpp:8095 +#: ultralcd.cpp:8090 msgid "False triggering" msgstr "Falszywy alarm" # -#: ultralcd.cpp:3925 +#: ultralcd.cpp:3920 msgid "FINDA:" msgstr "" @@ -1696,62 +1696,57 @@ msgid "Firmware" msgstr "" # MSG_STRICT -#: messages.c:113 +#: messages.c:129 msgid "Strict" msgstr "Restr." # MSG_WARN -#: messages.c:112 +#: messages.c:128 msgid "Warn" msgstr "Ostrzez" -# -#: messages.c:84 +# MSG_HW_SETUP c=18 +#: messages.c:100 msgid "HW Setup" msgstr "Ustawienia HW" # -#: ultralcd.cpp:3929 +#: ultralcd.cpp:3924 msgid "IR:" msgstr "" # MSG_MAGNETS_COMP -#: messages.c:131 +#: messages.c:150 msgid "Magnets comp." msgstr "Kor. magnesow" # MSG_MESH -#: messages.c:129 +#: messages.c:147 msgid "Mesh" msgstr "Siatka" -# -#: ultralcd.cpp:5708 -msgid "Mesh bed leveling" -msgstr "Poziomowanie stolu" - # #: Marlin_main.cpp:927 msgid "MK3S firmware detected on MK3 printer" msgstr "Wykryto firmware MK3S w drukarce MK3" # MSG_MMU_MODE -#: messages.c:118 +#: messages.c:136 msgid "MMU Mode" msgstr "Tryb MMU" # -#: ultralcd.cpp:4400 +#: ultralcd.cpp:4395 msgid "Mode change in progress ..." msgstr "Trwa zmiana trybu..." # MSG_MODEL -#: messages.c:114 +#: messages.c:130 msgid "Model" msgstr "" # MSG_NOZZLE_DIAMETER -#: messages.c:117 +#: messages.c:135 msgid "Nozzle d." msgstr "Sr. dyszy" @@ -1765,13 +1760,13 @@ msgstr "G-code pociety dla innej wersji. Kontynuowac?" 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:431 +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code pociety dla innej drukarki. Kontynuowac?" -# -#: util.cpp:437 +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 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." @@ -1786,17 +1781,17 @@ msgid "G-code sliced for a newer firmware. Please update the firmware. Print can msgstr "G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany." # -#: ultralcd.cpp:3921 +#: ultralcd.cpp:3916 msgid "PINDA:" msgstr "" # c=20 -#: ultralcd.cpp:2407 +#: ultralcd.cpp:2402 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" # c=20 -#: ultralcd.cpp:2404 +#: ultralcd.cpp:2399 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" @@ -1811,47 +1806,47 @@ msgid "Printer nozzle diameter differs from the G-code. Please check the value i msgstr "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany." # c=20 -#: ultralcd.cpp:8100 +#: ultralcd.cpp:8095 msgid "%s level expected" msgstr "Oczekiwano wersji %s" # -#: ultralcd.cpp:6579 +#: ultralcd.cpp:6574 msgid "Rename" msgstr "Zmien nazwe" # -#: ultralcd.cpp:6572 +#: ultralcd.cpp:6567 msgid "Select" msgstr "Wybierz" # -#: ultralcd.cpp:2159 +#: ultralcd.cpp:2154 msgid "Sensor info" msgstr "Info o sensorach" # MSG_SHEET c=10 -#: messages.c:55 +#: messages.c:63 msgid "Sheet" msgstr "Plyta" # MSG_SOUND_BLIND -#: messages.c:128 +#: messages.c:146 msgid "Assist" msgstr "Asyst." -# c=18 -#: ultralcd.cpp:5650 +# MSG_STEEL_SHEET c=18 +#: messages.c:64 msgid "Steel sheets" msgstr "Plyty stalowe" # MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5098 +#: ultralcd.cpp:5093 msgid "Z-correct:" msgstr "Korekcja-Z:" # MSG_Z_PROBE_NR -#: messages.c:130 +#: messages.c:149 msgid "Z-probe nr." msgstr "Ilosc Pomiarow" diff --git a/lang/po/new/cs.po b/lang/po/new/cs.po index dda52924b..51d01b066 100644 --- a/lang/po/new/cs.po +++ b/lang/po/new/cs.po @@ -1,1857 +1,1852 @@ -# Translation of Prusa-Firmware into Czech. -# -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" -"Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri Sep 18 15:22:53 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:22:53 CEST 2020\n" -"Language-Team: \n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -# -#: -msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -msgstr "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" - -# MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 -msgid " 0.3 or older" -msgstr " 0.3 nebo starsi" - -# c=18 -#: Marlin_main.cpp:9463 -msgid "FS v0.3 or older" -msgstr "FS 0.3 nebo starsi" - -# MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 -msgid " 0.4 or newer" -msgstr " 0.4 nebo novejsi" - -# c=18 -#: Marlin_main.cpp:9462 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 a novejsi" - -# MSG_IR_UNKNOWN c=18 -#: messages.c:145 -msgid "unknown state" -msgstr "neznamy stav" - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 -msgid " of 4" -msgstr " z 4" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 -msgid " of 9" -msgstr " z 9" - -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 -msgid "[0;0] point offset" -msgstr "[0;0] odsazeni bodu" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: -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 -#: -msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" - -# -#: ultralcd.cpp:2451 -msgid ">Cancel" -msgstr ">Zrusit" - -# MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 -msgid "Adjusting Z:" -msgstr "Doladeni Z:" - -# MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 -msgid "All correct " -msgstr "Vse OK " - -# MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 -msgid "All is done. Happy printing!" -msgstr "Vse je hotovo." - -# -#: ultralcd.cpp:1956 -msgid "Ambient" -msgstr "Okoli" - -# MSG_AUTO c=6 -#: messages.c:140 -msgid "Auto" -msgstr "" - -# MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 -msgid "and press the knob" -msgstr "a stisknete tlacitko" - -# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 -msgid "Are left and right Z~carriages all up?" -msgstr "Dojely oba Z voziky k~hornimu dorazu?" - -# MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 -msgid "SpoolJoin" -msgstr "" - -# MSG_AUTO_HOME -#: messages.c:11 -msgid "Auto home" -msgstr "" - -# MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 -msgid "AutoLoad filament" -msgstr "AutoZavedeni fil." - -# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 -msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." - -# MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 -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:8371 -msgid "Axis length" -msgstr "Delka osy" - -# MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 -msgid "Axis" -msgstr "Osa" - -# MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 -msgid "Bed / Heater" -msgstr "Podlozka / Topeni" - -# MSG_BED_DONE -#: messages.c:15 -msgid "Bed done" -msgstr "Bed OK." - -# MSG_BED_HEATING -#: messages.c:16 -msgid "Bed Heating" -msgstr "Zahrivani bedu" - -# MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 -msgid "Bed level correct" -msgstr "Korekce podlozky" - -# MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 -msgid "Belt test " -msgstr "Test remenu " - -# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 -#: messages.c:17 -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_BRIGHT c=6 -#: messages.c:138 -msgid "Bright" -msgstr "Jasny" - -# MSG_BRIGHTNESS c=18 -#: messages.c:134 -msgid "Brightness" -msgstr "Podsviceni" - -# MSG_BED -#: messages.c:14 -msgid "Bed" -msgstr "Podlozka" - -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 -msgid "Belt status" -msgstr "Stav remenu" - -# MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 -msgid "Blackout occurred. Recover print?" -msgstr "Detekovan vypadek proudu.Obnovit tisk?" - -# -#: ultralcd.cpp:8706 -msgid "Calibrating home" -msgstr "Kalibruji vychozi poz." - -# MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 -msgid "Calibrate XYZ" -msgstr "Kalibrace XYZ" - -# MSG_HOMEYZ -#: messages.c:44 -msgid "Calibrate Z" -msgstr "Kalibrovat Z" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 -msgid "Calibrate" -msgstr "Zkalibrovat" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 -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." - -# MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 -msgid "Calibrating Z" -msgstr "Kalibruji Z" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 -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:865 -msgid "Calibration done" -msgstr "Kalibrace OK" - -# MSG_MENU_CALIBRATION -#: messages.c:57 -msgid "Calibration" -msgstr "Kalibrace" - -# -#: ultralcd.cpp:4811 -msgid "Cancel" -msgstr "Zrusit" - -# MSG_SD_REMOVED -#: ultralcd.cpp:9142 -msgid "Card removed" -msgstr "Karta vyjmuta" - -# MSG_NOT_COLOR -#: ultralcd.cpp:2707 -msgid "Color not correct" -msgstr "Barva neni cista" - -# MSG_COOLDOWN -#: messages.c:22 -msgid "Cooldown" -msgstr "Zchladit" - -# -#: ultralcd.cpp:4566 -msgid "Copy selected language?" -msgstr "Kopirovat vybrany jazyk?" - -# MSG_CRASHDETECT c=13 -#: messages.c:24 -msgid "Crash det." -msgstr "" - -# -#: ultralcd.cpp:4946 -msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." -msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" - -# MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 -msgid "Crash detected." -msgstr "Detekovan naraz." - -# -#: Marlin_main.cpp:605 -msgid "Crash detected. Resume print?" -msgstr "Detekovan naraz. Obnovit tisk?" - -# -#: ultralcd.cpp:1785 -msgid "Crash" -msgstr "Naraz" - -# MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 -msgid "Current" -msgstr "Pouze aktualni" - -# MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 -msgid "Date:" -msgstr "Datum:" - -# MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 -msgid "Disable steppers" -msgstr "Vypnout motory" - -# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: messages.c:13 -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 "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." - -# MSG_FS_CONTINUE c=5 -#: messages.c:132 -msgid "Cont." -msgstr "Pokr." - -# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 -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=13 -#: ultralcd.cpp:5190 -msgid "E-correct:" -msgstr "Korekce E:" - -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 -msgid "Eject filament" -msgstr "Vysunout filament" - -# MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 -msgid "Ejecting filament" -msgstr "Vysouvam filament" - -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 -msgid "Endstop not hit" -msgstr "Kon. spinac nesepnut" - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 -msgid "Endstop" -msgstr "Koncovy spinac" - -# MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 -msgid "Endstops" -msgstr "Konc. spinace" - -# MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 -msgid "Error - static memory has been overwritten" -msgstr "Chyba - Doslo k prepisu staticke pameti!" - -# MSG_CUT_FILAMENT c=16 -#: messages.c:50 -msgid "Cut filament" -msgstr "Ustrihnout" - -# MSG_CUTTER c=9 -#: messages.c:109 -msgid "Cutter" -msgstr "Strihani" - -# c=18 -#: mmu.cpp:1388 -msgid "Cutting filament" -msgstr "Strihani filamentu" - -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni." - -# MSG_DIM c=6 -#: messages.c:139 -msgid "Dim" -msgstr "Temny" - -# MSG_ERROR -#: messages.c:25 -msgid "ERROR:" -msgstr "CHYBA:" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 -msgid "Extruder fan:" -msgstr "Levy vent.:" - -# MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 -msgid "Extruder info" -msgstr "" - -# MSG_MOVE_E -#: messages.c:26 -msgid "Extruder" -msgstr "" - -# -#: ultralcd.cpp:7017 -msgid "Fail stats MMU" -msgstr "Selhani MMU" - -# MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 -msgid "F. autoload" -msgstr "F. autozav." - -# -#: ultralcd.cpp:7014 -msgid "Fail stats" -msgstr "Selhani" - -# MSG_FAN_SPEED c=14 -#: messages.c:28 -msgid "Fan speed" -msgstr "Rychlost vent." - -# MSG_SELFTEST_FAN c=20 -#: messages.c:74 -msgid "Fan test" -msgstr "Test ventilatoru" - -# MSG_FANS_CHECK -#: ultralcd.cpp:5777 -msgid "Fans check" -msgstr "Kontr. vent." - -# MSG_FSENSOR -#: messages.c:41 -msgid "Fil. sensor" -msgstr "Fil. senzor" - -# c=14 -#: ultralcd.cpp:1784 -msgid "Filam. runouts" -msgstr "Vypadky filam." - -# MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 -msgid "Filament extruding & with correct color?" -msgstr "Filament vytlacen a spravne barvy?" - -# MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 -msgid "Filament not loaded" -msgstr "Filament nezaveden" - -# MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 -msgid "Filament sensor" -msgstr "Senzor filamentu" - -# MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 -msgid "Filament used" -msgstr "Spotrebovano filam." - -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 -msgid "Print time" -msgstr "Cas tisku" - -# MSG_FS_ACTION c=10 -#: messages.c:131 -msgid "FS Action" -msgstr "FS reakce" - -# MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 -msgid "File incomplete. Continue anyway?" -msgstr "Soubor nekompletni. Pokracovat?" - -# MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 -msgid "Finishing movements" -msgstr "Dokoncovani pohybu" - -# MSG_V2_CALIBRATION c=18 -#: messages.c:103 -msgid "First layer cal." -msgstr "Kal. prvni vrstvy" - -# MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 -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:727 -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:7157 -msgid "Flow" -msgstr "Prutok" - -# MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 -msgid "forum.prusa3d.com" -msgstr "" - -# MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 -msgid "Front print fan?" -msgstr "Predni tiskovy vent?" - -# MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 -msgid "Front side[um]" -msgstr "Vpredu [um]" - -# MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 -msgid "Front/left fans" -msgstr "Predni/levy vent." - -# MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 -msgid "Heater/Thermistor" -msgstr "Topeni/Termistor" - -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 -msgid "Heating disabled by safety timer." -msgstr "Zahrivani preruseno bezpecnostnim casovacem." - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:43 -msgid "Heating done." -msgstr "Zahrivani OK." - -# MSG_HEATING -#: messages.c:42 -msgid "Heating" -msgstr "Zahrivani" - -# MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 -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:2158 -msgid "howto.prusa3d.com" -msgstr "" - -# MSG_FILAMENTCHANGE -#: messages.c:34 -msgid "Change filament" -msgstr "Vymenit filament" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 -msgid "Change success!" -msgstr "Zmena uspesna!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 -msgid "Changed correctly?" -msgstr "Vymena ok?" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 -msgid "Checking bed " -msgstr "Kontrola podlozky" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 -msgid "Checking endstops" -msgstr "Kontrola endstopu" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 -msgid "Checking hotend " -msgstr "Kontrola hotend " - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 -msgid "Checking sensors " -msgstr "Kontrola senzoru" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 -msgid "Checking X axis " -msgstr "Kontrola osy X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 -msgid "Checking Y axis " -msgstr "Kontrola osy Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 -msgid "Checking Z axis " -msgstr "Kontrola osy Z" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 -msgid "Choose extruder:" -msgstr "Vyberte extruder:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 -msgid "Choose filament:" -msgstr "Vyber filament:" - -# MSG_FILAMENT c=17 r=1 -#: messages.c:27 -msgid "Filament" -msgstr "" - -# MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 -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:5059 -msgid "I will run z calibration now." -msgstr "Nyni provedu z kalibraci." - -# MSG_WATCH -#: messages.c:97 -msgid "Info screen" -msgstr "Informace" - -# MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 -msgid "Insert filament" -msgstr "Vlozte filament" - -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 -msgid "Is filament loaded?" -msgstr "Je filament zaveden?" - -# MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 -msgid "Is steel sheet on heatbed?" -msgstr "Je tiskovy plat na podlozce?" - -# -#: ultralcd.cpp:1727 -msgid "Last print failures" -msgstr "Selhani posl. tisku" - -# -#: ultralcd.cpp:5129 -msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -msgstr "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" - -# -#: ultralcd.cpp:1704 -msgid "Last print" -msgstr "Posledni tisk" - -# MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 -msgid "Left hotend fan?" -msgstr "Levy vent na trysce?" - -# -#: ultralcd.cpp:2991 -msgid "Left" -msgstr "Vlevo" - -# MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 -msgid "Left side [um]" -msgstr "Vlevo [um]" - -# -#: ultralcd.cpp:5792 -msgid "Lin. correction" -msgstr "Korekce lin." - -# MSG_BABYSTEP_Z -#: messages.c:12 -msgid "Live adjust Z" -msgstr "Doladeni osy Z" - -# c=20 r=6 -#: ultralcd.cpp:7559 -msgid "Insert the filament (do not load it) into the extruder and then press the knob." -msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" - -# MSG_LOAD_FILAMENT c=17 -#: messages.c:47 -msgid "Load filament" -msgstr "Zavest filament" - -# MSG_LOADING_COLOR -#: ultralcd.cpp:2643 -msgid "Loading color" -msgstr "Cisteni barvy" - -# MSG_LOADING_FILAMENT c=20 -#: messages.c:48 -msgid "Loading filament" -msgstr "Zavadeni filamentu" - -# MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 -msgid "Loose pulley" -msgstr "Uvolnena remenicka" - -# -#: ultralcd.cpp:6976 -msgid "Load to nozzle" -msgstr "Zavest do trysky" - -# MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 -msgid "M117 First layer cal." -msgstr "M117 Kal. prvni vrstvy" - -# MSG_MAIN -#: messages.c:52 -msgid "Main" -msgstr "Hlavni nabidka" - -# MSG_BL_HIGH c=12 -#: messages.c:135 -msgid "Level Bright" -msgstr "" - -# MSG_BL_LOW c=12 -#: messages.c:136 -msgid "Level Dimmed" -msgstr "" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 -msgid "Measuring reference height of calibration point" -msgstr "Merim referencni vysku kalibracniho bodu" - -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 -msgid "Mesh Bed Leveling" -msgstr "" - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Pokracuji v tisku..." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Pokracuji v nahrivani..." - -# -#: ultralcd.cpp:3032 -msgid "Measured skew" -msgstr "Merene zkoseni" - -# -#: ultralcd.cpp:1728 -msgid "MMU fails" -msgstr "Selhani MMU" - -# -#: mmu.cpp:1588 -msgid "MMU load failed " -msgstr "Zavedeni MMU selhalo" - -# -#: ultralcd.cpp:1729 -msgid "MMU load fails" -msgstr "MMU selhani zavadeni" - -# MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 -msgid "MMU OK. Resuming..." -msgstr "MMU OK. Pokracuji..." - -# MSG_MODE -#: messages.c:84 -msgid "Mode" -msgstr "Mod" - -# c=20 r=3 -#: Marlin_main.cpp:884 -msgid "MK3 firmware detected on MK3S printer" -msgstr "" - -# MSG_NORMAL -#: messages.c:88 -msgid "Normal" -msgstr "" - -# MSG_SILENT -#: messages.c:87 -msgid "Silent" -msgstr "Tichy" - -# -#: mmu.cpp:722 -msgid "MMU needs user attention." -msgstr "MMU potrebuje zasah uzivatele." - -# -#: ultralcd.cpp:1755 -msgid "MMU power fails" -msgstr "MMU vypadky proudu" - -# MSG_STEALTH -#: messages.c:89 -msgid "Stealth" -msgstr "Tichy" - -# MSG_AUTO_POWER -#: messages.c:86 -msgid "Auto power" -msgstr "Automaticky" - -# MSG_HIGH_POWER -#: messages.c:85 -msgid "High power" -msgstr "Vys. vykon" - -# -#: ultralcd.cpp:2176 -msgid "MMU2 connected" -msgstr "MMU2 pripojeno" - -# MSG_SELFTEST_MOTOR -#: messages.c:79 -msgid "Motor" -msgstr "" - -# MSG_MOVE_AXIS -#: ultralcd.cpp:5767 -msgid "Move axis" -msgstr "Posunout osu" - -# MSG_MOVE_X -#: ultralcd.cpp:4357 -msgid "Move X" -msgstr "Posunout X" - -# MSG_MOVE_Y -#: ultralcd.cpp:4358 -msgid "Move Y" -msgstr "Posunout Y" - -# MSG_MOVE_Z -#: ultralcd.cpp:4359 -msgid "Move Z" -msgstr "Posunout Z" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5555 -msgid "No move." -msgstr "Bez pohybu." - -# MSG_NO_CARD -#: ultralcd.cpp:6943 -msgid "No SD card" -msgstr "Zadna SD karta" - -# MSG_NA -#: messages.c:107 -msgid "N/A" -msgstr "" - -# MSG_NO -#: messages.c:58 -msgid "No" -msgstr "Ne" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 -msgid "Not connected" -msgstr "Nezapojeno " - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Vysla nova verze firmware:" - -# MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 -msgid "Not spinning" -msgstr "Netoci se" - -# MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 -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:5067 -msgid "Now I will preheat nozzle for PLA." -msgstr "Nyni predehreji trysku pro PLA." - -# MSG_NOZZLE -#: messages.c:59 -msgid "Nozzle" -msgstr "Tryska" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 -msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." - -# -#: ultralcd.cpp:5058 -msgid "Now remove the test print from steel sheet." -msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." - -# -#: ultralcd.cpp:1654 -msgid "Nozzle FAN" -msgstr "Vent. trysky" - -# MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 -msgid "Pause print" -msgstr "Pozastavit tisk" - -# MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 -msgid "PID cal. " -msgstr "PID kal. " - -# MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 -msgid "PID cal. finished" -msgstr "PID kal. ukoncena" - -# MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 -msgid "PID calibration" -msgstr "PID kalibrace" - -# MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 -msgid "PINDA Heating" -msgstr "Nahrivani PINDA" - -# MSG_PAPER c=20 r=10 -#: messages.c:60 -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:5124 -msgid "Please clean heatbed and then press the knob." -msgstr "Prosim ocistete podlozku a stisknete tlacitko." - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 -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:8303 -msgid "Please check :" -msgstr "Zkontrolujte :" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 -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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 -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 -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 -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 -msgid "Please pull out filament immediately" -msgstr "Prosim vyjmete urychlene filament" - -# MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 -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 -msgid "Please remove steel sheet from heatbed." -msgstr "Odstrante prosim tiskovy plat z podlozky." - -# MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4601 -msgid "Please run XYZ calibration first." -msgstr "Nejprve spustte kalibraci XYZ." - -# MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 -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 -msgid "Please wait" -msgstr "Prosim cekejte" - -# -#: ultralcd.cpp:5057 -msgid "Please remove shipping helpers first." -msgstr "Nejprve prosim sundejte transportni soucastky." - -# MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 -msgid "Preheat the nozzle!" -msgstr "Predehrejte trysku!" - -# MSG_PREHEAT -#: ultralcd.cpp:6885 -msgid "Preheat" -msgstr "Predehrev" - -# MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 -msgid "Preheating nozzle. Please wait." -msgstr "Predehrev trysky. Prosim cekejte." - -# c=14 -#: ultralcd.cpp:1959 -msgid "PINDA" -msgstr "" - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Prosim aktualizujte." - -# MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 -msgid "Press knob to preheat nozzle and continue." -msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." - -# MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 -msgid "Pause" -msgstr "" - -# -#: ultralcd.cpp:1783 -msgid "Power failures" -msgstr "Vypadky proudu" - -# MSG_PRINT_ABORTED c=20 -#: messages.c:65 -msgid "Print aborted" -msgstr "Tisk prerusen" - -# c=20 -#: ultralcd.cpp:2433 -msgid "Preheating to load" -msgstr "Predehrev k zavedeni" - -# c=20 -#: ultralcd.cpp:2437 -msgid "Preheating to unload" -msgstr "Predehrev k vyjmuti" - -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 -msgid "Print fan:" -msgstr "Tiskovy vent.:" - -# MSG_CARD_MENU -#: messages.c:20 -msgid "Print from SD" -msgstr "Tisk z SD" - -# -#: ultralcd.cpp:2280 -msgid "Press the knob" -msgstr "Stisknete hl. tlacitko" - -# MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 -msgid "Print paused" -msgstr "Tisk pozastaven" - -# -#: mmu.cpp:726 -msgid "Press the knob to resume nozzle temperature." -msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." - -# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 -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." - -# -#: ultralcd.cpp:1655 -msgid "Print FAN" -msgstr "Tiskovy vent." - -# -#: ultralcd.cpp:4922 -msgid "Please insert filament into the extruder, then press the knob to load it." -msgstr "Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" - -# -#: ultralcd.cpp:4917 -msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." -msgstr "Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" - -# -#: ultralcd.cpp:4839 -msgid "Please load filament first." -msgstr "Prosim nejdriv zavedte filament" - -# MSG_PRUSA3D -#: ultralcd.cpp:2156 -msgid "prusa3d.com" -msgstr "" - -# MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 -msgid "Rear side [um]" -msgstr "Vzadu [um]" - -# c=20 r=4 -#: ultralcd.cpp:7583 -msgid "Please unload the filament first, then repeat this action." -msgstr "Prosim vyjmete filament a zopakujte tuto akci" - -# c=20 r=4 -#: ultralcd.cpp:7586 -msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" - -# MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 -msgid "Recovering print " -msgstr "Obnovovani tisku " - -# MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 -msgid "Remove old filament and press the knob to start loading new filament." -msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." - -# c=20 -#: -msgid "Prusa i3 MK3S OK." -msgstr "" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 -msgid "Reset XYZ calibr." -msgstr "Reset XYZ kalibr." - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 -msgid "Reset" -msgstr "" - -# MSG_RESUME_PRINT -#: ultralcd.cpp:6893 -msgid "Resume print" -msgstr "Pokracovat" - -# MSG_RESUMING_PRINT c=20 -#: messages.c:69 -msgid "Resuming print" -msgstr "Obnoveni tisku" - -# MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 -msgid "Right side[um]" -msgstr "Vpravo [um]" - -# MSG_RPI_PORT -#: messages.c:123 -msgid "RPi port" -msgstr "" - -# MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 -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_SD_CARD -#: messages.c:118 -msgid "SD card" -msgstr "" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 -msgid "FlashAir" -msgstr "" - -# -#: ultralcd.cpp:2992 -msgid "Right" -msgstr "Vpravo" - -# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 -msgid "Searching bed calibration point" -msgstr "Hledam kalibracni bod podlozky" - -# MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 -msgid "Select language" -msgstr "Vyber jazyka" - -# MSG_SELFTEST_OK -#: ultralcd.cpp:7858 -msgid "Self test OK" -msgstr "" - -# MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 -msgid "Self test start " -msgstr "Self test start " - -# MSG_SELFTEST -#: ultralcd.cpp:5871 -msgid "Selftest " -msgstr "Selftest " - -# MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 -msgid "Selftest error !" -msgstr "Chyba Selftestu!" - -# MSG_SELFTEST_FAILED c=20 -#: messages.c:73 -msgid "Selftest failed " -msgstr "Selftest selhal " - -# MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 -msgid "Selftest will be run to calibrate accurate sensorless rehoming." -msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." - -# -#: ultralcd.cpp:5098 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." - -# MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 -msgid "Set temperature:" -msgstr "Nastavte teplotu:" - -# c=20 -#: -msgid "Prusa i3 MK2.5 OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK2.5S OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK3 OK." -msgstr "" - -# MSG_SETTINGS -#: messages.c:82 -msgid "Settings" -msgstr "Nastaveni" - -# MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 -msgid "Show end stops" -msgstr "Stav konc. spin." - -# -#: ultralcd.cpp:4004 -msgid "Sensor state" -msgstr "Stav senzoru" - -# MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 -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 -#: messages.c:120 -msgid "Sort" -msgstr "Trideni" - -# MSG_NONE -#: messages.c:110 -msgid "None" -msgstr "Zadne" - -# MSG_SORT_TIME -#: messages.c:121 -msgid "Time" -msgstr "Cas" - -# -#: ultralcd.cpp:3035 -msgid "Severe skew:" -msgstr "Tezke zkoseni:" - -# MSG_SORT_ALPHA -#: messages.c:122 -msgid "Alphabet" -msgstr "Abeceda" - -# MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 -msgid "Sorting files" -msgstr "Trideni souboru" - -# MSG_SOUND_LOUD -#: messages.c:125 -msgid "Loud" -msgstr "Hlasity" - -# -#: ultralcd.cpp:3034 -msgid "Slight skew:" -msgstr "Lehke zkoseni:" - -# MSG_SOUND -#: messages.c:124 -msgid "Sound" -msgstr "Zvuk" - -# c=7 -#: ultralcd.cpp:1822 -msgid "Runouts" -msgstr "" - -# -#: Marlin_main.cpp:5115 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Vyskytl se problem, srovnavam osu Z ..." - -# MSG_SOUND_ONCE -#: messages.c:126 -msgid "Once" -msgstr "Jednou" - -# MSG_SPEED -#: ultralcd.cpp:7151 -msgid "Speed" -msgstr "Rychlost" - -# MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 -msgid "Spinning" -msgstr "Toci se" - -# MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 -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:7010 -msgid "Statistics " -msgstr "Statistika " - -# MSG_STOP_PRINT -#: messages.c:91 -msgid "Stop print" -msgstr "Zastavit tisk" - -# MSG_STOPPED -#: messages.c:92 -msgid "STOPPED. " -msgstr "ZASTAVENO." - -# MSG_SUPPORT -#: ultralcd.cpp:7019 -msgid "Support" -msgstr "Podpora" - -# MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 -msgid "Swapped" -msgstr "Prohozene" - -# -#: ultralcd.cpp:4810 -msgid "Select filament:" -msgstr "Zvolte filament:" - -# MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 -msgid "Temp. cal." -msgstr "Tepl. kal." - -# -#: ultralcd.cpp:4951 -msgid "Select temperature which matches your material." -msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." - -# MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 -msgid "Temp. calibration" -msgstr "Teplot. kalibrace" - -# MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 -msgid "Temperature calibration failed" -msgstr "Teplotni kalibrace selhala" - -# MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 -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." - -# c=20 r=3 -#: ultralcd.cpp:7590 -msgid "Sensor verified, remove the filament now." -msgstr "Senzor overen, vyjmete filament." - -# MSG_TEMPERATURE -#: ultralcd.cpp:5765 -msgid "Temperature" -msgstr "Teplota" - -# MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 -msgid "Temperatures" -msgstr "Teploty" - -# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 -msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." - -# -#: ultralcd.cpp:2889 -msgid "Total filament" -msgstr "Filament celkem" - -# -#: ultralcd.cpp:2890 -msgid "Total print time" -msgstr "Celkovy cas tisku" - -# MSG_TUNE -#: ultralcd.cpp:6882 -msgid "Tune" -msgstr "Ladit" - -# -#: -msgid "Unload" -msgstr "Vysunout" - -# -#: ultralcd.cpp:1752 -msgid "Total failures" -msgstr "Celkem selhani" - -# -#: ultralcd.cpp:2287 -msgid "to load filament" -msgstr "k zavedeni filamentu" - -# -#: ultralcd.cpp:2291 -msgid "to unload filament" -msgstr "k vyjmuti filamentu" - -# MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 -msgid "Unload filament" -msgstr "Vyjmout filament" - -# MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 -msgid "Unloading filament" -msgstr "Vysouvam filament" - -# -#: ultralcd.cpp:1705 -msgid "Total" -msgstr "Celkem" - -# MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 -msgid "Used during print" -msgstr "Pouzite behem tisku" - -# MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 -msgid "Voltages" -msgstr "Napeti" - -# -#: ultralcd.cpp:2184 -msgid "unknown" -msgstr "neznamy" - -# MSG_USERWAIT -#: Marlin_main.cpp:5525 -msgid "Wait for user..." -msgstr "Ceka se na uzivatele..." - -# MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 -msgid "Waiting for nozzle and bed cooling" -msgstr "Cekani na zchladnuti trysky a podlozky." - -# MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 -msgid "Waiting for PINDA probe cooling" -msgstr "Cekani na zchladnuti PINDA" - -# -#: -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:1525 -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:1517 -msgid "Warning: motherboard type changed." -msgstr "Varovani: doslo ke zmene typu motherboardu." - -# MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 -msgid "Warning: printer type changed." -msgstr "Varovani: doslo ke zmene typu tiskarny." - -# MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 -msgid "Was filament unload successful?" -msgstr "Bylo vysunuti filamentu uspesne?" - -# MSG_SELFTEST_WIRINGERROR -#: messages.c:81 -msgid "Wiring error" -msgstr "Chyba zapojeni" - -# MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 -msgid "Wizard" -msgstr "Pruvodce" - -# MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 -msgid "XYZ cal. details" -msgstr "Detaily XYZ kal." - -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:18 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." - -# MSG_YES -#: messages.c:102 -msgid "Yes" -msgstr "Ano" - -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 -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:3902 -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:3899 -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_TIMEOUT c=12 -#: messages.c:137 -msgid "Timeout" -msgstr "" - -# MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 -msgid "X-correct:" -msgstr "Korekce X:" - -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 -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:3880 -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:3883 -msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 -msgid "Load all" -msgstr "Zavest vse" - -# -#: ultralcd.cpp:3862 -msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." - -# -#: ultralcd.cpp:3868 -msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." - -# -#: ultralcd.cpp:3871 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." - -# -#: ultralcd.cpp:2989 -msgid "Y distance from min" -msgstr "Y vzdalenost od min" - -# -#: ultralcd.cpp:4954 -msgid "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)." -msgstr "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." - -# c=20 r=5 -#: ultralcd.cpp:7594 -msgid "Verification failed, remove the filament and try again." -msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." - -# MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 -msgid "Y-correct:" -msgstr "Korekce Y:" - -# MSG_OFF -#: messages.c:105 -msgid "Off" -msgstr "Vyp" - -# MSG_ON -#: messages.c:106 -msgid "On" -msgstr "Zap" - -# -#: messages.c:53 -msgid "Back" -msgstr "Zpet" - -# -#: ultralcd.cpp:5742 -msgid "Checks" -msgstr "Kontrola" - -# -#: ultralcd.cpp:8395 -msgid "False triggering" -msgstr "Falesne spusteni" - -# -#: ultralcd.cpp:4009 -msgid "FINDA:" -msgstr "" - -# MSG_FIRMWARE -#: language.h:23 -msgid "Firmware" -msgstr "" - -# MSG_STRICT -#: messages.c:112 -msgid "Strict" -msgstr "Prisne" - -# MSG_WARN -#: messages.c:111 -msgid "Warn" -msgstr "Varovat" - -# -#: messages.c:83 -msgid "HW Setup" -msgstr "HW nastaveni" - -# -#: ultralcd.cpp:4013 -msgid "IR:" -msgstr "" - -# MSG_MAGNETS_COMP -#: messages.c:130 -msgid "Magnets comp." -msgstr "Komp. magnetu" - -# MSG_MESH -#: messages.c:128 -msgid "Mesh" -msgstr "" - -# -#: ultralcd.cpp:5789 -msgid "Mesh bed leveling" -msgstr "Mesh Bed Leveling" - -# -#: Marlin_main.cpp:877 -msgid "MK3S firmware detected on MK3 printer" -msgstr "MK3S firmware detekovan na tiskarne MK3" - -# MSG_MMU_MODE -#: messages.c:117 -msgid "MMU Mode" -msgstr "MMU mod" - -# -#: ultralcd.cpp:4490 -msgid "Mode change in progress ..." -msgstr "Probiha zmena modu..." - -# MSG_MODEL -#: messages.c:113 -msgid "Model" -msgstr "" - -# MSG_NOZZLE_DIAMETER -#: messages.c:116 -msgid "Nozzle d." -msgstr "Tryska" - -# -#: util.cpp:514 -msgid "G-code sliced for a different level. Continue?" -msgstr "" - -# -#: util.cpp:520 -msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." -msgstr "" - -# -#: util.cpp:431 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" - -# -#: util.cpp:437 -msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -msgstr "G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." - -# -#: util.cpp:481 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code je pripraven pro novejsi firmware. Pokracovat?" - -# -#: util.cpp:487 -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." - -# -#: ultralcd.cpp:4005 -msgid "PINDA:" -msgstr "" - -# c=20 -#: ultralcd.cpp:2443 -msgid "Preheating to cut" -msgstr "Predehrev ke strihu" - -# c=20 -#: ultralcd.cpp:2440 -msgid "Preheating to eject" -msgstr "Predehrev k vysunuti" - -# -#: util.cpp:394 -msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" - -# -#: util.cpp:401 -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." - -# c=20 -#: ultralcd.cpp:8401 -msgid "%s level expected" -msgstr "" - -# -#: ultralcd.cpp:6846 -msgid "Rename" -msgstr "Prejmenovat" - -# -#: ultralcd.cpp:6839 -msgid "Select" -msgstr "Vybrat" - -# -#: ultralcd.cpp:2202 -msgid "Sensor info" -msgstr "Senzor info" - -# MSG_SHEET c=10 -#: messages.c:54 -msgid "Sheet" -msgstr "Plat" - -# MSG_SOUND_BLIND -#: messages.c:127 -msgid "Assist" -msgstr "Asist." - -# c=18 -#: ultralcd.cpp:5740 -msgid "Steel sheets" -msgstr "Tiskove platy" - -# MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 -msgid "Z-correct:" -msgstr "Korekce Z:" - -# MSG_Z_PROBE_NR -#: messages.c:129 -msgid "Z-probe nr." -msgstr "Pocet mereni Z" - +# Translation of Prusa-Firmware into Czech. +# +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Di 26. Jan 11:03:57 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:03:57 CET 2021\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +# +#: +msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +msgstr "[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset" + +# MSG_IR_03_OR_OLDER c=18 +#: messages.c:164 +msgid " 0.3 or older" +msgstr " 0.3 nebo starsi" + +# c=18 +#: Marlin_main.cpp:9626 +msgid "FS v0.3 or older" +msgstr "FS 0.3 nebo starsi" + +# MSG_IR_04_OR_NEWER c=18 +#: messages.c:163 +msgid " 0.4 or newer" +msgstr " 0.4 nebo novejsi" + +# c=18 +#: Marlin_main.cpp:9625 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 a novejsi" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:165 +msgid "unknown state" +msgstr "neznamy stav" + +# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 +#: messages.c:43 +msgid " of 4" +msgstr " z 4" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 +#: messages.c:66 +msgid " of 9" +msgstr " z 9" + +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:2988 +msgid "[0;0] point offset" +msgstr "[0;0] odsazeni bodu" + +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +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 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu" + +# +#: ultralcd.cpp:2410 +msgid ">Cancel" +msgstr ">Zrusit" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3108 +msgid "Adjusting Z:" +msgstr "Doladeni Z:" + +# MSG_SELFTEST_CHECK_ALLCORRECT c=20 +#: ultralcd.cpp:8390 +msgid "All correct " +msgstr "Vse OK " + +# MSG_WIZARD_DONE c=20 r=8 +#: messages.c:116 +msgid "All is done. Happy printing!" +msgstr "Vse je hotovo." + +# +#: ultralcd.cpp:1902 +msgid "Ambient" +msgstr "Okoli" + +# MSG_AUTO c=6 +#: messages.c:160 +msgid "Auto" +msgstr "" + +# MSG_PRESS c=20 r=2 +#: ultralcd.cpp:2567 +msgid "and press the knob" +msgstr "a stisknete tlacitko" + +# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#: ultralcd.cpp:3429 +msgid "Are left and right Z~carriages all up?" +msgstr "Dojely oba Z voziky k~hornimu dorazu?" + +# MSG_AUTO_DEPLETE c=17 r=1 +#: messages.c:125 +msgid "SpoolJoin" +msgstr "" + +# MSG_AUTO_HOME +#: messages.c:11 +msgid "Auto home" +msgstr "" + +# MSG_AUTOLOAD_FILAMENT c=18 +#: ultralcd.cpp:6716 +msgid "AutoLoad filament" +msgstr "AutoZavedeni fil." + +# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +#: ultralcd.cpp:4346 +msgid "Autoloading filament available only when filament sensor is turned on..." +msgstr "Automaticke zavadeni filamentu je mozne pouze pri zapnutem filament senzoru..." + +# MSG_AUTOLOADING_ENABLED c=20 r=4 +#: ultralcd.cpp:2730 +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:8073 +msgid "Axis length" +msgstr "Delka osy" + +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:8074 +msgid "Axis" +msgstr "Osa" + +# MSG_SELFTEST_BEDHEATER +#: ultralcd.cpp:8031 +msgid "Bed / Heater" +msgstr "Podlozka / Topeni" + +# MSG_BED_DONE +#: messages.c:15 +msgid "Bed done" +msgstr "Bed OK." + +# MSG_BED_HEATING +#: messages.c:16 +msgid "Bed Heating" +msgstr "Zahrivani bedu" + +# MSG_BED_CORRECTION_MENU +#: ultralcd.cpp:5802 +msgid "Bed level correct" +msgstr "Korekce podlozky" + +# MSG_BELTTEST c=17 +#: ultralcd.cpp:5782 +msgid "Belt test " +msgstr "Test remenu " + +# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 +#: messages.c:17 +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_BRIGHT c=6 +#: messages.c:158 +msgid "Bright" +msgstr "Jasny" + +# MSG_BRIGHTNESS c=18 +#: messages.c:154 +msgid "Brightness" +msgstr "Podsviceni" + +# MSG_BED +#: messages.c:14 +msgid "Bed" +msgstr "Podlozka" + +# MSG_BELT_STATUS c=18 +#: +msgid "Belt status" +msgstr "Stav remenu" + +# MSG_RECOVER_PRINT c=20 r=2 +#: messages.c:80 +msgid "Blackout occurred. Recover print?" +msgstr "Detekovan vypadek proudu.Obnovit tisk?" + +# +#: ultralcd.cpp:8392 +msgid "Calibrating home" +msgstr "Kalibruji vychozi poz." + +# MSG_CALIBRATE_BED +#: ultralcd.cpp:5791 +msgid "Calibrate XYZ" +msgstr "Kalibrace XYZ" + +# MSG_HOMEYZ +#: messages.c:51 +msgid "Calibrate Z" +msgstr "Kalibrovat Z" + +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4538 +msgid "Calibrate" +msgstr "Zkalibrovat" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 +#: ultralcd.cpp:3392 +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." + +# MSG_CALIBRATE_Z_AUTO c=20 r=2 +#: messages.c:20 +msgid "Calibrating Z" +msgstr "Kalibruji Z" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 +#: ultralcd.cpp:3392 +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:813 +msgid "Calibration done" +msgstr "Kalibrace OK" + +# MSG_MENU_CALIBRATION +#: messages.c:67 +msgid "Calibration" +msgstr "Kalibrace" + +# +#: ultralcd.cpp:4716 +msgid "Cancel" +msgstr "Zrusit" + +# MSG_SD_REMOVED +#: ultralcd.cpp:8842 +msgid "Card removed" +msgstr "Karta vyjmuta" + +# MSG_NOT_COLOR +#: ultralcd.cpp:2647 +msgid "Color not correct" +msgstr "Barva neni cista" + +# MSG_COOLDOWN +#: messages.c:25 +msgid "Cooldown" +msgstr "Zchladit" + +# +#: ultralcd.cpp:4471 +msgid "Copy selected language?" +msgstr "Kopirovat vybrany jazyk?" + +# MSG_CRASHDETECT c=13 +#: messages.c:28 +msgid "Crash det." +msgstr "" + +# +#: ultralcd.cpp:4851 +msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." +msgstr "Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu" + +# MSG_CRASH_DETECTED c=20 r=1 +#: messages.c:27 +msgid "Crash detected." +msgstr "Detekovan naraz." + +# +#: Marlin_main.cpp:657 +msgid "Crash detected. Resume print?" +msgstr "Detekovan naraz. Obnovit tisk?" + +# MSG_CRASH c=7 +#: messages.c:26 +msgid "Crash" +msgstr "Naraz" + +# MSG_CURRENT c=19 r=1 +#: ultralcd.cpp:5933 +msgid "Current" +msgstr "Pouze aktualni" + +# MSG_DATE c=17 r=1 +#: ultralcd.cpp:2112 +msgid "Date:" +msgstr "Datum:" + +# MSG_DISABLE_STEPPERS +#: ultralcd.cpp:5683 +msgid "Disable steppers" +msgstr "Vypnout motory" + +# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 +#: messages.c:13 +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 "Neni zkalibrovana vzdalenost trysky od tiskove podlozky. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Nastaveni prvni vrstvy." + +# MSG_FS_CONTINUE c=5 +#: messages.c:152 +msgid "Cont." +msgstr "Pokr." + +# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 +#: ultralcd.cpp:5026 +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=13 +#: ultralcd.cpp:5095 +msgid "E-correct:" +msgstr "Korekce E:" + +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 +msgid "Eject filament" +msgstr "Vysunout fil." + +# MSG_EJECTING_FILAMENT c=20 r=1 +#: mmu.cpp:1414 +msgid "Ejecting filament" +msgstr "Vysouvam filament" + +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 +#: ultralcd.cpp:8049 +msgid "Endstop not hit" +msgstr "Kon. spinac nesepnut" + +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:8044 +msgid "Endstop" +msgstr "Koncovy spinac" + +# MSG_SELFTEST_ENDSTOPS +#: ultralcd.cpp:8035 +msgid "Endstops" +msgstr "Konc. spinace" + +# MSG_STACK_ERROR c=20 r=4 +#: ultralcd.cpp:6753 +msgid "Error - static memory has been overwritten" +msgstr "Chyba - Doslo k prepisu staticke pameti!" + +# MSG_CUT_FILAMENT c=16 +#: messages.c:59 +msgid "Cut filament" +msgstr "Ustrihnout" + +# MSG_CUTTER c=9 +#: messages.c:126 +msgid "Cutter" +msgstr "Strihani" + +# c=18 +#: mmu.cpp:1386 +msgid "Cutting filament" +msgstr "Strihani filamentu" + +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4359 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "CHYBA: Filament senzor nereaguje, zkontrolujte prosim zapojeni." + +# MSG_DIM c=6 +#: messages.c:159 +msgid "Dim" +msgstr "Temny" + +# MSG_ERROR +#: messages.c:29 +msgid "ERROR:" +msgstr "CHYBA:" + +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8398 +msgid "Extruder fan:" +msgstr "Levy vent.:" + +# MSG_INFO_EXTRUDER c=18 +#: ultralcd.cpp:2153 +msgid "Extruder info" +msgstr "" + +# MSG_EXTRUDER c=17 +#: messages.c:30 +msgid "Extruder" +msgstr "" + +# +#: ultralcd.cpp:6740 +msgid "Fail stats MMU" +msgstr "Selhani MMU" + +# MSG_FSENSOR_AUTOLOAD c=13 +#: messages.c:47 +msgid "F. autoload" +msgstr "F. autozav." + +# +#: ultralcd.cpp:6737 +msgid "Fail stats" +msgstr "Selhani" + +# MSG_FAN_SPEED c=14 +#: messages.c:34 +msgid "Fan speed" +msgstr "Rychlost vent." + +# MSG_SELFTEST_FAN c=20 +#: messages.c:89 +msgid "Fan test" +msgstr "Test ventilatoru" + +# MSG_FANS_CHECK c=13 +#: messages.c:31 +msgid "Fans check" +msgstr "Kontr. vent." + +# MSG_FSENSOR +#: messages.c:48 +msgid "Fil. sensor" +msgstr "Fil. senzor" + +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Vypadky filam." + +# MSG_FILAMENT_CLEAN c=20 r=2 +#: messages.c:35 +msgid "Filament extruding & with correct color?" +msgstr "Filament vytlacen a spravne barvy?" + +# MSG_NOT_LOADED c=19 +#: ultralcd.cpp:2646 +msgid "Filament not loaded" +msgstr "Filament nezaveden" + +# MSG_FILAMENT_SENSOR c=20 +#: messages.c:95 +msgid "Filament sensor" +msgstr "Senzor filamentu" + +# MSG_FILAMENT_USED c=19 +#: ultralcd.cpp:2795 +msgid "Filament used" +msgstr "Spotrebovano filam." + +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2796 +msgid "Print time" +msgstr "Cas tisku" + +# MSG_FS_ACTION c=10 +#: messages.c:151 +msgid "FS Action" +msgstr "FS reakce" + +# MSG_FILE_INCOMPLETE c=20 r=3 +#: ultralcd.cpp:8540 +msgid "File incomplete. Continue anyway?" +msgstr "Soubor nekompletni. Pokracovat?" + +# MSG_FINISHING_MOVEMENTS c=20 +#: messages.c:44 +msgid "Finishing movements" +msgstr "Dokoncovani pohybu" + +# MSG_V2_CALIBRATION c=18 +#: messages.c:120 +msgid "First layer cal." +msgstr "Kal. prvni vrstvy" + +# MSG_WIZARD_SELFTEST c=20 r=8 +#: ultralcd.cpp:4947 +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:726 +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:6880 +msgid "Flow" +msgstr "Prutok" + +# MSG_PRUSA3D_FORUM +#: ultralcd.cpp:2105 +msgid "forum.prusa3d.com" +msgstr "" + +# MSG_SELFTEST_COOLING_FAN c=20 +#: messages.c:86 +msgid "Front print fan?" +msgstr "Predni tiskovy vent?" + +# MSG_BED_CORRECTION_FRONT c=14 r=1 +#: ultralcd.cpp:3190 +msgid "Front side[um]" +msgstr "Vpredu [um]" + +# MSG_SELFTEST_FANS +#: ultralcd.cpp:8079 +msgid "Front/left fans" +msgstr "Predni/levy vent." + +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:8027 +msgid "Heater/Thermistor" +msgstr "Topeni/Termistor" + +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:9616 +msgid "Heating disabled by safety timer." +msgstr "Zahrivani preruseno bezpecnostnim casovacem." + +# MSG_HEATING_COMPLETE c=20 +#: messages.c:50 +msgid "Heating done." +msgstr "Zahrivani OK." + +# MSG_HEATING +#: messages.c:49 +msgid "Heating" +msgstr "Zahrivani" + +# MSG_WIZARD_WELCOME c=20 r=7 +#: ultralcd.cpp:4926 +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:2106 +msgid "howto.prusa3d.com" +msgstr "" + +# MSG_FILAMENTCHANGE +#: messages.c:41 +msgid "Change filament" +msgstr "Vymenit filament" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2576 +msgid "Change success!" +msgstr "Zmena uspesna!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2644 +msgid "Changed correctly?" +msgstr "Vymena ok?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:92 +msgid "Checking bed " +msgstr "Kontrola podlozky" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8381 +msgid "Checking endstops" +msgstr "Kontrola endstopu" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8387 +msgid "Checking hotend " +msgstr "Kontrola hotend " + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:93 +msgid "Checking sensors " +msgstr "Kontrola senzoru" + +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Kontrola osy X" + +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Kontrola osy Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: +msgid "Checking Z axis" +msgstr "Kontrola osy Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:52 +msgid "Choose extruder:" +msgstr "Vyberte extruder:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:53 +msgid "Choose filament:" +msgstr "Vyber filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:33 +msgid "Filament" +msgstr "" + +# MSG_WIZARD_XYZ_CAL c=20 r=8 +#: ultralcd.cpp:4956 +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:4964 +msgid "I will run z calibration now." +msgstr "Nyni provedu z kalibraci." + +# MSG_WATCH +#: messages.c:114 +msgid "Info screen" +msgstr "Informace" + +# MSG_INSERT_FILAMENT c=20 +#: ultralcd.cpp:2564 +msgid "Insert filament" +msgstr "Vlozte filament" + +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 +msgid "Is filament loaded?" +msgstr "Je filament zaveden?" + +# MSG_STEEL_SHEET_CHECK c=20 r=2 +#: messages.c:107 +msgid "Is steel sheet on heatbed?" +msgstr "Je tiskovy plat na podlozce?" + +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 +msgid "Last print failures" +msgstr "Selhani posl. tisku" + +# +#: ultralcd.cpp:5034 +msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +msgstr "Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy" + +# MSG_LAST_PRINT c=18 +#: messages.c:54 +msgid "Last print" +msgstr "Posledni tisk" + +# MSG_SELFTEST_EXTRUDER_FAN c=20 +#: messages.c:87 +msgid "Left hotend fan?" +msgstr "Levy vent na trysce?" + +# +#: ultralcd.cpp:2919 +msgid "Left" +msgstr "Vlevo" + +# MSG_BED_CORRECTION_LEFT c=14 r=1 +#: ultralcd.cpp:3188 +msgid "Left side [um]" +msgstr "Vlevo [um]" + +# +#: ultralcd.cpp:5706 +msgid "Lin. correction" +msgstr "Korekce lin." + +# MSG_BABYSTEP_Z +#: messages.c:12 +msgid "Live adjust Z" +msgstr "Doladeni osy Z" + +# c=20 r=6 +#: ultralcd.cpp:7280 +msgid "Insert the filament (do not load it) into the extruder and then press the knob." +msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" + +# MSG_LOAD_FILAMENT c=17 +#: messages.c:56 +msgid "Load filament" +msgstr "Zavest filament" + +# MSG_LOADING_COLOR +#: ultralcd.cpp:2598 +msgid "Loading color" +msgstr "Cisteni barvy" + +# MSG_LOADING_FILAMENT c=20 +#: messages.c:57 +msgid "Loading filament" +msgstr "Zavadeni filamentu" + +# MSG_LOOSE_PULLEY c=20 r=1 +#: ultralcd.cpp:8067 +msgid "Loose pulley" +msgstr "Uvolnena remenicka" + +# +#: ultralcd.cpp:6699 +msgid "Load to nozzle" +msgstr "Zavest do trysky" + +# MSG_M117_V2_CALIBRATION c=25 +#: messages.c:60 +msgid "M117 First layer cal." +msgstr "M117 Kal. prvni vrstvy" + +# MSG_MAIN +#: messages.c:61 +msgid "Main" +msgstr "Hlavni nabidka" + +# MSG_BL_HIGH c=12 +#: messages.c:155 +msgid "Level Bright" +msgstr "" + +# MSG_BL_LOW c=12 +#: messages.c:156 +msgid "Level Dimmed" +msgstr "" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 +#: messages.c:65 +msgid "Measuring reference height of calibration point" +msgstr "Merim referencni vysku kalibracniho bodu" + +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 +msgid "Mesh Bed Leveling" +msgstr "" + +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:764 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Pokracuji v tisku..." + +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:757 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Pokracuji v nahrivani..." + +# +#: ultralcd.cpp:2960 +msgid "Measured skew" +msgstr "Merene zkoseni" + +# MSG_MMU_FAILS c=14 +#: messages.c:68 +msgid "MMU fails" +msgstr "Selhani MMU" + +# +#: mmu.cpp:1586 +msgid "MMU load failed " +msgstr "Zavedeni MMU selhalo" + +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 +msgid "MMU load fails" +msgstr "MMU selhani zavadeni" + +# MSG_MMU_OK_RESUMING c=20 r=4 +#: mmu.cpp:775 +msgid "MMU OK. Resuming..." +msgstr "MMU OK. Pokracuji..." + +# MSG_MODE +#: messages.c:101 +msgid "Mode" +msgstr "Mod" + +# c=20 r=3 +#: Marlin_main.cpp:934 +msgid "MK3 firmware detected on MK3S printer" +msgstr "" + +# MSG_NORMAL +#: messages.c:105 +msgid "Normal" +msgstr "" + +# MSG_SILENT +#: messages.c:104 +msgid "Silent" +msgstr "Tichy" + +# +#: mmu.cpp:721 +msgid "MMU needs user attention." +msgstr "MMU potrebuje zasah uzivatele." + +# +#: ultralcd.cpp:1701 +msgid "MMU power fails" +msgstr "MMU vypadky proudu" + +# MSG_STEALTH +#: messages.c:106 +msgid "Stealth" +msgstr "Tichy" + +# MSG_AUTO_POWER +#: messages.c:103 +msgid "Auto power" +msgstr "Automaticky" + +# MSG_HIGH_POWER +#: messages.c:102 +msgid "High power" +msgstr "Vys. vykon" + +# +#: ultralcd.cpp:2124 +msgid "MMU2 connected" +msgstr "MMU2 pripojeno" + +# MSG_SELFTEST_MOTOR +#: messages.c:94 +msgid "Motor" +msgstr "" + +# MSG_MOVE_AXIS +#: ultralcd.cpp:5681 +msgid "Move axis" +msgstr "Posunout osu" + +# MSG_MOVE_X +#: ultralcd.cpp:4262 +msgid "Move X" +msgstr "Posunout X" + +# MSG_MOVE_Y +#: ultralcd.cpp:4263 +msgid "Move Y" +msgstr "Posunout Y" + +# MSG_MOVE_Z +#: ultralcd.cpp:4264 +msgid "Move Z" +msgstr "Posunout Z" + +# MSG_NO_MOVE +#: Marlin_main.cpp:5719 +msgid "No move." +msgstr "Bez pohybu." + +# MSG_NO_CARD +#: ultralcd.cpp:6673 +msgid "No SD card" +msgstr "Zadna SD karta" + +# MSG_NA +#: messages.c:124 +msgid "N/A" +msgstr "" + +# MSG_NO +#: messages.c:70 +msgid "No" +msgstr "Ne" + +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:8028 +msgid "Not connected" +msgstr "Nezapojeno " + +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Vysla nova verze firmware:" + +# MSG_SELFTEST_FAN_NO c=19 +#: messages.c:90 +msgid "Not spinning" +msgstr "Netoci se" + +# MSG_WIZARD_V2_CAL c=20 r=8 +#: ultralcd.cpp:4847 +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:4972 +msgid "Now I will preheat nozzle for PLA." +msgstr "Nyni predehreji trysku pro PLA." + +# MSG_NOZZLE +#: messages.c:71 +msgid "Nozzle" +msgstr "Tryska" + +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 +#: Marlin_main.cpp:1581 +msgid "Old settings found. Default PID, Esteps etc. will be set." +msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." + +# +#: ultralcd.cpp:4963 +msgid "Now remove the test print from steel sheet." +msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." + +# +#: ultralcd.cpp:1600 +msgid "Nozzle FAN" +msgstr "Vent. trysky" + +# MSG_PAUSE_PRINT +#: ultralcd.cpp:6637 +msgid "Pause print" +msgstr "Pozastavit tisk" + +# MSG_PID_RUNNING c=20 r=1 +#: ultralcd.cpp:1485 +msgid "PID cal. " +msgstr "PID kal. " + +# MSG_PID_FINISHED c=20 r=1 +#: ultralcd.cpp:1491 +msgid "PID cal. finished" +msgstr "PID kal. ukoncena" + +# MSG_PID_EXTRUDER c=17 r=1 +#: ultralcd.cpp:5803 +msgid "PID calibration" +msgstr "PID kalibrace" + +# MSG_PINDA_PREHEAT c=20 r=1 +#: ultralcd.cpp:843 +msgid "PINDA Heating" +msgstr "Nahrivani PINDA" + +# MSG_PAPER c=20 r=10 +#: messages.c:72 +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:5029 +msgid "Please clean heatbed and then press the knob." +msgstr "Prosim ocistete podlozku a stisknete tlacitko." + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:24 +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:8022 +msgid "Please check :" +msgstr "Zkontrolujte :" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:115 +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_CHECK_IDLER c=20 r=4 +#: Marlin_main.cpp:3317 +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:73 +msgid "Please place steel sheet on heatbed." +msgstr "Umistete prosim tiskovy plat na podlozku" + +# MSG_PRESS_TO_UNLOAD c=20 r=4 +#: messages.c:77 +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:79 +msgid "Please pull out filament immediately" +msgstr "Prosim vyjmete urychlene filament" + +# MSG_EJECT_REMOVE c=20 r=4 +#: mmu.cpp:1420 +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:82 +msgid "Please remove steel sheet from heatbed." +msgstr "Odstrante prosim tiskovy plat z podlozky." + +# MSG_RUN_XYZ c=20 r=4 +#: Marlin_main.cpp:4766 +msgid "Please run XYZ calibration first." +msgstr "Nejprve spustte kalibraci XYZ." + +# MSG_UPDATE_MMU2_FW c=20 r=4 +#: mmu.cpp:1340 +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:74 +msgid "Please wait" +msgstr "Prosim cekejte" + +# +#: ultralcd.cpp:4962 +msgid "Please remove shipping helpers first." +msgstr "Nejprve prosim sundejte transportni soucastky." + +# MSG_PREHEAT_NOZZLE c=20 +#: messages.c:76 +msgid "Preheat the nozzle!" +msgstr "Predehrejte trysku!" + +# MSG_PREHEAT +#: ultralcd.cpp:6615 +msgid "Preheat" +msgstr "Predehrev" + +# MSG_WIZARD_HEATING c=20 r=3 +#: messages.c:117 +msgid "Preheating nozzle. Please wait." +msgstr "Predehrev trysky. Prosim cekejte." + +# c=14 +#: ultralcd.cpp:1905 +msgid "PINDA" +msgstr "" + +# +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Prosim aktualizujte." + +# MSG_PRESS_TO_PREHEAT c=20 r=4 +#: Marlin_main.cpp:11718 +msgid "Press knob to preheat nozzle and continue." +msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." + +# MSG_FS_PAUSE c=5 +#: fsensor.cpp:728 +msgid "Pause" +msgstr "" + +# MSG_POWER_FAILURES c=14 +#: messages.c:75 +msgid "Power failures" +msgstr "Vypadky proudu" + +# MSG_PRINT_ABORTED c=20 +#: messages.c:78 +msgid "Print aborted" +msgstr "Tisk prerusen" + +# c=20 +#: ultralcd.cpp:2390 +msgid "Preheating to load" +msgstr "Predehrev k zavedeni" + +# c=20 +#: ultralcd.cpp:2395 +msgid "Preheating to unload" +msgstr "Predehrev k vyjmuti" + +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8401 +msgid "Print fan:" +msgstr "Tiskovy vent.:" + +# MSG_CARD_MENU +#: messages.c:21 +msgid "Print from SD" +msgstr "Tisk z SD" + +# +#: ultralcd.cpp:2231 +msgid "Press the knob" +msgstr "Stisknete hl. tlacitko" + +# MSG_PRINT_PAUSED c=20 r=1 +#: ultralcd.cpp:1065 +msgid "Print paused" +msgstr "Tisk pozastaven" + +# +#: mmu.cpp:725 +msgid "Press the knob to resume nozzle temperature." +msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko." + +# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +#: messages.c:45 +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." + +# +#: ultralcd.cpp:1601 +msgid "Print FAN" +msgstr "Tiskovy vent." + +# +#: ultralcd.cpp:4827 +msgid "Please insert filament into the extruder, then press the knob to load it." +msgstr "Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni" + +# +#: ultralcd.cpp:4822 +msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." +msgstr "Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni" + +# +#: ultralcd.cpp:4744 +msgid "Please load filament first." +msgstr "Prosim nejdriv zavedte filament" + +# MSG_PRUSA3D +#: ultralcd.cpp:2104 +msgid "prusa3d.com" +msgstr "" + +# MSG_BED_CORRECTION_REAR c=14 r=1 +#: ultralcd.cpp:3191 +msgid "Rear side [um]" +msgstr "Vzadu [um]" + +# c=20 r=4 +#: ultralcd.cpp:7304 +msgid "Please unload the filament first, then repeat this action." +msgstr "Prosim vyjmete filament a zopakujte tuto akci" + +# c=20 r=4 +#: ultralcd.cpp:7307 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament" + +# MSG_RECOVERING_PRINT c=20 +#: Marlin_main.cpp:11076 +msgid "Recovering print " +msgstr "Obnovovani tisku " + +# MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#: mmu.cpp:832 +msgid "Remove old filament and press the knob to start loading new filament." +msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." + +# c=20 +#: +msgid "Prusa i3 MK3S OK." +msgstr "" + +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5808 +msgid "Reset XYZ calibr." +msgstr "Reset XYZ kalibr." + +# MSG_RESET c=14 +#: messages.c:83 +msgid "Reset" +msgstr "" + +# MSG_RESUME_PRINT c=18 +#: messages.c:84 +msgid "Resume print" +msgstr "Pokracovat" + +# MSG_RESUMING_PRINT c=20 +#: messages.c:85 +msgid "Resuming print" +msgstr "Obnoveni tisku" + +# MSG_BED_CORRECTION_RIGHT c=14 r=1 +#: ultralcd.cpp:3189 +msgid "Right side[um]" +msgstr "Vpravo [um]" + +# MSG_RPI_PORT +#: messages.c:142 +msgid "RPi port" +msgstr "" + +# MSG_WIZARD_RERUN c=20 r=7 +#: ultralcd.cpp:4765 +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_SD_CARD +#: messages.c:137 +msgid "SD card" +msgstr "" + +# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +#: messages.c:138 +msgid "FlashAir" +msgstr "" + +# +#: ultralcd.cpp:2920 +msgid "Right" +msgstr "Vpravo" + +# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 +#: messages.c:42 +msgid "Searching bed calibration point" +msgstr "Hledam kalibracni bod podlozky" + +# MSG_LANGUAGE_SELECT +#: ultralcd.cpp:5721 +msgid "Select language" +msgstr "Vyber jazyka" + +# MSG_SELFTEST_OK +#: ultralcd.cpp:7579 +msgid "Self test OK" +msgstr "" + +# MSG_SELFTEST_START c=20 +#: ultralcd.cpp:7347 +msgid "Self test start " +msgstr "Self test start " + +# MSG_SELFTEST +#: ultralcd.cpp:5784 +msgid "Selftest " +msgstr "Selftest " + +# MSG_SELFTEST_ERROR +#: ultralcd.cpp:8021 +msgid "Selftest error !" +msgstr "Chyba Selftestu!" + +# MSG_SELFTEST_FAILED c=20 +#: messages.c:88 +msgid "Selftest failed " +msgstr "Selftest selhal " + +# MSG_FORCE_SELFTEST c=20 r=8 +#: Marlin_main.cpp:1613 +msgid "Selftest will be run to calibrate accurate sensorless rehoming." +msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." + +# +#: ultralcd.cpp:5003 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." + +# MSG_SET_TEMPERATURE c=19 r=1 +#: ultralcd.cpp:3209 +msgid "Set temperature:" +msgstr "Nastavte teplotu:" + +# c=20 +#: +msgid "Prusa i3 MK2.5 OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK2.5S OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK3 OK." +msgstr "" + +# MSG_SETTINGS +#: messages.c:97 +msgid "Settings" +msgstr "Nastaveni" + +# MSG_SHOW_END_STOPS c=18 +#: ultralcd.cpp:5805 +msgid "Show end stops" +msgstr "Stav konc. spin." + +# +#: ultralcd.cpp:3915 +msgid "Sensor state" +msgstr "Stav senzoru" + +# MSG_FILE_CNT c=20 r=6 +#: 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 +#: messages.c:139 +msgid "Sort" +msgstr "Trideni" + +# MSG_NONE +#: messages.c:127 +msgid "None" +msgstr "Zadne" + +# MSG_SORT_TIME +#: messages.c:140 +msgid "Time" +msgstr "Cas" + +# +#: ultralcd.cpp:2963 +msgid "Severe skew:" +msgstr "Tezke zkoseni:" + +# MSG_SORT_ALPHA +#: messages.c:141 +msgid "Alphabet" +msgstr "Abeceda" + +# MSG_SORTING c=20 r=1 +#: cardreader.cpp:746 +msgid "Sorting files" +msgstr "Trideni souboru" + +# MSG_SOUND_LOUD +#: messages.c:144 +msgid "Loud" +msgstr "Hlasity" + +# +#: ultralcd.cpp:2962 +msgid "Slight skew:" +msgstr "Lehke zkoseni:" + +# MSG_SOUND +#: messages.c:143 +msgid "Sound" +msgstr "Zvuk" + +# c=7 +#: ultralcd.cpp:1768 +msgid "Runouts" +msgstr "" + +# +#: Marlin_main.cpp:5280 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Vyskytl se problem, srovnavam osu Z ..." + +# MSG_SOUND_ONCE +#: messages.c:145 +msgid "Once" +msgstr "Jednou" + +# MSG_SPEED +#: ultralcd.cpp:6874 +msgid "Speed" +msgstr "Rychlost" + +# MSG_SELFTEST_FAN_YES c=19 +#: messages.c:91 +msgid "Spinning" +msgstr "Toci se" + +# MSG_TEMP_CAL_WARNING c=20 r=4 +#: Marlin_main.cpp:4779 +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:6733 +msgid "Statistics " +msgstr "Statistika " + +# MSG_STOP_PRINT +#: messages.c:108 +msgid "Stop print" +msgstr "Zastavit tisk" + +# MSG_STOPPED +#: messages.c:109 +msgid "STOPPED. " +msgstr "ZASTAVENO." + +# MSG_SUPPORT +#: ultralcd.cpp:6742 +msgid "Support" +msgstr "Podpora" + +# MSG_SELFTEST_SWAPPED +#: ultralcd.cpp:8080 +msgid "Swapped" +msgstr "Prohozene" + +# +#: ultralcd.cpp:4715 +msgid "Select filament:" +msgstr "Zvolte filament:" + +# MSG_TEMP_CALIBRATION c=14 +#: messages.c:110 +msgid "Temp. cal." +msgstr "Tepl. kal." + +# +#: ultralcd.cpp:4856 +msgid "Select temperature which matches your material." +msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." + +# MSG_CALIBRATION_PINDA_MENU c=17 r=1 +#: ultralcd.cpp:5816 +msgid "Temp. calibration" +msgstr "Teplot. kalibrace" + +# MSG_TEMP_CAL_FAILED c=20 r=8 +#: ultralcd.cpp:3845 +msgid "Temperature calibration failed" +msgstr "Teplotni kalibrace selhala" + +# MSG_TEMP_CALIBRATION_DONE c=20 r=12 +#: messages.c:111 +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." + +# c=20 r=3 +#: ultralcd.cpp:7311 +msgid "Sensor verified, remove the filament now." +msgstr "Senzor overen, vyjmete filament." + +# MSG_TEMPERATURE +#: ultralcd.cpp:5679 +msgid "Temperature" +msgstr "Teplota" + +# MSG_MENU_TEMPERATURES c=15 r=1 +#: ultralcd.cpp:2160 +msgid "Temperatures" +msgstr "Teploty" + +# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#: messages.c:46 +msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace." + +# +#: ultralcd.cpp:2817 +msgid "Total filament" +msgstr "Filament celkem" + +# +#: ultralcd.cpp:2818 +msgid "Total print time" +msgstr "Celkovy cas tisku" + +# MSG_TUNE +#: ultralcd.cpp:6612 +msgid "Tune" +msgstr "Ladit" + +# +#: +msgid "Unload" +msgstr "Vysunout" + +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 +msgid "Total failures" +msgstr "Celkem selhani" + +# +#: ultralcd.cpp:2238 +msgid "to load filament" +msgstr "k zavedeni filamentu" + +# +#: ultralcd.cpp:2242 +msgid "to unload filament" +msgstr "k vyjmuti filamentu" + +# MSG_UNLOAD_FILAMENT c=17 +#: messages.c:112 +msgid "Unload filament" +msgstr "Vyjmout filament" + +# MSG_UNLOADING_FILAMENT c=20 r=1 +#: messages.c:113 +msgid "Unloading filament" +msgstr "Vysouvam filament" + +# MSG_TOTAL c=6 +#: messages.c:98 +msgid "Total" +msgstr "Celkem" + +# MSG_USED c=19 r=1 +#: ultralcd.cpp:5932 +msgid "Used during print" +msgstr "Pouzite behem tisku" + +# MSG_MENU_VOLTAGES c=15 r=1 +#: ultralcd.cpp:2163 +msgid "Voltages" +msgstr "Napeti" + +# +#: ultralcd.cpp:2132 +msgid "unknown" +msgstr "neznamy" + +# MSG_USERWAIT +#: Marlin_main.cpp:5689 +msgid "Wait for user..." +msgstr "Ceka se na uzivatele..." + +# MSG_WAITING_TEMP c=20 r=3 +#: ultralcd.cpp:3357 +msgid "Waiting for nozzle and bed cooling" +msgstr "Cekani na zchladnuti trysky a podlozky." + +# MSG_WAITING_TEMP_PINDA c=20 r=3 +#: ultralcd.cpp:3318 +msgid "Waiting for PINDA probe cooling" +msgstr "Cekani na zchladnuti PINDA" + +# +#: +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:1573 +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:1565 +msgid "Warning: motherboard type changed." +msgstr "Varovani: doslo ke zmene typu motherboardu." + +# MSG_CHANGED_PRINTER c=20 r=4 +#: Marlin_main.cpp:1569 +msgid "Warning: printer type changed." +msgstr "Varovani: doslo ke zmene typu tiskarny." + +# MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#: Marlin_main.cpp:3308 +msgid "Was filament unload successful?" +msgstr "Bylo vysunuti filamentu uspesne?" + +# MSG_SELFTEST_WIRINGERROR +#: messages.c:96 +msgid "Wiring error" +msgstr "Chyba zapojeni" + +# MSG_WIZARD c=17 r=1 +#: ultralcd.cpp:5775 +msgid "Wizard" +msgstr "Pruvodce" + +# MSG_XYZ_DETAILS c=18 +#: ultralcd.cpp:2152 +msgid "XYZ cal. details" +msgstr "Detaily XYZ kal." + +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:18 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." + +# MSG_YES +#: messages.c:119 +msgid "Yes" +msgstr "Ano" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:118 +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:3817 +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:3814 +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_TIMEOUT c=12 +#: messages.c:157 +msgid "Timeout" +msgstr "" + +# MSG_X_CORRECTION c=13 +#: ultralcd.cpp:5091 +msgid "X-correct:" +msgstr "Korekce X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3811 +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:3795 +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:3798 +msgid "XYZ calibration compromised. Right front calibration point not reachable." +msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6171 +msgid "Load all" +msgstr "Zavest vse" + +# +#: ultralcd.cpp:3777 +msgid "XYZ calibration failed. Bed calibration point was not found." +msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." + +# +#: ultralcd.cpp:3783 +msgid "XYZ calibration failed. Front calibration points not reachable." +msgstr "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." + +# +#: ultralcd.cpp:3786 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." + +# +#: ultralcd.cpp:2917 +msgid "Y distance from min" +msgstr "Y vzdalenost od min" + +# +#: ultralcd.cpp:4859 +msgid "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)." +msgstr "Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." + +# c=20 r=5 +#: ultralcd.cpp:7315 +msgid "Verification failed, remove the filament and try again." +msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." + +# MSG_Y_CORRECTION c=13 +#: ultralcd.cpp:5092 +msgid "Y-correct:" +msgstr "Korekce Y:" + +# MSG_OFF +#: messages.c:122 +msgid "Off" +msgstr "Vyp" + +# MSG_ON +#: messages.c:123 +msgid "On" +msgstr "Zap" + +# +#: messages.c:62 +msgid "Back" +msgstr "Zpet" + +# +#: ultralcd.cpp:5647 +msgid "Checks" +msgstr "Kontrola" + +# +#: ultralcd.cpp:8090 +msgid "False triggering" +msgstr "Falesne spusteni" + +# +#: ultralcd.cpp:3920 +msgid "FINDA:" +msgstr "" + +# MSG_FIRMWARE +#: language.h:24 +msgid "Firmware" +msgstr "" + +# MSG_STRICT +#: messages.c:129 +msgid "Strict" +msgstr "Prisne" + +# MSG_WARN +#: messages.c:128 +msgid "Warn" +msgstr "Varovat" + +# MSG_HW_SETUP c=18 +#: messages.c:100 +msgid "HW Setup" +msgstr "HW nastaveni" + +# +#: ultralcd.cpp:3924 +msgid "IR:" +msgstr "" + +# MSG_MAGNETS_COMP +#: messages.c:150 +msgid "Magnets comp." +msgstr "Komp. magnetu" + +# MSG_MESH +#: messages.c:147 +msgid "Mesh" +msgstr "" + +# +#: Marlin_main.cpp:927 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware detekovan na tiskarne MK3" + +# MSG_MMU_MODE +#: messages.c:136 +msgid "MMU Mode" +msgstr "MMU mod" + +# +#: ultralcd.cpp:4395 +msgid "Mode change in progress ..." +msgstr "Probiha zmena modu..." + +# MSG_MODEL +#: messages.c:130 +msgid "Model" +msgstr "" + +# MSG_NOZZLE_DIAMETER +#: messages.c:135 +msgid "Nozzle d." +msgstr "Tryska" + +# +#: util.cpp:514 +msgid "G-code sliced for a different level. Continue?" +msgstr "" + +# +#: util.cpp:520 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "" + +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" + +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 +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:481 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code je pripraven pro novejsi firmware. Pokracovat?" + +# +#: util.cpp:487 +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." + +# +#: ultralcd.cpp:3916 +msgid "PINDA:" +msgstr "" + +# c=20 +#: ultralcd.cpp:2402 +msgid "Preheating to cut" +msgstr "Predehrev ke strihu" + +# c=20 +#: ultralcd.cpp:2399 +msgid "Preheating to eject" +msgstr "Predehrev k vysunuti" + +# +#: util.cpp:394 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" + +# +#: util.cpp:401 +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." + +# c=20 +#: ultralcd.cpp:8095 +msgid "%s level expected" +msgstr "" + +# +#: ultralcd.cpp:6574 +msgid "Rename" +msgstr "Prejmenovat" + +# +#: ultralcd.cpp:6567 +msgid "Select" +msgstr "Vybrat" + +# +#: ultralcd.cpp:2154 +msgid "Sensor info" +msgstr "Senzor info" + +# MSG_SHEET c=10 +#: messages.c:63 +msgid "Sheet" +msgstr "Plat" + +# MSG_SOUND_BLIND +#: messages.c:146 +msgid "Assist" +msgstr "Asist." + +# MSG_STEEL_SHEET c=18 +#: messages.c:64 +msgid "Steel sheets" +msgstr "Tiskove platy" + +# MSG_Z_CORRECTION c=13 +#: ultralcd.cpp:5093 +msgid "Z-correct:" +msgstr "Korekce Z:" + +# MSG_Z_PROBE_NR +#: messages.c:149 +msgid "Z-probe nr." +msgstr "Pocet mereni Z" + diff --git a/lang/po/new/de.po b/lang/po/new/de.po index dc3c21284..a49c59b3b 100644 --- a/lang/po/new/de.po +++ b/lang/po/new/de.po @@ -1,1857 +1,1852 @@ -# Translation of Prusa-Firmware into German. -# -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: de\n" -"Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri Sep 18 15:23:29 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:23:29 CEST 2020\n" -"Language-Team: \n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -# -#: -msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -msgstr "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" - -# MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 -msgid " 0.3 or older" -msgstr " 0.3 oder aelter" - -# c=18 -#: Marlin_main.cpp:9463 -msgid "FS v0.3 or older" -msgstr "FS 0.3 oder aelter" - -# MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 -msgid " 0.4 or newer" -msgstr " 0.4 oder neuer" - -# c=18 -#: Marlin_main.cpp:9462 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 oder neuer" - -# MSG_IR_UNKNOWN c=18 -#: messages.c:145 -msgid "unknown state" -msgstr "Status unbekannt" - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 -msgid " of 4" -msgstr " von 4" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 -msgid " of 9" -msgstr " von 9" - -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 -msgid "[0;0] point offset" -msgstr "[0;0] Punktversatz" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: -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 -#: -msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" - -# -#: ultralcd.cpp:2451 -msgid ">Cancel" -msgstr ">Abbruch" - -# MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 -msgid "Adjusting Z:" -msgstr "Z Anpassen:" - -# MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 -msgid "All correct " -msgstr "Alles richtig " - -# MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 -msgid "All is done. Happy printing!" -msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" - -# -#: ultralcd.cpp:1956 -msgid "Ambient" -msgstr "Raumtemp." - -# MSG_AUTO c=6 -#: messages.c:140 -msgid "Auto" -msgstr "" - -# MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 -msgid "and press the knob" -msgstr "und Knopf druecken" - -# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 -msgid "Are left and right Z~carriages all up?" -msgstr "Sind linke+rechte Z- Schlitten ganz oben?" - -# MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 -msgid "SpoolJoin" -msgstr "" - -# MSG_AUTO_HOME -#: messages.c:11 -msgid "Auto home" -msgstr "Startposition" - -# MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 -msgid "AutoLoad filament" -msgstr "AutoLaden Filament" - -# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 -msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." - -# MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 -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:8371 -msgid "Axis length" -msgstr "Achsenlaenge" - -# MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 -msgid "Axis" -msgstr "Achse" - -# MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 -msgid "Bed / Heater" -msgstr "Bett / Heizung" - -# MSG_BED_DONE -#: messages.c:15 -msgid "Bed done" -msgstr "Bett OK" - -# MSG_BED_HEATING -#: messages.c:16 -msgid "Bed Heating" -msgstr "Bett aufwaermen" - -# MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 -msgid "Bed level correct" -msgstr "Ausgleich Bett ok" - -# MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 -msgid "Belt test " -msgstr "Riementest " - -# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 -#: messages.c:17 -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_BRIGHT c=6 -#: messages.c:138 -msgid "Bright" -msgstr "Hell" - -# MSG_BRIGHTNESS c=18 -#: messages.c:134 -msgid "Brightness" -msgstr "Helligkeit" - -# MSG_BED -#: messages.c:14 -msgid "Bed" -msgstr "Bett" - -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 -msgid "Belt status" -msgstr "Gurtstatus" - -# MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 -msgid "Blackout occurred. Recover print?" -msgstr "Stromausfall! Druck wiederherstellen?" - -# -#: ultralcd.cpp:8706 -msgid "Calibrating home" -msgstr "Kalibriere Start" - -# MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 -msgid "Calibrate XYZ" -msgstr "Kalibrierung XYZ" - -# MSG_HOMEYZ -#: messages.c:44 -msgid "Calibrate Z" -msgstr "Kalibrierung Z" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 -msgid "Calibrate" -msgstr "Kalibrieren" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 -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." - -# MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 -msgid "Calibrating Z" -msgstr "Kalibrierung Z" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 -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:865 -msgid "Calibration done" -msgstr "Kalibrierung OK" - -# MSG_MENU_CALIBRATION -#: messages.c:57 -msgid "Calibration" -msgstr "Kalibrierung" - -# -#: ultralcd.cpp:4811 -msgid "Cancel" -msgstr "Abbruch" - -# MSG_SD_REMOVED -#: ultralcd.cpp:9142 -msgid "Card removed" -msgstr "SD Karte entfernt" - -# MSG_NOT_COLOR -#: ultralcd.cpp:2707 -msgid "Color not correct" -msgstr "Falsche Farbe" - -# MSG_COOLDOWN -#: messages.c:22 -msgid "Cooldown" -msgstr "Abkuehlen" - -# -#: ultralcd.cpp:4566 -msgid "Copy selected language?" -msgstr "Gewaehlte Sprache kopieren?" - -# MSG_CRASHDETECT c=13 -#: messages.c:24 -msgid "Crash det." -msgstr "Crash Erk." - -# -#: ultralcd.cpp:4946 -msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." -msgstr "Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." - -# MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 -msgid "Crash detected." -msgstr "Crash erkannt." - -# -#: Marlin_main.cpp:605 -msgid "Crash detected. Resume print?" -msgstr "Crash erkannt. Druck fortfuehren?" - -# -#: ultralcd.cpp:1785 -msgid "Crash" -msgstr "" - -# MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 -msgid "Current" -msgstr "Aktuelles" - -# MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 -msgid "Date:" -msgstr "Datum:" - -# MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 -msgid "Disable steppers" -msgstr "Motoren aus" - -# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: messages.c:13 -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 "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_FS_CONTINUE c=5 -#: messages.c:132 -msgid "Cont." -msgstr "" - -# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 -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=13 -#: ultralcd.cpp:5190 -msgid "E-correct:" -msgstr "E-Korrektur:" - -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 -msgid "Eject filament" -msgstr "Filamentauswurf" - -# MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 -msgid "Ejecting filament" -msgstr "werfe Filament aus" - -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 -msgid "Endstop not hit" -msgstr "Ende nicht getroffen" - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 -msgid "Endstop" -msgstr "Endanschlag" - -# MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 -msgid "Endstops" -msgstr "Endschalter" - -# MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 -msgid "Error - static memory has been overwritten" -msgstr "Fehler - statischer Speicher wurde ueberschrieben" - -# MSG_CUT_FILAMENT c=16 -#: messages.c:50 -msgid "Cut filament" -msgstr "Fil. schneiden" - -# MSG_CUTTER c=9 -#: messages.c:109 -msgid "Cutter" -msgstr "Messer" - -# c=18 -#: mmu.cpp:1388 -msgid "Cutting filament" -msgstr "Schneide filament" - -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." - -# MSG_DIM c=6 -#: messages.c:139 -msgid "Dim" -msgstr "Dimm" - -# MSG_ERROR -#: messages.c:25 -msgid "ERROR:" -msgstr "FEHLER:" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 -msgid "Extruder fan:" -msgstr "Extruder Luefter:" - -# MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 -msgid "Extruder info" -msgstr "Extruder Info" - -# MSG_MOVE_E -#: messages.c:26 -msgid "Extruder" -msgstr "" - -# -#: ultralcd.cpp:7017 -msgid "Fail stats MMU" -msgstr "MMU-Fehler" - -# MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 -msgid "F. autoload" -msgstr "F. autoladen" - -# -#: ultralcd.cpp:7014 -msgid "Fail stats" -msgstr "Fehlerstatistik" - -# MSG_FAN_SPEED c=14 -#: messages.c:28 -msgid "Fan speed" -msgstr "Luefter-Tempo" - -# MSG_SELFTEST_FAN c=20 -#: messages.c:74 -msgid "Fan test" -msgstr "Lueftertest" - -# MSG_FANS_CHECK -#: ultralcd.cpp:5777 -msgid "Fans check" -msgstr "Luefter Chk." - -# MSG_FSENSOR -#: messages.c:41 -msgid "Fil. sensor" -msgstr "Fil. Sensor" - -# c=14 -#: ultralcd.cpp:1784 -msgid "Filam. runouts" -msgstr "Filam. Maengel" - -# MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 -msgid "Filament extruding & with correct color?" -msgstr "Filament extrudiert mit richtiger Farbe?" - -# MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 -msgid "Filament not loaded" -msgstr "Fil. nicht geladen" - -# MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 -msgid "Filament sensor" -msgstr "Filamentsensor" - -# MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 -msgid "Filament used" -msgstr "Filament benutzt" - -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 -msgid "Print time" -msgstr "Druckzeit" - -# MSG_FS_ACTION c=10 -#: messages.c:131 -msgid "FS Action" -msgstr "FS Aktion" - -# MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 -msgid "File incomplete. Continue anyway?" -msgstr "Datei unvollstaendig Trotzdem fortfahren?" - -# MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 -msgid "Finishing movements" -msgstr "Bewegung beenden" - -# MSG_V2_CALIBRATION c=18 -#: messages.c:103 -msgid "First layer cal." -msgstr "Erste-Schicht Kal." - -# MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 -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:727 -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:7157 -msgid "Flow" -msgstr "Durchfluss" - -# MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 -msgid "forum.prusa3d.com" -msgstr "" - -# MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 -msgid "Front print fan?" -msgstr "Vorderer Luefter?" - -# MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 -msgid "Front side[um]" -msgstr "Vorne [um]" - -# MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 -msgid "Front/left fans" -msgstr "Vorderer/linke Luefter" - -# MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 -msgid "Heater/Thermistor" -msgstr "Heizung/Thermistor" - -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 -msgid "Heating disabled by safety timer." -msgstr "Heizung durch Sicherheitstimer deaktiviert." - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:43 -msgid "Heating done." -msgstr "Aufwaermen OK." - -# MSG_HEATING -#: messages.c:42 -msgid "Heating" -msgstr "Aufwaermen" - -# MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 -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:2158 -msgid "howto.prusa3d.com" -msgstr "" - -# MSG_FILAMENTCHANGE -#: messages.c:34 -msgid "Change filament" -msgstr "Filament-Wechsel" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 -msgid "Change success!" -msgstr "Wechsel erfolgr.!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 -msgid "Changed correctly?" -msgstr "Wechsel ok?" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 -msgid "Checking bed " -msgstr "Pruefe Bett " - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 -msgid "Checking endstops" -msgstr "Pruefe Endschalter" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 -msgid "Checking hotend " -msgstr "Pruefe Duese " - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 -msgid "Checking sensors " -msgstr "Pruefe Sensoren " - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 -msgid "Checking X axis " -msgstr "Pruefe X Achse " - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 -msgid "Checking Y axis " -msgstr "Pruefe Y Achse " - -# MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 -msgid "Checking Z axis " -msgstr "Pruefe Z Achse " - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 -msgid "Choose extruder:" -msgstr "Extruder waehlen:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 -msgid "Choose filament:" -msgstr "Waehle Filament:" - -# MSG_FILAMENT c=17 r=1 -#: messages.c:27 -msgid "Filament" -msgstr "" - -# MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 -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:5059 -msgid "I will run z calibration now." -msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." - -# MSG_WATCH -#: messages.c:97 -msgid "Info screen" -msgstr "Infoanzeige" - -# MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 -msgid "Insert filament" -msgstr "Filament einlegen" - -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 -msgid "Is filament loaded?" -msgstr "Ist das Filament geladen?" - -# MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 -msgid "Is steel sheet on heatbed?" -msgstr "Liegt das Stahlblech auf dem Heizbett?" - -# -#: ultralcd.cpp:1727 -msgid "Last print failures" -msgstr "Letzte Druckfehler" - -# -#: ultralcd.cpp:5129 -msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -msgstr "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." - -# -#: ultralcd.cpp:1704 -msgid "Last print" -msgstr "Letzter Druck" - -# MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 -msgid "Left hotend fan?" -msgstr "Linker Luefter?" - -# -#: ultralcd.cpp:2991 -msgid "Left" -msgstr "Links" - -# MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 -msgid "Left side [um]" -msgstr "Links [um]" - -# -#: ultralcd.cpp:5792 -msgid "Lin. correction" -msgstr "Lineare Korrektur" - -# MSG_BABYSTEP_Z -#: messages.c:12 -msgid "Live adjust Z" -msgstr "Z einstellen" - -# c=20 r=6 -#: ultralcd.cpp:7559 -msgid "Insert the filament (do not load it) into the extruder and then press the knob." -msgstr "Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf." - -# MSG_LOAD_FILAMENT c=17 -#: messages.c:47 -msgid "Load filament" -msgstr "Filament laden" - -# MSG_LOADING_COLOR -#: ultralcd.cpp:2643 -msgid "Loading color" -msgstr "Lade Farbe" - -# MSG_LOADING_FILAMENT c=20 -#: messages.c:48 -msgid "Loading filament" -msgstr "Filament laedt" - -# MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 -msgid "Loose pulley" -msgstr "Lose Riemenscheibe" - -# -#: ultralcd.cpp:6976 -msgid "Load to nozzle" -msgstr "In Druckduese laden" - -# MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 -msgid "M117 First layer cal." -msgstr "M117 Erste-Schicht Kal." - -# MSG_MAIN -#: messages.c:52 -msgid "Main" -msgstr "Hauptmenue" - -# MSG_BL_HIGH c=12 -#: messages.c:135 -msgid "Level Bright" -msgstr "Hell.wert" - -# MSG_BL_LOW c=12 -#: messages.c:136 -msgid "Level Dimmed" -msgstr "Dimmwert" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 -msgid "Measuring reference height of calibration point" -msgstr "Messen der Referenzhoehe des Kalibrierpunktes" - -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 -msgid "Mesh Bed Leveling" -msgstr "MeshBett Ausgleich" - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Position wiederherstellen..." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Temperatur wiederherstellen..." - -# -#: ultralcd.cpp:3032 -msgid "Measured skew" -msgstr "Schraeglauf" - -# -#: ultralcd.cpp:1728 -msgid "MMU fails" -msgstr "MMU Fehler" - -# -#: mmu.cpp:1588 -msgid "MMU load failed " -msgstr "MMU Ladefehler" - -# -#: ultralcd.cpp:1729 -msgid "MMU load fails" -msgstr "MMU Ladefehler" - -# MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 -msgid "MMU OK. Resuming..." -msgstr "MMU OK. Weiterdrucken..." - -# MSG_MODE -#: messages.c:84 -msgid "Mode" -msgstr "Modus" - -# c=20 r=3 -#: Marlin_main.cpp:884 -msgid "MK3 firmware detected on MK3S printer" -msgstr "MK3-Firmware am MK3S-Drucker erkannt" - -# MSG_NORMAL -#: messages.c:88 -msgid "Normal" -msgstr "" - -# MSG_SILENT -#: messages.c:87 -msgid "Silent" -msgstr "Leise" - -# -#: mmu.cpp:722 -msgid "MMU needs user attention." -msgstr "MMU erfordert Benutzereingriff." - -# -#: ultralcd.cpp:1755 -msgid "MMU power fails" -msgstr "MMU Netzfehler" - -# MSG_STEALTH -#: messages.c:89 -msgid "Stealth" -msgstr "" - -# MSG_AUTO_POWER -#: messages.c:86 -msgid "Auto power" -msgstr "Auto Leist" - -# MSG_HIGH_POWER -#: messages.c:85 -msgid "High power" -msgstr "Hohe leist" - -# -#: ultralcd.cpp:2176 -msgid "MMU2 connected" -msgstr "MMU2 verbunden" - -# MSG_SELFTEST_MOTOR -#: messages.c:79 -msgid "Motor" -msgstr "" - -# MSG_MOVE_AXIS -#: ultralcd.cpp:5767 -msgid "Move axis" -msgstr "Achse bewegen" - -# MSG_MOVE_X -#: ultralcd.cpp:4357 -msgid "Move X" -msgstr "Bewege X" - -# MSG_MOVE_Y -#: ultralcd.cpp:4358 -msgid "Move Y" -msgstr "Bewege Y" - -# MSG_MOVE_Z -#: ultralcd.cpp:4359 -msgid "Move Z" -msgstr "Bewege Z" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5555 -msgid "No move." -msgstr "Keine Bewegung." - -# MSG_NO_CARD -#: ultralcd.cpp:6943 -msgid "No SD card" -msgstr "Keine SD Karte" - -# MSG_NA -#: messages.c:107 -msgid "N/A" -msgstr "N/V" - -# MSG_NO -#: messages.c:58 -msgid "No" -msgstr "Nein" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 -msgid "Not connected" -msgstr "Nicht angeschlossen" - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Neue Firmware- Version verfuegbar:" - -# MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 -msgid "Not spinning" -msgstr "Dreht sich nicht" - -# MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 -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:5067 -msgid "Now I will preheat nozzle for PLA." -msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." - -# MSG_NOZZLE -#: messages.c:59 -msgid "Nozzle" -msgstr "Duese" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 -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:5058 -msgid "Now remove the test print from steel sheet." -msgstr "Testdruck jetzt von Stahlblech entfernen." - -# -#: ultralcd.cpp:1654 -msgid "Nozzle FAN" -msgstr "Duesevent." - -# MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 -msgid "Pause print" -msgstr "Druck pausieren" - -# MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 -msgid "PID cal. " -msgstr "PID Kal. " - -# MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 -msgid "PID cal. finished" -msgstr "PID Kalib. fertig" - -# MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 -msgid "PID calibration" -msgstr "PID Kalibrierung" - -# MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 -msgid "PINDA Heating" -msgstr "PINDA erwaermen" - -# MSG_PAPER c=20 r=10 -#: messages.c:60 -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:5124 -msgid "Please clean heatbed and then press the knob." -msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 -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:8303 -msgid "Please check :" -msgstr "Bitte pruefe:" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 -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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 -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 -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 -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 -msgid "Please pull out filament immediately" -msgstr "Bitte ziehen Sie das Filament sofort heraus" - -# MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 -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 -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:4601 -msgid "Please run XYZ calibration first." -msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." - -# MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 -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 -msgid "Please wait" -msgstr "Bitte warten" - -# -#: ultralcd.cpp:5057 -msgid "Please remove shipping helpers first." -msgstr "Bitte zuerst Transportsicherungen entfernen." - -# MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 -msgid "Preheat the nozzle!" -msgstr "Duese vorheizen!" - -# MSG_PREHEAT -#: ultralcd.cpp:6885 -msgid "Preheat" -msgstr "Vorheizen" - -# MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 -msgid "Preheating nozzle. Please wait." -msgstr "Vorheizen der Duese. Bitte warten." - -# c=14 -#: ultralcd.cpp:1959 -msgid "PINDA" -msgstr "" - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Bitte aktualisieren." - -# MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 -msgid "Press knob to preheat nozzle and continue." -msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." - -# MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 -msgid "Pause" -msgstr "" - -# -#: ultralcd.cpp:1783 -msgid "Power failures" -msgstr "Netzfehler" - -# MSG_PRINT_ABORTED c=20 -#: messages.c:65 -msgid "Print aborted" -msgstr "Druck abgebrochen" - -# c=20 -#: ultralcd.cpp:2433 -msgid "Preheating to load" -msgstr "Heizen zum Laden" - -# c=20 -#: ultralcd.cpp:2437 -msgid "Preheating to unload" -msgstr "Heizen zum Entladen" - -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 -msgid "Print fan:" -msgstr "Druckvent.:" - -# MSG_CARD_MENU -#: messages.c:20 -msgid "Print from SD" -msgstr "Drucken von SD" - -# -#: ultralcd.cpp:2280 -msgid "Press the knob" -msgstr "Knopf druecken zum" - -# MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 -msgid "Print paused" -msgstr "Druck pausiert" - -# -#: mmu.cpp:726 -msgid "Press the knob to resume nozzle temperature." -msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" - -# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 -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." - -# -#: ultralcd.cpp:1655 -msgid "Print FAN" -msgstr "Druckvent." - -# -#: ultralcd.cpp:4922 -msgid "Please insert filament into the extruder, then press the knob to load it." -msgstr "Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." - -# -#: ultralcd.cpp:4917 -msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." -msgstr "Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." - -# -#: ultralcd.cpp:4839 -msgid "Please load filament first." -msgstr "Bitte laden Sie zuerst das Filament." - -# MSG_PRUSA3D -#: ultralcd.cpp:2156 -msgid "prusa3d.com" -msgstr "" - -# MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 -msgid "Rear side [um]" -msgstr "Hinten [um]" - -# c=20 r=4 -#: ultralcd.cpp:7583 -msgid "Please unload the filament first, then repeat this action." -msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." - -# c=20 r=4 -#: ultralcd.cpp:7586 -msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." - -# MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 -msgid "Recovering print " -msgstr "Druck wiederherst " - -# MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 -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." - -# c=20 -#: -msgid "Prusa i3 MK3S OK." -msgstr "" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 -msgid "Reset XYZ calibr." -msgstr "Reset XYZ Kalibr." - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 -msgid "Reset" -msgstr "Ruecksetzen" - -# MSG_RESUME_PRINT -#: ultralcd.cpp:6893 -msgid "Resume print" -msgstr "Druck fortsetzen" - -# MSG_RESUMING_PRINT c=20 -#: messages.c:69 -msgid "Resuming print" -msgstr "Druck fortgesetzt" - -# MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 -msgid "Right side[um]" -msgstr "Rechts [um]" - -# MSG_RPI_PORT -#: messages.c:123 -msgid "RPi port" -msgstr "" - -# MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 -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_SD_CARD -#: messages.c:118 -msgid "SD card" -msgstr "SD Karte" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 -msgid "FlashAir" -msgstr "" - -# -#: ultralcd.cpp:2992 -msgid "Right" -msgstr "Rechts" - -# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 -msgid "Searching bed calibration point" -msgstr "Suche Bett Kalibrierpunkt" - -# MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 -msgid "Select language" -msgstr "Waehle Sprache" - -# MSG_SELFTEST_OK -#: ultralcd.cpp:7858 -msgid "Self test OK" -msgstr "Selbsttest OK" - -# MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 -msgid "Self test start " -msgstr "Selbsttest start " - -# MSG_SELFTEST -#: ultralcd.cpp:5871 -msgid "Selftest " -msgstr "Selbsttest " - -# MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 -msgid "Selftest error !" -msgstr "Selbsttest Fehler!" - -# MSG_SELFTEST_FAILED c=20 -#: messages.c:73 -msgid "Selftest failed " -msgstr "Selbsttest Error " - -# MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 -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:5098 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." - -# MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 -msgid "Set temperature:" -msgstr "Temp. einstellen:" - -# c=20 -#: -msgid "Prusa i3 MK2.5 OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK2.5S OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK3 OK." -msgstr "" - -# MSG_SETTINGS -#: messages.c:82 -msgid "Settings" -msgstr "Einstellungen" - -# MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 -msgid "Show end stops" -msgstr "Endschalter Status" - -# -#: ultralcd.cpp:4004 -msgid "Sensor state" -msgstr "Sensorstatus" - -# MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 -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 -#: messages.c:120 -msgid "Sort" -msgstr "Sort." - -# MSG_NONE -#: messages.c:110 -msgid "None" -msgstr "Ohne" - -# MSG_SORT_TIME -#: messages.c:121 -msgid "Time" -msgstr "Zeit" - -# -#: ultralcd.cpp:3035 -msgid "Severe skew:" -msgstr "Schwer.Schr:" - -# MSG_SORT_ALPHA -#: messages.c:122 -msgid "Alphabet" -msgstr "" - -# MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 -msgid "Sorting files" -msgstr "Sortiere Dateien" - -# MSG_SOUND_LOUD -#: messages.c:125 -msgid "Loud" -msgstr "Laut" - -# -#: ultralcd.cpp:3034 -msgid "Slight skew:" -msgstr "Leicht.Schr:" - -# MSG_SOUND -#: messages.c:124 -msgid "Sound" -msgstr "Ton" - -# c=7 -#: ultralcd.cpp:1822 -msgid "Runouts" -msgstr "" - -# -#: Marlin_main.cpp:5115 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." - -# MSG_SOUND_ONCE -#: messages.c:126 -msgid "Once" -msgstr "Einmal" - -# MSG_SPEED -#: ultralcd.cpp:7151 -msgid "Speed" -msgstr "Geschwindigkeit" - -# MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 -msgid "Spinning" -msgstr "Dreht sich" - -# MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 -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:7010 -msgid "Statistics " -msgstr "Statistiken " - -# MSG_STOP_PRINT -#: messages.c:91 -msgid "Stop print" -msgstr "Druck abbrechen" - -# MSG_STOPPED -#: messages.c:92 -msgid "STOPPED. " -msgstr "GESTOPPT." - -# MSG_SUPPORT -#: ultralcd.cpp:7019 -msgid "Support" -msgstr "" - -# MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 -msgid "Swapped" -msgstr "Ausgetauscht" - -# -#: ultralcd.cpp:4810 -msgid "Select filament:" -msgstr "Filament auswaehlen:" - -# MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 -msgid "Temp. cal." -msgstr "Temp Kalib." - -# -#: ultralcd.cpp:4951 -msgid "Select temperature which matches your material." -msgstr "Waehlen Sie die Temperatur, die zu Ihrem Material passt." - -# MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 -msgid "Temp. calibration" -msgstr "Temp. kalibrieren" - -# MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 -msgid "Temperature calibration failed" -msgstr "Temperaturkalibrierung fehlgeschlagen" - -# MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 -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." - -# c=20 r=3 -#: ultralcd.cpp:7590 -msgid "Sensor verified, remove the filament now." -msgstr "Sensor ueberprueft, entladen Sie jetzt das Filament." - -# MSG_TEMPERATURE -#: ultralcd.cpp:5765 -msgid "Temperature" -msgstr "Temperatur" - -# MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 -msgid "Temperatures" -msgstr "Temperaturen" - -# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 -msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." - -# -#: ultralcd.cpp:2889 -msgid "Total filament" -msgstr "Gesamtes Filament" - -# -#: ultralcd.cpp:2890 -msgid "Total print time" -msgstr "Gesamte Druckzeit" - -# MSG_TUNE -#: ultralcd.cpp:6882 -msgid "Tune" -msgstr "Feineinstellung" - -# -#: -msgid "Unload" -msgstr "Entladen" - -# -#: ultralcd.cpp:1752 -msgid "Total failures" -msgstr "Gesamte Fehler" - -# -#: ultralcd.cpp:2287 -msgid "to load filament" -msgstr "Filament laden" - -# -#: ultralcd.cpp:2291 -msgid "to unload filament" -msgstr "Filament entladen" - -# MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 -msgid "Unload filament" -msgstr "Filament entladen" - -# MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 -msgid "Unloading filament" -msgstr "Filament auswerfen" - -# -#: ultralcd.cpp:1705 -msgid "Total" -msgstr "Gesamt" - -# MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 -msgid "Used during print" -msgstr "Beim Druck benutzt" - -# MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 -msgid "Voltages" -msgstr "Spannungen" - -# -#: ultralcd.cpp:2184 -msgid "unknown" -msgstr "unbekannt" - -# MSG_USERWAIT -#: Marlin_main.cpp:5525 -msgid "Wait for user..." -msgstr "Warte auf Benutzer.." - -# MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 -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:3393 -msgid "Waiting for PINDA probe cooling" -msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" - -# -#: -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:1525 -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:1517 -msgid "Warning: motherboard type changed." -msgstr "Warnung: Platinentyp wurde geaendert." - -# MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 -msgid "Warning: printer type changed." -msgstr "Warnung: Druckertyp wurde geaendert." - -# MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 -msgid "Was filament unload successful?" -msgstr "Konnten Sie das Filament entnehmen?" - -# MSG_SELFTEST_WIRINGERROR -#: messages.c:81 -msgid "Wiring error" -msgstr "Verdrahtungsfehler" - -# MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 -msgid "Wizard" -msgstr "Assistent" - -# MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 -msgid "XYZ cal. details" -msgstr "XYZ Kal. Details" - -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:18 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." - -# MSG_YES -#: messages.c:102 -msgid "Yes" -msgstr "Ja" - -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 -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:3902 -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:3899 -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_TIMEOUT c=12 -#: messages.c:137 -msgid "Timeout" -msgstr "Verzoegerung" - -# MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 -msgid "X-correct:" -msgstr "X-Korrektur:" - -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 -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:3880 -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:3883 -msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 -msgid "Load all" -msgstr "Alle laden" - -# -#: ultralcd.cpp:3862 -msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." - -# -#: ultralcd.cpp:3868 -msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." - -# -#: ultralcd.cpp:3871 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." - -# -#: ultralcd.cpp:2989 -msgid "Y distance from min" -msgstr "Y Entfernung vom Min" - -# -#: ultralcd.cpp:4954 -msgid "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)." -msgstr "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)." - -# c=20 r=5 -#: ultralcd.cpp:7594 -msgid "Verification failed, remove the filament and try again." -msgstr "Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut." - -# MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 -msgid "Y-correct:" -msgstr "Y-Korrektur:" - -# MSG_OFF -#: messages.c:105 -msgid "Off" -msgstr "Aus" - -# MSG_ON -#: messages.c:106 -msgid "On" -msgstr "An" - -# -#: messages.c:53 -msgid "Back" -msgstr "Zurueck" - -# -#: ultralcd.cpp:5742 -msgid "Checks" -msgstr "Kontrolle" - -# -#: ultralcd.cpp:8395 -msgid "False triggering" -msgstr "Falschtriggerung" - -# -#: ultralcd.cpp:4009 -msgid "FINDA:" -msgstr "" - -# MSG_FIRMWARE -#: language.h:23 -msgid "Firmware" -msgstr "" - -# MSG_STRICT -#: messages.c:112 -msgid "Strict" -msgstr "Strikt" - -# MSG_WARN -#: messages.c:111 -msgid "Warn" -msgstr "Warnen" - -# -#: messages.c:83 -msgid "HW Setup" -msgstr "HW Einstellungen" - -# -#: ultralcd.cpp:4013 -msgid "IR:" -msgstr "" - -# MSG_MAGNETS_COMP -#: messages.c:130 -msgid "Magnets comp." -msgstr "Magnet Komp." - -# MSG_MESH -#: messages.c:128 -msgid "Mesh" -msgstr "Gitter" - -# -#: ultralcd.cpp:5789 -msgid "Mesh bed leveling" -msgstr "MeshBett Ausgleich" - -# -#: Marlin_main.cpp:877 -msgid "MK3S firmware detected on MK3 printer" -msgstr "MK3S-Firmware auf MK3-Drucker erkannt" - -# MSG_MMU_MODE -#: messages.c:117 -msgid "MMU Mode" -msgstr "MMU Modus" - -# -#: ultralcd.cpp:4490 -msgid "Mode change in progress ..." -msgstr "Moduswechsel erfolgt..." - -# MSG_MODEL -#: messages.c:113 -msgid "Model" -msgstr "Modell" - -# MSG_NOZZLE_DIAMETER -#: messages.c:116 -msgid "Nozzle d." -msgstr "Duese D." - -# -#: util.cpp:514 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-Code ist fuer einen anderen Level geslict. Fortfahren?" - -# -#: util.cpp:520 -msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." -msgstr "G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." - -# -#: util.cpp:431 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" - -# -#: util.cpp:437 -msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -msgstr "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." - -# -#: util.cpp:481 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" - -# -#: util.cpp:487 -msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." - -# -#: ultralcd.cpp:4005 -msgid "PINDA:" -msgstr "" - -# c=20 -#: ultralcd.cpp:2443 -msgid "Preheating to cut" -msgstr "Heizen zum Schnitt" - -# c=20 -#: ultralcd.cpp:2440 -msgid "Preheating to eject" -msgstr "Heizen zum Auswurf" - -# -#: util.cpp:394 -msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" - -# -#: util.cpp:401 -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." - -# c=20 -#: ultralcd.cpp:8401 -msgid "%s level expected" -msgstr "" - -# -#: ultralcd.cpp:6846 -msgid "Rename" -msgstr "Umbenennen" - -# -#: ultralcd.cpp:6839 -msgid "Select" -msgstr "Auswahl" - -# -#: ultralcd.cpp:2202 -msgid "Sensor info" -msgstr "Sensor Info" - -# MSG_SHEET c=10 -#: messages.c:54 -msgid "Sheet" -msgstr "Stahlblech" - -# MSG_SOUND_BLIND -#: messages.c:127 -msgid "Assist" -msgstr "" - -# c=18 -#: ultralcd.cpp:5740 -msgid "Steel sheets" -msgstr "Stahlbleche" - -# MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 -msgid "Z-correct:" -msgstr "Z-Korrektur:" - -# MSG_Z_PROBE_NR -#: messages.c:129 -msgid "Z-probe nr." -msgstr "" - +# Translation of Prusa-Firmware into German. +# +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Di 26. Jan 11:04:01 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:01 CET 2021\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +# +#: +msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +msgstr "[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen" + +# MSG_IR_03_OR_OLDER c=18 +#: messages.c:164 +msgid " 0.3 or older" +msgstr " 0.3 oder aelter" + +# c=18 +#: Marlin_main.cpp:9626 +msgid "FS v0.3 or older" +msgstr "FS 0.3 oder aelter" + +# MSG_IR_04_OR_NEWER c=18 +#: messages.c:163 +msgid " 0.4 or newer" +msgstr " 0.4 oder neuer" + +# c=18 +#: Marlin_main.cpp:9625 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 oder neuer" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:165 +msgid "unknown state" +msgstr "Status unbekannt" + +# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 +#: messages.c:43 +msgid " of 4" +msgstr " von 4" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 +#: messages.c:66 +msgid " of 9" +msgstr " von 9" + +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:2988 +msgid "[0;0] point offset" +msgstr "[0;0] Punktversatz" + +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +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 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus" + +# +#: ultralcd.cpp:2410 +msgid ">Cancel" +msgstr ">Abbruch" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3108 +msgid "Adjusting Z:" +msgstr "Z Anpassen:" + +# MSG_SELFTEST_CHECK_ALLCORRECT c=20 +#: ultralcd.cpp:8390 +msgid "All correct " +msgstr "Alles richtig " + +# MSG_WIZARD_DONE c=20 r=8 +#: messages.c:116 +msgid "All is done. Happy printing!" +msgstr "Alles abgeschlossen. Viel Spass beim Drucken!" + +# +#: ultralcd.cpp:1902 +msgid "Ambient" +msgstr "Raumtemp." + +# MSG_AUTO c=6 +#: messages.c:160 +msgid "Auto" +msgstr "" + +# MSG_PRESS c=20 r=2 +#: ultralcd.cpp:2567 +msgid "and press the knob" +msgstr "und Knopf druecken" + +# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#: ultralcd.cpp:3429 +msgid "Are left and right Z~carriages all up?" +msgstr "Sind linke+rechte Z- Schlitten ganz oben?" + +# MSG_AUTO_DEPLETE c=17 r=1 +#: messages.c:125 +msgid "SpoolJoin" +msgstr "" + +# MSG_AUTO_HOME +#: messages.c:11 +msgid "Auto home" +msgstr "Startposition" + +# MSG_AUTOLOAD_FILAMENT c=18 +#: ultralcd.cpp:6716 +msgid "AutoLoad filament" +msgstr "AutoLaden Filament" + +# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +#: ultralcd.cpp:4346 +msgid "Autoloading filament available only when filament sensor is turned on..." +msgstr "Automatisches Laden Filament nur bei eingeschaltetem Fil. sensor verfuegbar..." + +# MSG_AUTOLOADING_ENABLED c=20 r=4 +#: ultralcd.cpp:2730 +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:8073 +msgid "Axis length" +msgstr "Achsenlaenge" + +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:8074 +msgid "Axis" +msgstr "Achse" + +# MSG_SELFTEST_BEDHEATER +#: ultralcd.cpp:8031 +msgid "Bed / Heater" +msgstr "Bett / Heizung" + +# MSG_BED_DONE +#: messages.c:15 +msgid "Bed done" +msgstr "Bett OK" + +# MSG_BED_HEATING +#: messages.c:16 +msgid "Bed Heating" +msgstr "Bett aufwaermen" + +# MSG_BED_CORRECTION_MENU +#: ultralcd.cpp:5802 +msgid "Bed level correct" +msgstr "Ausgleich Bett ok" + +# MSG_BELTTEST c=17 +#: ultralcd.cpp:5782 +msgid "Belt test " +msgstr "Riementest " + +# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 +#: messages.c:17 +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_BRIGHT c=6 +#: messages.c:158 +msgid "Bright" +msgstr "Hell" + +# MSG_BRIGHTNESS c=18 +#: messages.c:154 +msgid "Brightness" +msgstr "Helligkeit" + +# MSG_BED +#: messages.c:14 +msgid "Bed" +msgstr "Bett" + +# MSG_BELT_STATUS c=18 +#: +msgid "Belt status" +msgstr "Gurtstatus" + +# MSG_RECOVER_PRINT c=20 r=2 +#: messages.c:80 +msgid "Blackout occurred. Recover print?" +msgstr "Stromausfall! Druck wiederherstellen?" + +# +#: ultralcd.cpp:8392 +msgid "Calibrating home" +msgstr "Kalibriere Start" + +# MSG_CALIBRATE_BED +#: ultralcd.cpp:5791 +msgid "Calibrate XYZ" +msgstr "Kalibrierung XYZ" + +# MSG_HOMEYZ +#: messages.c:51 +msgid "Calibrate Z" +msgstr "Kalibrierung Z" + +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4538 +msgid "Calibrate" +msgstr "Kalibrieren" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 +#: ultralcd.cpp:3392 +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." + +# MSG_CALIBRATE_Z_AUTO c=20 r=2 +#: messages.c:20 +msgid "Calibrating Z" +msgstr "Kalibrierung Z" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 +#: ultralcd.cpp:3392 +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:813 +msgid "Calibration done" +msgstr "Kalibrierung OK" + +# MSG_MENU_CALIBRATION +#: messages.c:67 +msgid "Calibration" +msgstr "Kalibrierung" + +# +#: ultralcd.cpp:4716 +msgid "Cancel" +msgstr "Abbruch" + +# MSG_SD_REMOVED +#: ultralcd.cpp:8842 +msgid "Card removed" +msgstr "SD Karte entfernt" + +# MSG_NOT_COLOR +#: ultralcd.cpp:2647 +msgid "Color not correct" +msgstr "Falsche Farbe" + +# MSG_COOLDOWN +#: messages.c:25 +msgid "Cooldown" +msgstr "Abkuehlen" + +# +#: ultralcd.cpp:4471 +msgid "Copy selected language?" +msgstr "Gewaehlte Sprache kopieren?" + +# MSG_CRASHDETECT c=13 +#: messages.c:28 +msgid "Crash det." +msgstr "Crash Erk." + +# +#: ultralcd.cpp:4851 +msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." +msgstr "Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus." + +# MSG_CRASH_DETECTED c=20 r=1 +#: messages.c:27 +msgid "Crash detected." +msgstr "Crash erkannt." + +# +#: Marlin_main.cpp:657 +msgid "Crash detected. Resume print?" +msgstr "Crash erkannt. Druck fortfuehren?" + +# MSG_CRASH c=7 +#: messages.c:26 +msgid "Crash" +msgstr "" + +# MSG_CURRENT c=19 r=1 +#: ultralcd.cpp:5933 +msgid "Current" +msgstr "Aktuelles" + +# MSG_DATE c=17 r=1 +#: ultralcd.cpp:2112 +msgid "Date:" +msgstr "Datum:" + +# MSG_DISABLE_STEPPERS +#: ultralcd.cpp:5683 +msgid "Disable steppers" +msgstr "Motoren aus" + +# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 +#: messages.c:13 +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 "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_FS_CONTINUE c=5 +#: messages.c:152 +msgid "Cont." +msgstr "" + +# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 +#: ultralcd.cpp:5026 +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=13 +#: ultralcd.cpp:5095 +msgid "E-correct:" +msgstr "E-Korrektur:" + +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 +msgid "Eject filament" +msgstr "Filamentauswurf" + +# MSG_EJECTING_FILAMENT c=20 r=1 +#: mmu.cpp:1414 +msgid "Ejecting filament" +msgstr "werfe Filament aus" + +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 +#: ultralcd.cpp:8049 +msgid "Endstop not hit" +msgstr "Ende nicht getroffen" + +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:8044 +msgid "Endstop" +msgstr "Endanschlag" + +# MSG_SELFTEST_ENDSTOPS +#: ultralcd.cpp:8035 +msgid "Endstops" +msgstr "Endschalter" + +# MSG_STACK_ERROR c=20 r=4 +#: ultralcd.cpp:6753 +msgid "Error - static memory has been overwritten" +msgstr "Fehler - statischer Speicher wurde ueberschrieben" + +# MSG_CUT_FILAMENT c=16 +#: messages.c:59 +msgid "Cut filament" +msgstr "Fil. schneiden" + +# MSG_CUTTER c=9 +#: messages.c:126 +msgid "Cutter" +msgstr "Messer" + +# c=18 +#: mmu.cpp:1386 +msgid "Cutting filament" +msgstr "Schneide filament" + +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4359 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." + +# MSG_DIM c=6 +#: messages.c:159 +msgid "Dim" +msgstr "Dimm" + +# MSG_ERROR +#: messages.c:29 +msgid "ERROR:" +msgstr "FEHLER:" + +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8398 +msgid "Extruder fan:" +msgstr "Extruder Luefter:" + +# MSG_INFO_EXTRUDER c=18 +#: ultralcd.cpp:2153 +msgid "Extruder info" +msgstr "Extruder Info" + +# MSG_EXTRUDER c=17 +#: messages.c:30 +msgid "Extruder" +msgstr "" + +# +#: ultralcd.cpp:6740 +msgid "Fail stats MMU" +msgstr "MMU-Fehler" + +# MSG_FSENSOR_AUTOLOAD c=13 +#: messages.c:47 +msgid "F. autoload" +msgstr "F. autoladen" + +# +#: ultralcd.cpp:6737 +msgid "Fail stats" +msgstr "Fehlerstatistik" + +# MSG_FAN_SPEED c=14 +#: messages.c:34 +msgid "Fan speed" +msgstr "Luefter-Tempo" + +# MSG_SELFTEST_FAN c=20 +#: messages.c:89 +msgid "Fan test" +msgstr "Lueftertest" + +# MSG_FANS_CHECK c=13 +#: messages.c:31 +msgid "Fans check" +msgstr "Luefter Chk." + +# MSG_FSENSOR +#: messages.c:48 +msgid "Fil. sensor" +msgstr "Fil. Sensor" + +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fil. Maengel " + +# MSG_FILAMENT_CLEAN c=20 r=2 +#: messages.c:35 +msgid "Filament extruding & with correct color?" +msgstr "Filament extrudiert mit richtiger Farbe?" + +# MSG_NOT_LOADED c=19 +#: ultralcd.cpp:2646 +msgid "Filament not loaded" +msgstr "Fil. nicht geladen" + +# MSG_FILAMENT_SENSOR c=20 +#: messages.c:95 +msgid "Filament sensor" +msgstr "Filamentsensor" + +# MSG_FILAMENT_USED c=19 +#: ultralcd.cpp:2795 +msgid "Filament used" +msgstr "Filament benutzt" + +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2796 +msgid "Print time" +msgstr "Druckzeit" + +# MSG_FS_ACTION c=10 +#: messages.c:151 +msgid "FS Action" +msgstr "FS Aktion" + +# MSG_FILE_INCOMPLETE c=20 r=3 +#: ultralcd.cpp:8540 +msgid "File incomplete. Continue anyway?" +msgstr "Datei unvollstaendig Trotzdem fortfahren?" + +# MSG_FINISHING_MOVEMENTS c=20 +#: messages.c:44 +msgid "Finishing movements" +msgstr "Bewegung beenden" + +# MSG_V2_CALIBRATION c=18 +#: messages.c:120 +msgid "First layer cal." +msgstr "Erste-Schicht Kal." + +# MSG_WIZARD_SELFTEST c=20 r=8 +#: ultralcd.cpp:4947 +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:726 +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:6880 +msgid "Flow" +msgstr "Durchfluss" + +# MSG_PRUSA3D_FORUM +#: ultralcd.cpp:2105 +msgid "forum.prusa3d.com" +msgstr "" + +# MSG_SELFTEST_COOLING_FAN c=20 +#: messages.c:86 +msgid "Front print fan?" +msgstr "Vorderer Luefter?" + +# MSG_BED_CORRECTION_FRONT c=14 r=1 +#: ultralcd.cpp:3190 +msgid "Front side[um]" +msgstr "Vorne [um]" + +# MSG_SELFTEST_FANS +#: ultralcd.cpp:8079 +msgid "Front/left fans" +msgstr "Vorderer/linke Luefter" + +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:8027 +msgid "Heater/Thermistor" +msgstr "Heizung/Thermistor" + +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:9616 +msgid "Heating disabled by safety timer." +msgstr "Heizung durch Sicherheitstimer deaktiviert." + +# MSG_HEATING_COMPLETE c=20 +#: messages.c:50 +msgid "Heating done." +msgstr "Aufwaermen OK." + +# MSG_HEATING +#: messages.c:49 +msgid "Heating" +msgstr "Aufwaermen" + +# MSG_WIZARD_WELCOME c=20 r=7 +#: ultralcd.cpp:4926 +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:2106 +msgid "howto.prusa3d.com" +msgstr "" + +# MSG_FILAMENTCHANGE +#: messages.c:41 +msgid "Change filament" +msgstr "Filament-Wechsel" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2576 +msgid "Change success!" +msgstr "Wechsel erfolgr.!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2644 +msgid "Changed correctly?" +msgstr "Wechsel ok?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:92 +msgid "Checking bed " +msgstr "Pruefe Bett " + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8381 +msgid "Checking endstops" +msgstr "Pruefe Endschalter" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8387 +msgid "Checking hotend " +msgstr "Pruefe Duese " + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:93 +msgid "Checking sensors " +msgstr "Pruefe Sensoren " + +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Pruefe X Achse" + +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Pruefe Y Achse" + +# MSG_SELFTEST_CHECK_Z c=20 +#: +msgid "Checking Z axis" +msgstr "Pruefe Z Achse" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:52 +msgid "Choose extruder:" +msgstr "Extruder waehlen:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:53 +msgid "Choose filament:" +msgstr "Waehle Filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:33 +msgid "Filament" +msgstr "" + +# MSG_WIZARD_XYZ_CAL c=20 r=8 +#: ultralcd.cpp:4956 +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:4964 +msgid "I will run z calibration now." +msgstr "Ich werde jetzt die Z Kalibrierung durchfuehren." + +# MSG_WATCH +#: messages.c:114 +msgid "Info screen" +msgstr "Infoanzeige" + +# MSG_INSERT_FILAMENT c=20 +#: ultralcd.cpp:2564 +msgid "Insert filament" +msgstr "Filament einlegen" + +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 +msgid "Is filament loaded?" +msgstr "Ist das Filament geladen?" + +# MSG_STEEL_SHEET_CHECK c=20 r=2 +#: messages.c:107 +msgid "Is steel sheet on heatbed?" +msgstr "Liegt das Stahlblech auf dem Heizbett?" + +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 +msgid "Last print failures" +msgstr "Letzte Druckfehler" + +# +#: ultralcd.cpp:5034 +msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +msgstr "Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche." + +# MSG_LAST_PRINT c=18 +#: messages.c:54 +msgid "Last print" +msgstr "Letzter Druck" + +# MSG_SELFTEST_EXTRUDER_FAN c=20 +#: messages.c:87 +msgid "Left hotend fan?" +msgstr "Linker Luefter?" + +# +#: ultralcd.cpp:2919 +msgid "Left" +msgstr "Links" + +# MSG_BED_CORRECTION_LEFT c=14 r=1 +#: ultralcd.cpp:3188 +msgid "Left side [um]" +msgstr "Links [um]" + +# +#: ultralcd.cpp:5706 +msgid "Lin. correction" +msgstr "Lineare Korrektur" + +# MSG_BABYSTEP_Z +#: messages.c:12 +msgid "Live adjust Z" +msgstr "Z einstellen" + +# c=20 r=6 +#: ultralcd.cpp:7280 +msgid "Insert the filament (do not load it) into the extruder and then press the knob." +msgstr "Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf." + +# MSG_LOAD_FILAMENT c=17 +#: messages.c:56 +msgid "Load filament" +msgstr "Filament laden" + +# MSG_LOADING_COLOR +#: ultralcd.cpp:2598 +msgid "Loading color" +msgstr "Lade Farbe" + +# MSG_LOADING_FILAMENT c=20 +#: messages.c:57 +msgid "Loading filament" +msgstr "Filament laedt" + +# MSG_LOOSE_PULLEY c=20 r=1 +#: ultralcd.cpp:8067 +msgid "Loose pulley" +msgstr "Lose Riemenscheibe" + +# +#: ultralcd.cpp:6699 +msgid "Load to nozzle" +msgstr "In Druckduese laden" + +# MSG_M117_V2_CALIBRATION c=25 +#: messages.c:60 +msgid "M117 First layer cal." +msgstr "M117 Erste-Schicht Kal." + +# MSG_MAIN +#: messages.c:61 +msgid "Main" +msgstr "Hauptmenue" + +# MSG_BL_HIGH c=12 +#: messages.c:155 +msgid "Level Bright" +msgstr "Hell.wert" + +# MSG_BL_LOW c=12 +#: messages.c:156 +msgid "Level Dimmed" +msgstr "Dimmwert" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 +#: messages.c:65 +msgid "Measuring reference height of calibration point" +msgstr "Messen der Referenzhoehe des Kalibrierpunktes" + +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 +msgid "Mesh Bed Leveling" +msgstr "MeshBett Ausgleich" + +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:764 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Position wiederherstellen..." + +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:757 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Temperatur wiederherstellen..." + +# +#: ultralcd.cpp:2960 +msgid "Measured skew" +msgstr "Schraeglauf" + +# MSG_MMU_FAILS c=14 +#: messages.c:68 +msgid "MMU fails" +msgstr "MMU Fehler" + +# +#: mmu.cpp:1586 +msgid "MMU load failed " +msgstr "MMU Ladefehler" + +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 +msgid "MMU load fails" +msgstr "MMU Ladefehler" + +# MSG_MMU_OK_RESUMING c=20 r=4 +#: mmu.cpp:775 +msgid "MMU OK. Resuming..." +msgstr "MMU OK. Weiterdrucken..." + +# MSG_MODE +#: messages.c:101 +msgid "Mode" +msgstr "Modus" + +# c=20 r=3 +#: Marlin_main.cpp:934 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3-Firmware am MK3S-Drucker erkannt" + +# MSG_NORMAL +#: messages.c:105 +msgid "Normal" +msgstr "" + +# MSG_SILENT +#: messages.c:104 +msgid "Silent" +msgstr "Leise" + +# +#: mmu.cpp:721 +msgid "MMU needs user attention." +msgstr "MMU erfordert Benutzereingriff." + +# +#: ultralcd.cpp:1701 +msgid "MMU power fails" +msgstr "MMU Netzfehler" + +# MSG_STEALTH +#: messages.c:106 +msgid "Stealth" +msgstr "" + +# MSG_AUTO_POWER +#: messages.c:103 +msgid "Auto power" +msgstr "Auto Leist" + +# MSG_HIGH_POWER +#: messages.c:102 +msgid "High power" +msgstr "Hohe leist" + +# +#: ultralcd.cpp:2124 +msgid "MMU2 connected" +msgstr "MMU2 verbunden" + +# MSG_SELFTEST_MOTOR +#: messages.c:94 +msgid "Motor" +msgstr "" + +# MSG_MOVE_AXIS +#: ultralcd.cpp:5681 +msgid "Move axis" +msgstr "Achse bewegen" + +# MSG_MOVE_X +#: ultralcd.cpp:4262 +msgid "Move X" +msgstr "Bewege X" + +# MSG_MOVE_Y +#: ultralcd.cpp:4263 +msgid "Move Y" +msgstr "Bewege Y" + +# MSG_MOVE_Z +#: ultralcd.cpp:4264 +msgid "Move Z" +msgstr "Bewege Z" + +# MSG_NO_MOVE +#: Marlin_main.cpp:5719 +msgid "No move." +msgstr "Keine Bewegung." + +# MSG_NO_CARD +#: ultralcd.cpp:6673 +msgid "No SD card" +msgstr "Keine SD Karte" + +# MSG_NA +#: messages.c:124 +msgid "N/A" +msgstr "N/V" + +# MSG_NO +#: messages.c:70 +msgid "No" +msgstr "Nein" + +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:8028 +msgid "Not connected" +msgstr "Nicht angeschlossen" + +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Neue Firmware- Version verfuegbar:" + +# MSG_SELFTEST_FAN_NO c=19 +#: messages.c:90 +msgid "Not spinning" +msgstr "Dreht sich nicht" + +# MSG_WIZARD_V2_CAL c=20 r=8 +#: ultralcd.cpp:4847 +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:4972 +msgid "Now I will preheat nozzle for PLA." +msgstr "Jetzt werde ich die Duese fuer PLA vorheizen." + +# MSG_NOZZLE +#: messages.c:71 +msgid "Nozzle" +msgstr "Duese" + +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 +#: Marlin_main.cpp:1581 +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:4963 +msgid "Now remove the test print from steel sheet." +msgstr "Testdruck jetzt von Stahlblech entfernen." + +# +#: ultralcd.cpp:1600 +msgid "Nozzle FAN" +msgstr "Duesevent." + +# MSG_PAUSE_PRINT +#: ultralcd.cpp:6637 +msgid "Pause print" +msgstr "Druck pausieren" + +# MSG_PID_RUNNING c=20 r=1 +#: ultralcd.cpp:1485 +msgid "PID cal. " +msgstr "PID Kal. " + +# MSG_PID_FINISHED c=20 r=1 +#: ultralcd.cpp:1491 +msgid "PID cal. finished" +msgstr "PID Kalib. fertig" + +# MSG_PID_EXTRUDER c=17 r=1 +#: ultralcd.cpp:5803 +msgid "PID calibration" +msgstr "PID Kalibrierung" + +# MSG_PINDA_PREHEAT c=20 r=1 +#: ultralcd.cpp:843 +msgid "PINDA Heating" +msgstr "PINDA erwaermen" + +# MSG_PAPER c=20 r=10 +#: messages.c:72 +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:5029 +msgid "Please clean heatbed and then press the knob." +msgstr "Bitte reinigen Sie das Heizbett und druecken Sie dann den Knopf." + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:24 +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:8022 +msgid "Please check :" +msgstr "Bitte pruefe:" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:115 +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_CHECK_IDLER c=20 r=4 +#: Marlin_main.cpp:3317 +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:73 +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:77 +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:79 +msgid "Please pull out filament immediately" +msgstr "Bitte ziehen Sie das Filament sofort heraus" + +# MSG_EJECT_REMOVE c=20 r=4 +#: mmu.cpp:1420 +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:82 +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:4766 +msgid "Please run XYZ calibration first." +msgstr "Bitte zuerst XYZ Kalibrierung ausfuehren." + +# MSG_UPDATE_MMU2_FW c=20 r=4 +#: mmu.cpp:1340 +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:74 +msgid "Please wait" +msgstr "Bitte warten" + +# +#: ultralcd.cpp:4962 +msgid "Please remove shipping helpers first." +msgstr "Bitte zuerst Transportsicherungen entfernen." + +# MSG_PREHEAT_NOZZLE c=20 +#: messages.c:76 +msgid "Preheat the nozzle!" +msgstr "Duese vorheizen!" + +# MSG_PREHEAT +#: ultralcd.cpp:6615 +msgid "Preheat" +msgstr "Vorheizen" + +# MSG_WIZARD_HEATING c=20 r=3 +#: messages.c:117 +msgid "Preheating nozzle. Please wait." +msgstr "Vorheizen der Duese. Bitte warten." + +# c=14 +#: ultralcd.cpp:1905 +msgid "PINDA" +msgstr "" + +# +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Bitte aktualisieren." + +# MSG_PRESS_TO_PREHEAT c=20 r=4 +#: Marlin_main.cpp:11718 +msgid "Press knob to preheat nozzle and continue." +msgstr "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." + +# MSG_FS_PAUSE c=5 +#: fsensor.cpp:728 +msgid "Pause" +msgstr "" + +# MSG_POWER_FAILURES c=14 +#: messages.c:75 +msgid "Power failures" +msgstr "Netzfehler" + +# MSG_PRINT_ABORTED c=20 +#: messages.c:78 +msgid "Print aborted" +msgstr "Druck abgebrochen" + +# c=20 +#: ultralcd.cpp:2390 +msgid "Preheating to load" +msgstr "Heizen zum Laden" + +# c=20 +#: ultralcd.cpp:2395 +msgid "Preheating to unload" +msgstr "Heizen zum Entladen" + +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8401 +msgid "Print fan:" +msgstr "Druckvent.:" + +# MSG_CARD_MENU +#: messages.c:21 +msgid "Print from SD" +msgstr "Drucken von SD" + +# +#: ultralcd.cpp:2231 +msgid "Press the knob" +msgstr "Knopf druecken zum" + +# MSG_PRINT_PAUSED c=20 r=1 +#: ultralcd.cpp:1065 +msgid "Print paused" +msgstr "Druck pausiert" + +# +#: mmu.cpp:725 +msgid "Press the knob to resume nozzle temperature." +msgstr "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen" + +# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +#: messages.c:45 +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." + +# +#: ultralcd.cpp:1601 +msgid "Print FAN" +msgstr "Druckvent." + +# +#: ultralcd.cpp:4827 +msgid "Please insert filament into the extruder, then press the knob to load it." +msgstr "Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden." + +# +#: ultralcd.cpp:4822 +msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." +msgstr "Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden." + +# +#: ultralcd.cpp:4744 +msgid "Please load filament first." +msgstr "Bitte laden Sie zuerst das Filament." + +# MSG_PRUSA3D +#: ultralcd.cpp:2104 +msgid "prusa3d.com" +msgstr "" + +# MSG_BED_CORRECTION_REAR c=14 r=1 +#: ultralcd.cpp:3191 +msgid "Rear side [um]" +msgstr "Hinten [um]" + +# c=20 r=4 +#: ultralcd.cpp:7304 +msgid "Please unload the filament first, then repeat this action." +msgstr "Bitte entladen Sie erst das Filament und versuchen Sie es nochmal." + +# c=20 r=4 +#: ultralcd.cpp:7307 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist." + +# MSG_RECOVERING_PRINT c=20 +#: Marlin_main.cpp:11076 +msgid "Recovering print " +msgstr "Druck wiederherst " + +# MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#: mmu.cpp:832 +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." + +# c=20 +#: +msgid "Prusa i3 MK3S OK." +msgstr "" + +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5808 +msgid "Reset XYZ calibr." +msgstr "Reset XYZ Kalibr." + +# MSG_RESET c=14 +#: messages.c:83 +msgid "Reset" +msgstr "Ruecksetzen" + +# MSG_RESUME_PRINT c=18 +#: messages.c:84 +msgid "Resume print" +msgstr "Druck fortsetzen" + +# MSG_RESUMING_PRINT c=20 +#: messages.c:85 +msgid "Resuming print" +msgstr "Druck fortgesetzt" + +# MSG_BED_CORRECTION_RIGHT c=14 r=1 +#: ultralcd.cpp:3189 +msgid "Right side[um]" +msgstr "Rechts [um]" + +# MSG_RPI_PORT +#: messages.c:142 +msgid "RPi port" +msgstr "" + +# MSG_WIZARD_RERUN c=20 r=7 +#: ultralcd.cpp:4765 +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_SD_CARD +#: messages.c:137 +msgid "SD card" +msgstr "SD Karte" + +# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +#: messages.c:138 +msgid "FlashAir" +msgstr "" + +# +#: ultralcd.cpp:2920 +msgid "Right" +msgstr "Rechts" + +# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 +#: messages.c:42 +msgid "Searching bed calibration point" +msgstr "Suche Bett Kalibrierpunkt" + +# MSG_LANGUAGE_SELECT +#: ultralcd.cpp:5721 +msgid "Select language" +msgstr "Waehle Sprache" + +# MSG_SELFTEST_OK +#: ultralcd.cpp:7579 +msgid "Self test OK" +msgstr "Selbsttest OK" + +# MSG_SELFTEST_START c=20 +#: ultralcd.cpp:7347 +msgid "Self test start " +msgstr "Selbsttest start " + +# MSG_SELFTEST +#: ultralcd.cpp:5784 +msgid "Selftest " +msgstr "Selbsttest " + +# MSG_SELFTEST_ERROR +#: ultralcd.cpp:8021 +msgid "Selftest error !" +msgstr "Selbsttest Fehler!" + +# MSG_SELFTEST_FAILED c=20 +#: messages.c:88 +msgid "Selftest failed " +msgstr "Selbsttest Error " + +# MSG_FORCE_SELFTEST c=20 r=8 +#: Marlin_main.cpp:1613 +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:5003 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht." + +# MSG_SET_TEMPERATURE c=19 r=1 +#: ultralcd.cpp:3209 +msgid "Set temperature:" +msgstr "Temp. einstellen:" + +# c=20 +#: +msgid "Prusa i3 MK2.5 OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK2.5S OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK3 OK." +msgstr "" + +# MSG_SETTINGS +#: messages.c:97 +msgid "Settings" +msgstr "Einstellungen" + +# MSG_SHOW_END_STOPS c=18 +#: ultralcd.cpp:5805 +msgid "Show end stops" +msgstr "Endschalter Status" + +# +#: ultralcd.cpp:3915 +msgid "Sensor state" +msgstr "Sensorstatus" + +# MSG_FILE_CNT c=20 r=6 +#: 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 +#: messages.c:139 +msgid "Sort" +msgstr "Sort." + +# MSG_NONE +#: messages.c:127 +msgid "None" +msgstr "Ohne" + +# MSG_SORT_TIME +#: messages.c:140 +msgid "Time" +msgstr "Zeit" + +# +#: ultralcd.cpp:2963 +msgid "Severe skew:" +msgstr "Schwer.Schr:" + +# MSG_SORT_ALPHA +#: messages.c:141 +msgid "Alphabet" +msgstr "" + +# MSG_SORTING c=20 r=1 +#: cardreader.cpp:746 +msgid "Sorting files" +msgstr "Sortiere Dateien" + +# MSG_SOUND_LOUD +#: messages.c:144 +msgid "Loud" +msgstr "Laut" + +# +#: ultralcd.cpp:2962 +msgid "Slight skew:" +msgstr "Leicht.Schr:" + +# MSG_SOUND +#: messages.c:143 +msgid "Sound" +msgstr "Ton" + +# c=7 +#: ultralcd.cpp:1768 +msgid "Runouts" +msgstr "" + +# +#: Marlin_main.cpp:5280 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." + +# MSG_SOUND_ONCE +#: messages.c:145 +msgid "Once" +msgstr "Einmal" + +# MSG_SPEED +#: ultralcd.cpp:6874 +msgid "Speed" +msgstr "Geschwindigkeit" + +# MSG_SELFTEST_FAN_YES c=19 +#: messages.c:91 +msgid "Spinning" +msgstr "Dreht sich" + +# MSG_TEMP_CAL_WARNING c=20 r=4 +#: Marlin_main.cpp:4779 +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:6733 +msgid "Statistics " +msgstr "Statistiken " + +# MSG_STOP_PRINT +#: messages.c:108 +msgid "Stop print" +msgstr "Druck abbrechen" + +# MSG_STOPPED +#: messages.c:109 +msgid "STOPPED. " +msgstr "GESTOPPT." + +# MSG_SUPPORT +#: ultralcd.cpp:6742 +msgid "Support" +msgstr "" + +# MSG_SELFTEST_SWAPPED +#: ultralcd.cpp:8080 +msgid "Swapped" +msgstr "Ausgetauscht" + +# +#: ultralcd.cpp:4715 +msgid "Select filament:" +msgstr "Filament auswaehlen:" + +# MSG_TEMP_CALIBRATION c=14 +#: messages.c:110 +msgid "Temp. cal." +msgstr "Temp Kalib." + +# +#: ultralcd.cpp:4856 +msgid "Select temperature which matches your material." +msgstr "Waehlen Sie die Temperatur, die zu Ihrem Material passt." + +# MSG_CALIBRATION_PINDA_MENU c=17 r=1 +#: ultralcd.cpp:5816 +msgid "Temp. calibration" +msgstr "Temp. kalibrieren" + +# MSG_TEMP_CAL_FAILED c=20 r=8 +#: ultralcd.cpp:3845 +msgid "Temperature calibration failed" +msgstr "Temperaturkalibrierung fehlgeschlagen" + +# MSG_TEMP_CALIBRATION_DONE c=20 r=12 +#: messages.c:111 +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." + +# c=20 r=3 +#: ultralcd.cpp:7311 +msgid "Sensor verified, remove the filament now." +msgstr "Sensor ueberprueft, entladen Sie jetzt das Filament." + +# MSG_TEMPERATURE +#: ultralcd.cpp:5679 +msgid "Temperature" +msgstr "Temperatur" + +# MSG_MENU_TEMPERATURES c=15 r=1 +#: ultralcd.cpp:2160 +msgid "Temperatures" +msgstr "Temperaturen" + +# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#: messages.c:46 +msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf." + +# +#: ultralcd.cpp:2817 +msgid "Total filament" +msgstr "Gesamtes Filament" + +# +#: ultralcd.cpp:2818 +msgid "Total print time" +msgstr "Gesamte Druckzeit" + +# MSG_TUNE +#: ultralcd.cpp:6612 +msgid "Tune" +msgstr "Feineinstellung" + +# +#: +msgid "Unload" +msgstr "Entladen" + +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 +msgid "Total failures" +msgstr "Gesamte Fehler" + +# +#: ultralcd.cpp:2238 +msgid "to load filament" +msgstr "Filament laden" + +# +#: ultralcd.cpp:2242 +msgid "to unload filament" +msgstr "Filament entladen" + +# MSG_UNLOAD_FILAMENT c=17 +#: messages.c:112 +msgid "Unload filament" +msgstr "Filament entladen" + +# MSG_UNLOADING_FILAMENT c=20 r=1 +#: messages.c:113 +msgid "Unloading filament" +msgstr "Filament auswerfen" + +# MSG_TOTAL c=6 +#: messages.c:98 +msgid "Total" +msgstr "Gesamt" + +# MSG_USED c=19 r=1 +#: ultralcd.cpp:5932 +msgid "Used during print" +msgstr "Beim Druck benutzt" + +# MSG_MENU_VOLTAGES c=15 r=1 +#: ultralcd.cpp:2163 +msgid "Voltages" +msgstr "Spannungen" + +# +#: ultralcd.cpp:2132 +msgid "unknown" +msgstr "unbekannt" + +# MSG_USERWAIT +#: Marlin_main.cpp:5689 +msgid "Wait for user..." +msgstr "Warte auf Benutzer.." + +# MSG_WAITING_TEMP c=20 r=3 +#: ultralcd.cpp:3357 +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:3318 +msgid "Waiting for PINDA probe cooling" +msgstr "Warten, bis PINDA- Sonde abgekuehlt ist" + +# +#: +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:1573 +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:1565 +msgid "Warning: motherboard type changed." +msgstr "Warnung: Platinentyp wurde geaendert." + +# MSG_CHANGED_PRINTER c=20 r=4 +#: Marlin_main.cpp:1569 +msgid "Warning: printer type changed." +msgstr "Warnung: Druckertyp wurde geaendert." + +# MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#: Marlin_main.cpp:3308 +msgid "Was filament unload successful?" +msgstr "Konnten Sie das Filament entnehmen?" + +# MSG_SELFTEST_WIRINGERROR +#: messages.c:96 +msgid "Wiring error" +msgstr "Verdrahtungsfehler" + +# MSG_WIZARD c=17 r=1 +#: ultralcd.cpp:5775 +msgid "Wizard" +msgstr "Assistent" + +# MSG_XYZ_DETAILS c=18 +#: ultralcd.cpp:2152 +msgid "XYZ cal. details" +msgstr "XYZ Kal. Details" + +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:18 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." + +# MSG_YES +#: messages.c:119 +msgid "Yes" +msgstr "Ja" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:118 +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:3817 +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:3814 +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_TIMEOUT c=12 +#: messages.c:157 +msgid "Timeout" +msgstr "Verzoegerung" + +# MSG_X_CORRECTION c=13 +#: ultralcd.cpp:5091 +msgid "X-correct:" +msgstr "X-Korrektur:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3811 +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:3795 +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:3798 +msgid "XYZ calibration compromised. Right front calibration point not reachable." +msgstr "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6171 +msgid "Load all" +msgstr "Alle laden" + +# +#: ultralcd.cpp:3777 +msgid "XYZ calibration failed. Bed calibration point was not found." +msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." + +# +#: ultralcd.cpp:3783 +msgid "XYZ calibration failed. Front calibration points not reachable." +msgstr "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." + +# +#: ultralcd.cpp:3786 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." + +# +#: ultralcd.cpp:2917 +msgid "Y distance from min" +msgstr "Y Entfernung vom Min" + +# +#: ultralcd.cpp:4859 +msgid "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)." +msgstr "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)." + +# c=20 r=5 +#: ultralcd.cpp:7315 +msgid "Verification failed, remove the filament and try again." +msgstr "Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut." + +# MSG_Y_CORRECTION c=13 +#: ultralcd.cpp:5092 +msgid "Y-correct:" +msgstr "Y-Korrektur:" + +# MSG_OFF +#: messages.c:122 +msgid "Off" +msgstr "Aus" + +# MSG_ON +#: messages.c:123 +msgid "On" +msgstr "An" + +# +#: messages.c:62 +msgid "Back" +msgstr "Zurueck" + +# +#: ultralcd.cpp:5647 +msgid "Checks" +msgstr "Kontrolle" + +# +#: ultralcd.cpp:8090 +msgid "False triggering" +msgstr "Falschtriggerung" + +# +#: ultralcd.cpp:3920 +msgid "FINDA:" +msgstr "" + +# MSG_FIRMWARE +#: language.h:24 +msgid "Firmware" +msgstr "" + +# MSG_STRICT +#: messages.c:129 +msgid "Strict" +msgstr "Strikt" + +# MSG_WARN +#: messages.c:128 +msgid "Warn" +msgstr "Warnen" + +# MSG_HW_SETUP c=18 +#: messages.c:100 +msgid "HW Setup" +msgstr "HW Einstellungen" + +# +#: ultralcd.cpp:3924 +msgid "IR:" +msgstr "" + +# MSG_MAGNETS_COMP +#: messages.c:150 +msgid "Magnets comp." +msgstr "Magnet Komp." + +# MSG_MESH +#: messages.c:147 +msgid "Mesh" +msgstr "Gitter" + +# +#: Marlin_main.cpp:927 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-Firmware auf MK3-Drucker erkannt" + +# MSG_MMU_MODE +#: messages.c:136 +msgid "MMU Mode" +msgstr "MMU Modus" + +# +#: ultralcd.cpp:4395 +msgid "Mode change in progress ..." +msgstr "Moduswechsel erfolgt..." + +# MSG_MODEL +#: messages.c:130 +msgid "Model" +msgstr "Modell" + +# MSG_NOZZLE_DIAMETER +#: messages.c:135 +msgid "Nozzle d." +msgstr "Duese D." + +# +#: util.cpp:514 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-Code ist fuer einen anderen Level geslict. Fortfahren?" + +# +#: util.cpp:520 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" + +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." + +# +#: util.cpp:481 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" + +# +#: util.cpp:487 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen." + +# +#: ultralcd.cpp:3916 +msgid "PINDA:" +msgstr "" + +# c=20 +#: ultralcd.cpp:2402 +msgid "Preheating to cut" +msgstr "Heizen zum Schnitt" + +# c=20 +#: ultralcd.cpp:2399 +msgid "Preheating to eject" +msgstr "Heizen zum Auswurf" + +# +#: util.cpp:394 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?" + +# +#: util.cpp:401 +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." + +# c=20 +#: ultralcd.cpp:8095 +msgid "%s level expected" +msgstr "" + +# +#: ultralcd.cpp:6574 +msgid "Rename" +msgstr "Umbenennen" + +# +#: ultralcd.cpp:6567 +msgid "Select" +msgstr "Auswahl" + +# +#: ultralcd.cpp:2154 +msgid "Sensor info" +msgstr "Sensor Info" + +# MSG_SHEET c=10 +#: messages.c:63 +msgid "Sheet" +msgstr "Stahlblech" + +# MSG_SOUND_BLIND +#: messages.c:146 +msgid "Assist" +msgstr "" + +# MSG_STEEL_SHEET c=18 +#: messages.c:64 +msgid "Steel sheets" +msgstr "Stahlbleche" + +# MSG_Z_CORRECTION c=13 +#: ultralcd.cpp:5093 +msgid "Z-correct:" +msgstr "Z-Korrektur:" + +# MSG_Z_PROBE_NR +#: messages.c:149 +msgid "Z-probe nr." +msgstr "" + diff --git a/lang/po/new/es.po b/lang/po/new/es.po index ce2fcdf3e..bce3ee8e0 100644 --- a/lang/po/new/es.po +++ b/lang/po/new/es.po @@ -1,1857 +1,1852 @@ -# Translation of Prusa-Firmware into Spanish. -# -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: es\n" -"Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri Sep 18 15:24:02 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:24:02 CEST 2020\n" -"Language-Team: \n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -# -#: -msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -msgstr "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" - -# MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 -msgid " 0.3 or older" -msgstr " 0.3 o mayor" - -# c=18 -#: Marlin_main.cpp:9463 -msgid "FS v0.3 or older" -msgstr "FS 0.3 o mayor" - -# MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 -msgid " 0.4 or newer" -msgstr " 0.4 o mas nueva" - -# c=18 -#: Marlin_main.cpp:9462 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 o mas nueva" - -# MSG_IR_UNKNOWN c=18 -#: messages.c:145 -msgid "unknown state" -msgstr "estado desconocido" - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 -msgid " of 4" -msgstr " de 4" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 -msgid " of 9" -msgstr " de 9" - -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 -msgid "[0;0] point offset" -msgstr "[0;0] punto offset" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: -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 -#: -msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" - -# -#: ultralcd.cpp:2451 -msgid ">Cancel" -msgstr ">Cancelar" - -# MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 -msgid "Adjusting Z:" -msgstr "Ajustar-Z:" - -# MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 -msgid "All correct " -msgstr "Todo bien" - -# MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 -msgid "All is done. Happy printing!" -msgstr "Terminado! Feliz impresion!" - -# -#: ultralcd.cpp:1956 -msgid "Ambient" -msgstr "Ambiente" - -# MSG_AUTO c=6 -#: messages.c:140 -msgid "Auto" -msgstr "" - -# MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 -msgid "and press the knob" -msgstr "Haz clic" - -# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 -msgid "Are left and right Z~carriages all up?" -msgstr "Carros Z izq./der. estan arriba maximo?" - -# MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 -msgid "SpoolJoin" -msgstr "" - -# MSG_AUTO_HOME -#: messages.c:11 -msgid "Auto home" -msgstr "Llevar al origen" - -# MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 -msgid "AutoLoad filament" -msgstr "Carga auto. filam." - -# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 -msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "La carga automatica solo funciona si el sensor de filamento esta activado..." - -# MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 -msgid "Autoloading filament is active, just press the knob and insert filament..." -msgstr "La carga automatica esta activada, pulse el dial e inserte el filamento..." - -# MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 -msgid "Axis length" -msgstr "Longitud del eje" - -# MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 -msgid "Axis" -msgstr "Eje" - -# MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 -msgid "Bed / Heater" -msgstr "Base / Calentador" - -# MSG_BED_DONE -#: messages.c:15 -msgid "Bed done" -msgstr "Base preparada" - -# MSG_BED_HEATING -#: messages.c:16 -msgid "Bed Heating" -msgstr "Calentando Base" - -# MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 -msgid "Bed level correct" -msgstr "Corr. de la cama" - -# MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 -msgid "Belt test " -msgstr "Test cinturon " - -# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 -#: messages.c:17 -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_BRIGHT c=6 -#: messages.c:138 -msgid "Bright" -msgstr "Brill." - -# MSG_BRIGHTNESS c=18 -#: messages.c:134 -msgid "Brightness" -msgstr "Brillo" - -# MSG_BED -#: messages.c:14 -msgid "Bed" -msgstr "Base" - -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 -msgid "Belt status" -msgstr "Estado de correa" - -# MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 -msgid "Blackout occurred. Recover print?" -msgstr "Se fue la luz. ?Reanudar la impresion?" - -# -#: ultralcd.cpp:8706 -msgid "Calibrating home" -msgstr "Calibrando posicion inicial" - -# MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 -msgid "Calibrate XYZ" -msgstr "Calibrar XYZ" - -# MSG_HOMEYZ -#: messages.c:44 -msgid "Calibrate Z" -msgstr "Calibrar Z" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 -msgid "Calibrate" -msgstr "Calibrar" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 -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." - -# MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 -msgid "Calibrating Z" -msgstr "Calibrando Z" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 -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:865 -msgid "Calibration done" -msgstr "Calibracion OK" - -# MSG_MENU_CALIBRATION -#: messages.c:57 -msgid "Calibration" -msgstr "Calibracion" - -# -#: ultralcd.cpp:4811 -msgid "Cancel" -msgstr "Cancelar" - -# MSG_SD_REMOVED -#: ultralcd.cpp:9142 -msgid "Card removed" -msgstr "Tarjeta retirada" - -# MSG_NOT_COLOR -#: ultralcd.cpp:2707 -msgid "Color not correct" -msgstr "Color no homogeneo" - -# MSG_COOLDOWN -#: messages.c:22 -msgid "Cooldown" -msgstr "Enfriar" - -# -#: ultralcd.cpp:4566 -msgid "Copy selected language?" -msgstr "Copiar idioma seleccionado?" - -# MSG_CRASHDETECT c=13 -#: messages.c:24 -msgid "Crash det." -msgstr "Det. choque" - -# -#: ultralcd.cpp:4946 -msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." -msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." - -# MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 -msgid "Crash detected." -msgstr "Choque detectado." - -# -#: Marlin_main.cpp:605 -msgid "Crash detected. Resume print?" -msgstr "Choque detectado. Continuar impresion?" - -# -#: ultralcd.cpp:1785 -msgid "Crash" -msgstr "Choque" - -# MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 -msgid "Current" -msgstr "Actual" - -# MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 -msgid "Date:" -msgstr "Fecha:" - -# MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 -msgid "Disable steppers" -msgstr "Apagar motores" - -# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: messages.c:13 -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 "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_FS_CONTINUE c=5 -#: messages.c:132 -msgid "Cont." -msgstr "" - -# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 -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=13 -#: ultralcd.cpp:5190 -msgid "E-correct:" -msgstr "Corregir-E:" - -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 -msgid "Eject filament" -msgstr "Expulsar fil." - -# MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 -msgid "Ejecting filament" -msgstr "Expulsando filamento" - -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 -msgid "Endstop not hit" -msgstr "Endstop no alcanzado" - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 -msgid "Endstop" -msgstr "" - -# MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 -msgid "Endstops" -msgstr "" - -# MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 -msgid "Error - static memory has been overwritten" -msgstr "Error - se ha sobre-escrito la memoria estatica" - -# MSG_CUT_FILAMENT c=16 -#: messages.c:50 -msgid "Cut filament" -msgstr "Cortar filament" - -# MSG_CUTTER c=9 -#: messages.c:109 -msgid "Cutter" -msgstr "Cuchillo" - -# c=18 -#: mmu.cpp:1388 -msgid "Cutting filament" -msgstr "Corte de filament" - -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." - -# MSG_DIM c=6 -#: messages.c:139 -msgid "Dim" -msgstr "" - -# MSG_ERROR -#: messages.c:25 -msgid "ERROR:" -msgstr "" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 -msgid "Extruder fan:" -msgstr "Vent.extrusor:" - -# MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 -msgid "Extruder info" -msgstr "Info. del extrusor" - -# MSG_MOVE_E -#: messages.c:26 -msgid "Extruder" -msgstr "Extruir" - -# -#: ultralcd.cpp:7017 -msgid "Fail stats MMU" -msgstr "Estadistica de fallos MMU" - -# MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 -msgid "F. autoload" -msgstr "Autocarg.fil." - -# -#: ultralcd.cpp:7014 -msgid "Fail stats" -msgstr "Estadistica de fallos" - -# MSG_FAN_SPEED c=14 -#: messages.c:28 -msgid "Fan speed" -msgstr "Velocidad Vent" - -# MSG_SELFTEST_FAN c=20 -#: messages.c:74 -msgid "Fan test" -msgstr "Test ventiladores" - -# MSG_FANS_CHECK -#: ultralcd.cpp:5777 -msgid "Fans check" -msgstr "Comprob.vent" - -# MSG_FSENSOR -#: messages.c:41 -msgid "Fil. sensor" -msgstr "Sensor Fil." - -# c=14 -#: ultralcd.cpp:1784 -msgid "Filam. runouts" -msgstr "Filam. acabado" - -# MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 -msgid "Filament extruding & with correct color?" -msgstr "Es nitido el color nuevo?" - -# MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 -msgid "Filament not loaded" -msgstr "Fil. no introducido" - -# MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 -msgid "Filament sensor" -msgstr "Sensor de filamento" - -# MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 -msgid "Filament used" -msgstr "Filamento usado" - -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 -msgid "Print time" -msgstr "Tiempo de imp.:" - -# MSG_FS_ACTION c=10 -#: messages.c:131 -msgid "FS Action" -msgstr "FS accion" - -# MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 -msgid "File incomplete. Continue anyway?" -msgstr "Archivo incompleto. ?Continuar de todos modos?" - -# MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 -msgid "Finishing movements" -msgstr "Term. movimientos" - -# MSG_V2_CALIBRATION c=18 -#: messages.c:103 -msgid "First layer cal." -msgstr "Cal. primera cap." - -# MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 -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:727 -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:7157 -msgid "Flow" -msgstr "Flujo" - -# MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 -msgid "forum.prusa3d.com" -msgstr "" - -# MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 -msgid "Front print fan?" -msgstr "Vent. frontal?" - -# MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 -msgid "Front side[um]" -msgstr "Frontal [um]" - -# MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 -msgid "Front/left fans" -msgstr "Ventiladores frontal/izquierdo" - -# MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 -msgid "Heater/Thermistor" -msgstr "Calentador/Termistor" - -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 -msgid "Heating disabled by safety timer." -msgstr "Calentadores desactivados por el temporizador de seguridad." - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:43 -msgid "Heating done." -msgstr "Calentando acabado." - -# MSG_HEATING -#: messages.c:42 -msgid "Heating" -msgstr "Calentando..." - -# MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 -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:2158 -msgid "howto.prusa3d.com" -msgstr "" - -# MSG_FILAMENTCHANGE -#: messages.c:34 -msgid "Change filament" -msgstr "Cambiar filamento" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 -msgid "Change success!" -msgstr "Cambio correcto" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 -msgid "Changed correctly?" -msgstr "Cambio correcto?" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 -msgid "Checking bed " -msgstr "Control base cal." - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 -msgid "Checking endstops" -msgstr "Control endstops" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 -msgid "Checking hotend " -msgstr "Control fusor" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 -msgid "Checking sensors " -msgstr "Comprobando sensores" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 -msgid "Checking X axis " -msgstr "Control sensor X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 -msgid "Checking Y axis " -msgstr "Control sensor Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 -msgid "Checking Z axis " -msgstr "Control sensor Z" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 -msgid "Choose extruder:" -msgstr "Elegir extrusor:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 -msgid "Choose filament:" -msgstr "Elije filamento:" - -# MSG_FILAMENT c=17 r=1 -#: messages.c:27 -msgid "Filament" -msgstr "Filamento" - -# MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 -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:5059 -msgid "I will run z calibration now." -msgstr "Voy a hacer Calibracion Z ahora." - -# MSG_WATCH -#: messages.c:97 -msgid "Info screen" -msgstr "Monitorizar" - -# MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 -msgid "Insert filament" -msgstr "Introducir filamento" - -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 -msgid "Is filament loaded?" -msgstr "Esta el filamento cargado?" - -# MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 -msgid "Is steel sheet on heatbed?" -msgstr "?Esta colocada la lamina sobre la base" - -# -#: ultralcd.cpp:1727 -msgid "Last print failures" -msgstr "Ultimas impresiones fallidas" - -# -#: ultralcd.cpp:5129 -msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -msgstr "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." - -# -#: ultralcd.cpp:1704 -msgid "Last print" -msgstr "Ultima impresion" - -# MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 -msgid "Left hotend fan?" -msgstr "Vent. izquierdo?" - -# -#: ultralcd.cpp:2991 -msgid "Left" -msgstr "Izquierda" - -# MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 -msgid "Left side [um]" -msgstr "Izquierda [um]" - -# -#: ultralcd.cpp:5792 -msgid "Lin. correction" -msgstr "Correccion de Linealidad" - -# MSG_BABYSTEP_Z -#: messages.c:12 -msgid "Live adjust Z" -msgstr "Micropaso Eje Z" - -# c=20 r=6 -#: ultralcd.cpp:7559 -msgid "Insert the filament (do not load it) into the extruder and then press the knob." -msgstr "Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial." - -# MSG_LOAD_FILAMENT c=17 -#: messages.c:47 -msgid "Load filament" -msgstr "Introducir filam." - -# MSG_LOADING_COLOR -#: ultralcd.cpp:2643 -msgid "Loading color" -msgstr "Cambiando color" - -# MSG_LOADING_FILAMENT c=20 -#: messages.c:48 -msgid "Loading filament" -msgstr "Introduciendo filam." - -# MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 -msgid "Loose pulley" -msgstr "Polea suelta" - -# -#: ultralcd.cpp:6976 -msgid "Load to nozzle" -msgstr "Cargar a la boquilla" - -# MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 -msgid "M117 First layer cal." -msgstr "M117 Cal. primera cap." - -# MSG_MAIN -#: messages.c:52 -msgid "Main" -msgstr "Menu principal" - -# MSG_BL_HIGH c=12 -#: messages.c:135 -msgid "Level Bright" -msgstr "Valor brill." - -# MSG_BL_LOW c=12 -#: messages.c:136 -msgid "Level Dimmed" -msgstr "" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 -msgid "Measuring reference height of calibration point" -msgstr "Midiendo altura del punto de calibracion" - -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 -msgid "Mesh Bed Leveling" -msgstr "Nivelacion Mesh Level" - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Restaurando posicion..." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Restaurando temperatura..." - -# -#: ultralcd.cpp:3032 -msgid "Measured skew" -msgstr "Desviacion med:" - -# -#: ultralcd.cpp:1728 -msgid "MMU fails" -msgstr "Fallos MMU" - -# -#: mmu.cpp:1588 -msgid "MMU load failed " -msgstr "Carga MMU fallida" - -# -#: ultralcd.cpp:1729 -msgid "MMU load fails" -msgstr "Carga MMU falla" - -# MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 -msgid "MMU OK. Resuming..." -msgstr "MMU OK. Resumiendo..." - -# MSG_MODE -#: messages.c:84 -msgid "Mode" -msgstr "Modo" - -# c=20 r=3 -#: Marlin_main.cpp:884 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Firmware MK3 detectado en impresora MK3S" - -# MSG_NORMAL -#: messages.c:88 -msgid "Normal" -msgstr "" - -# MSG_SILENT -#: messages.c:87 -msgid "Silent" -msgstr "Silencio" - -# -#: mmu.cpp:722 -msgid "MMU needs user attention." -msgstr "MMU necesita atencion del usuario." - -# -#: ultralcd.cpp:1755 -msgid "MMU power fails" -msgstr "Fallo de energia en MMU" - -# MSG_STEALTH -#: messages.c:89 -msgid "Stealth" -msgstr "Silencio" - -# MSG_AUTO_POWER -#: messages.c:86 -msgid "Auto power" -msgstr "Fuerza auto" - -# MSG_HIGH_POWER -#: messages.c:85 -msgid "High power" -msgstr "Rend.pleno" - -# -#: ultralcd.cpp:2176 -msgid "MMU2 connected" -msgstr "MMU2 conectado" - -# MSG_SELFTEST_MOTOR -#: messages.c:79 -msgid "Motor" -msgstr "" - -# MSG_MOVE_AXIS -#: ultralcd.cpp:5767 -msgid "Move axis" -msgstr "Mover ejes" - -# MSG_MOVE_X -#: ultralcd.cpp:4357 -msgid "Move X" -msgstr "Mover X" - -# MSG_MOVE_Y -#: ultralcd.cpp:4358 -msgid "Move Y" -msgstr "Mover Y" - -# MSG_MOVE_Z -#: ultralcd.cpp:4359 -msgid "Move Z" -msgstr "Mover Z" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5555 -msgid "No move." -msgstr "Sin movimiento" - -# MSG_NO_CARD -#: ultralcd.cpp:6943 -msgid "No SD card" -msgstr "No hay tarjeta SD" - -# MSG_NA -#: messages.c:107 -msgid "N/A" -msgstr "N/A" - -# MSG_NO -#: messages.c:58 -msgid "No" -msgstr "" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 -msgid "Not connected" -msgstr "No hay conexion " - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Nuevo firmware disponible:" - -# MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 -msgid "Not spinning" -msgstr "Ventilador no gira" - -# MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 -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:5067 -msgid "Now I will preheat nozzle for PLA." -msgstr "Ahora precalentare la boquilla para PLA." - -# MSG_NOZZLE -#: messages.c:59 -msgid "Nozzle" -msgstr "Boquilla" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 -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:5058 -msgid "Now remove the test print from steel sheet." -msgstr "Ahora retira la prueba de la lamina de acero." - -# -#: ultralcd.cpp:1654 -msgid "Nozzle FAN" -msgstr "Vent. capa" - -# MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 -msgid "Pause print" -msgstr "Pausar impresion" - -# MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 -msgid "PID cal. " -msgstr "Cal. PID " - -# MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 -msgid "PID cal. finished" -msgstr "Cal. PID terminada" - -# MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 -msgid "PID calibration" -msgstr "Calibracion PID" - -# MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 -msgid "PINDA Heating" -msgstr "Calentando PINDA" - -# MSG_PAPER c=20 r=10 -#: messages.c:60 -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:5124 -msgid "Please clean heatbed and then press the knob." -msgstr "Limpia la superficie de la base, por favor, y haz clic" - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 -msgid "Please clean the nozzle for calibration. Click when done." -msgstr "Limpia boquilla para calibracion. Click cuando acabes." - -# MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8303 -msgid "Please check :" -msgstr "Controla :" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 -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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 -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 -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 -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 -msgid "Please pull out filament immediately" -msgstr "Por favor retire el filamento de inmediato" - -# MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 -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 -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:4601 -msgid "Please run XYZ calibration first." -msgstr "Por favor realiza la calibracion XYZ primero." - -# MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 -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 -msgid "Please wait" -msgstr "Por Favor Espere" - -# -#: ultralcd.cpp:5057 -msgid "Please remove shipping helpers first." -msgstr "Por favor retira los soportes de envio primero." - -# MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 -msgid "Preheat the nozzle!" -msgstr "Precalienta extrusor" - -# MSG_PREHEAT -#: ultralcd.cpp:6885 -msgid "Preheat" -msgstr "Precalentar" - -# MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 -msgid "Preheating nozzle. Please wait." -msgstr "Precalentando nozzle. Espera por favor." - -# c=14 -#: ultralcd.cpp:1959 -msgid "PINDA" -msgstr "" - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Actualize por favor" - -# MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 -msgid "Press knob to preheat nozzle and continue." -msgstr "Pulsa el dial para precalentar la boquilla y continue." - -# MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 -msgid "Pause" -msgstr "Pausa" - -# -#: ultralcd.cpp:1783 -msgid "Power failures" -msgstr "Cortes de energia" - -# MSG_PRINT_ABORTED c=20 -#: messages.c:65 -msgid "Print aborted" -msgstr "Impresion cancelada" - -# c=20 -#: ultralcd.cpp:2433 -msgid "Preheating to load" -msgstr "Precalent. cargar" - -# c=20 -#: ultralcd.cpp:2437 -msgid "Preheating to unload" -msgstr "Precalent. descargar" - -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 -msgid "Print fan:" -msgstr "Vent.fusor:" - -# MSG_CARD_MENU -#: messages.c:20 -msgid "Print from SD" -msgstr "Menu tarjeta SD" - -# -#: ultralcd.cpp:2280 -msgid "Press the knob" -msgstr "Pulsa el dial" - -# MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 -msgid "Print paused" -msgstr "Impresion en pausa" - -# -#: mmu.cpp:726 -msgid "Press the knob to resume nozzle temperature." -msgstr "Presiona el dial para continuar con la temperatura de la boquilla." - -# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 -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." - -# -#: ultralcd.cpp:1655 -msgid "Print FAN" -msgstr "Vent. extr" - -# -#: ultralcd.cpp:4922 -msgid "Please insert filament into the extruder, then press the knob to load it." -msgstr "Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." - -# -#: ultralcd.cpp:4917 -msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." -msgstr "Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." - -# -#: ultralcd.cpp:4839 -msgid "Please load filament first." -msgstr "Por favor, cargar primero el filamento. " - -# MSG_PRUSA3D -#: ultralcd.cpp:2156 -msgid "prusa3d.com" -msgstr "prusa3d.es" - -# MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 -msgid "Rear side [um]" -msgstr "Trasera [um]" - -# c=20 r=4 -#: ultralcd.cpp:7583 -msgid "Please unload the filament first, then repeat this action." -msgstr "Primero descargue el filamento, luego repita esta accion." - -# c=20 r=4 -#: ultralcd.cpp:7586 -msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Por favor comprueba la conexion del IR sensor y filamento esta descargado." - -# MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 -msgid "Recovering print " -msgstr "Recuper. impresion " - -# MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 -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." - -# c=20 -#: -msgid "Prusa i3 MK3S OK." -msgstr "" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 -msgid "Reset XYZ calibr." -msgstr "" - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 -msgid "Reset" -msgstr "" - -# MSG_RESUME_PRINT -#: ultralcd.cpp:6893 -msgid "Resume print" -msgstr "Reanudar impres." - -# MSG_RESUMING_PRINT c=20 -#: messages.c:69 -msgid "Resuming print" -msgstr "Continuan. impresion" - -# MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 -msgid "Right side[um]" -msgstr "Derecha [um]" - -# MSG_RPI_PORT -#: messages.c:123 -msgid "RPi port" -msgstr "Puerto RPi" - -# MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 -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_SD_CARD -#: messages.c:118 -msgid "SD card" -msgstr "Tarj. SD" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 -msgid "FlashAir" -msgstr "" - -# -#: ultralcd.cpp:2992 -msgid "Right" -msgstr "Derecha" - -# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 -msgid "Searching bed calibration point" -msgstr "Buscando punto de calibracion base" - -# MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 -msgid "Select language" -msgstr "Cambiar el idioma" - -# MSG_SELFTEST_OK -#: ultralcd.cpp:7858 -msgid "Self test OK" -msgstr "" - -# MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 -msgid "Self test start " -msgstr "Iniciar Selftest" - -# MSG_SELFTEST -#: ultralcd.cpp:5871 -msgid "Selftest " -msgstr "" - -# MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 -msgid "Selftest error !" -msgstr "Error Selftest !" - -# MSG_SELFTEST_FAILED c=20 -#: messages.c:73 -msgid "Selftest failed " -msgstr "Fallo Selftest" - -# MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 -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:5098 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " - -# MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 -msgid "Set temperature:" -msgstr "Establecer temp.:" - -# c=20 -#: -msgid "Prusa i3 MK2.5 OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK2.5S OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK3 OK." -msgstr "" - -# MSG_SETTINGS -#: messages.c:82 -msgid "Settings" -msgstr "Configuracion" - -# MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 -msgid "Show end stops" -msgstr "Mostrar endstops" - -# -#: ultralcd.cpp:4004 -msgid "Sensor state" -msgstr "Estado del sensor" - -# MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 -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 -#: messages.c:120 -msgid "Sort" -msgstr "Ordenar" - -# MSG_NONE -#: messages.c:110 -msgid "None" -msgstr "Ninguno" - -# MSG_SORT_TIME -#: messages.c:121 -msgid "Time" -msgstr "Fecha" - -# -#: ultralcd.cpp:3035 -msgid "Severe skew:" -msgstr "Incl.severa:" - -# MSG_SORT_ALPHA -#: messages.c:122 -msgid "Alphabet" -msgstr "Alfabet" - -# MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 -msgid "Sorting files" -msgstr "Ordenando archivos" - -# MSG_SOUND_LOUD -#: messages.c:125 -msgid "Loud" -msgstr "Alto" - -# -#: ultralcd.cpp:3034 -msgid "Slight skew:" -msgstr "Liger.incl.:" - -# MSG_SOUND -#: messages.c:124 -msgid "Sound" -msgstr "Sonido" - -# c=7 -#: ultralcd.cpp:1822 -msgid "Runouts" -msgstr "" - -# -#: Marlin_main.cpp:5115 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Problema encontrado, nivelacion Z forzosa ..." - -# MSG_SOUND_ONCE -#: messages.c:126 -msgid "Once" -msgstr "Una vez" - -# MSG_SPEED -#: ultralcd.cpp:7151 -msgid "Speed" -msgstr "Velocidad" - -# MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 -msgid "Spinning" -msgstr "Ventilador girando" - -# MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 -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:7010 -msgid "Statistics " -msgstr "Estadisticas " - -# MSG_STOP_PRINT -#: messages.c:91 -msgid "Stop print" -msgstr "Detener impresion" - -# MSG_STOPPED -#: messages.c:92 -msgid "STOPPED. " -msgstr "PARADA" - -# MSG_SUPPORT -#: ultralcd.cpp:7019 -msgid "Support" -msgstr "Soporte" - -# MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 -msgid "Swapped" -msgstr "Intercambiado" - -# -#: ultralcd.cpp:4810 -msgid "Select filament:" -msgstr "Selecciona filamento:" - -# MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 -msgid "Temp. cal." -msgstr "Cal. temp." - -# -#: ultralcd.cpp:4951 -msgid "Select temperature which matches your material." -msgstr "Selecciona la temperatura adecuada a tu material." - -# MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 -msgid "Temp. calibration" -msgstr "Calibracion temp." - -# MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 -msgid "Temperature calibration failed" -msgstr "Fallo de la calibracion de temperatura" - -# MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 -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." - -# c=20 r=3 -#: ultralcd.cpp:7590 -msgid "Sensor verified, remove the filament now." -msgstr "Sensor verificado, retire el filamento ahora." - -# MSG_TEMPERATURE -#: ultralcd.cpp:5765 -msgid "Temperature" -msgstr "Temperatura" - -# MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 -msgid "Temperatures" -msgstr "Temperaturas" - -# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 -msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." - -# -#: ultralcd.cpp:2889 -msgid "Total filament" -msgstr "Filamento total" - -# -#: ultralcd.cpp:2890 -msgid "Total print time" -msgstr "Tiempo total" - -# MSG_TUNE -#: ultralcd.cpp:6882 -msgid "Tune" -msgstr "Ajustar" - -# -#: -msgid "Unload" -msgstr "Descargar" - -# -#: ultralcd.cpp:1752 -msgid "Total failures" -msgstr "Fallos totales" - -# -#: ultralcd.cpp:2287 -msgid "to load filament" -msgstr "para cargar el filamento" - -# -#: ultralcd.cpp:2291 -msgid "to unload filament" -msgstr "para descargar el filamento" - -# MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 -msgid "Unload filament" -msgstr "Soltar filamento" - -# MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 -msgid "Unloading filament" -msgstr "Soltando filamento" - -# -#: ultralcd.cpp:1705 -msgid "Total" -msgstr "" - -# MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 -msgid "Used during print" -msgstr "Usado en impresion" - -# MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 -msgid "Voltages" -msgstr "Voltajes" - -# -#: ultralcd.cpp:2184 -msgid "unknown" -msgstr "desconocido" - -# MSG_USERWAIT -#: Marlin_main.cpp:5525 -msgid "Wait for user..." -msgstr "Esperando ordenes" - -# MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 -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:3393 -msgid "Waiting for PINDA probe cooling" -msgstr "Esperando a que se enfrie la sonda PINDA" - -# -#: -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:1525 -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:1517 -msgid "Warning: motherboard type changed." -msgstr "Cuidado: el tipo de placa ha cambiado." - -# MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 -msgid "Warning: printer type changed." -msgstr "Cuidado: Ha cambiado el tipo de impresora." - -# MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 -msgid "Was filament unload successful?" -msgstr "?Se cargocon exito el filamento?" - -# MSG_SELFTEST_WIRINGERROR -#: messages.c:81 -msgid "Wiring error" -msgstr "Error de conexion" - -# MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 -msgid "Wizard" -msgstr "" - -# MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 -msgid "XYZ cal. details" -msgstr "Detalles cal. XYZ" - -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:18 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Calibracion XYZ fallada. Consulta el manual por favor." - -# MSG_YES -#: messages.c:102 -msgid "Yes" -msgstr "Si" - -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 -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:3902 -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:3899 -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_TIMEOUT c=12 -#: messages.c:137 -msgid "Timeout" -msgstr "Expirar" - -# MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 -msgid "X-correct:" -msgstr "Corregir-X:" - -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 -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:3880 -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:3883 -msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 -msgid "Load all" -msgstr "Intr. todos fil." - -# -#: ultralcd.cpp:3862 -msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." - -# -#: ultralcd.cpp:3868 -msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." - -# -#: ultralcd.cpp:3871 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." - -# -#: ultralcd.cpp:2989 -msgid "Y distance from min" -msgstr "Distancia en Y desde el min" - -# -#: ultralcd.cpp:4954 -msgid "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)." -msgstr "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)." - -# c=20 r=5 -#: ultralcd.cpp:7594 -msgid "Verification failed, remove the filament and try again." -msgstr "La verificacion fallo, retire el filamento e intente nuevamente." - -# MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 -msgid "Y-correct:" -msgstr "Corregir-Y:" - -# MSG_OFF -#: messages.c:105 -msgid "Off" -msgstr "Ina" - -# MSG_ON -#: messages.c:106 -msgid "On" -msgstr "Act" - -# -#: messages.c:53 -msgid "Back" -msgstr "atras" - -# -#: ultralcd.cpp:5742 -msgid "Checks" -msgstr "Comprobaciones" - -# -#: ultralcd.cpp:8395 -msgid "False triggering" -msgstr "Falsa activacion" - -# -#: ultralcd.cpp:4009 -msgid "FINDA:" -msgstr "FINDA:" - -# MSG_FIRMWARE -#: language.h:23 -msgid "Firmware" -msgstr "" - -# MSG_STRICT -#: messages.c:112 -msgid "Strict" -msgstr "Estrict" - -# MSG_WARN -#: messages.c:111 -msgid "Warn" -msgstr "Aviso" - -# -#: messages.c:83 -msgid "HW Setup" -msgstr "Configuracion HW" - -# -#: ultralcd.cpp:4013 -msgid "IR:" -msgstr "" - -# MSG_MAGNETS_COMP -#: messages.c:130 -msgid "Magnets comp." -msgstr "Comp. imanes" - -# MSG_MESH -#: messages.c:128 -msgid "Mesh" -msgstr "Malla" - -# -#: ultralcd.cpp:5789 -msgid "Mesh bed leveling" -msgstr "Nivelacion Malla Base" - -# -#: Marlin_main.cpp:877 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Firmware MK3S detectado en impresora MK3" - -# MSG_MMU_MODE -#: messages.c:117 -msgid "MMU Mode" -msgstr "Modo MMU" - -# -#: ultralcd.cpp:4490 -msgid "Mode change in progress ..." -msgstr "Cambio de modo progresando ..." - -# MSG_MODEL -#: messages.c:113 -msgid "Model" -msgstr "Modelo" - -# MSG_NOZZLE_DIAMETER -#: messages.c:116 -msgid "Nozzle d." -msgstr "Diam. nozzl" - -# -#: util.cpp:514 -msgid "G-code sliced for a different level. Continue?" -msgstr "Codigo G laminado para un nivel diferente. ?Continuar?" - -# -#: util.cpp:520 -msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." -msgstr "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." - -# -#: util.cpp:431 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "Codigo G laminado para un tipo de impresora diferente. ?Continuar?" - -# -#: util.cpp:437 -msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -msgstr "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." - -# -#: util.cpp:481 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "Codigo G laminado para nuevo firmware. ?Continuar?" - -# -#: util.cpp:487 -msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." - -# -#: ultralcd.cpp:4005 -msgid "PINDA:" -msgstr "PINDA:" - -# c=20 -#: ultralcd.cpp:2443 -msgid "Preheating to cut" -msgstr "Precalent. laminar" - -# c=20 -#: ultralcd.cpp:2440 -msgid "Preheating to eject" -msgstr "Precalent. expulsar" - -# -#: util.cpp:394 -msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "Diametro nozzle impresora difiere de cod.G. ?Continuar?" - -# -#: util.cpp:401 -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." - -# c=20 -#: ultralcd.cpp:8401 -msgid "%s level expected" -msgstr "" - -# -#: ultralcd.cpp:6846 -msgid "Rename" -msgstr "Renombrar" - -# -#: ultralcd.cpp:6839 -msgid "Select" -msgstr "Seleccionar" - -# -#: ultralcd.cpp:2202 -msgid "Sensor info" -msgstr "Info sensor" - -# MSG_SHEET c=10 -#: messages.c:54 -msgid "Sheet" -msgstr "Lamina" - -# MSG_SOUND_BLIND -#: messages.c:127 -msgid "Assist" -msgstr "Asistido" - -# c=18 -#: ultralcd.cpp:5740 -msgid "Steel sheets" -msgstr "Lamina de acero" - -# MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 -msgid "Z-correct:" -msgstr "Corregir-Z:" - -# MSG_Z_PROBE_NR -#: messages.c:129 -msgid "Z-probe nr." -msgstr "Z-sensor nr." - +# Translation of Prusa-Firmware into Spanish. +# +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Di 26. Jan 11:04:04 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:04 CET 2021\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +# +#: +msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +msgstr "[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir" + +# MSG_IR_03_OR_OLDER c=18 +#: messages.c:164 +msgid " 0.3 or older" +msgstr " 0.3 o mayor" + +# c=18 +#: Marlin_main.cpp:9626 +msgid "FS v0.3 or older" +msgstr "FS 0.3 o mayor" + +# MSG_IR_04_OR_NEWER c=18 +#: messages.c:163 +msgid " 0.4 or newer" +msgstr " 0.4 o mas nueva" + +# c=18 +#: Marlin_main.cpp:9625 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 o mas nueva" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:165 +msgid "unknown state" +msgstr "estado desconocido" + +# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 +#: messages.c:43 +msgid " of 4" +msgstr " de 4" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 +#: messages.c:66 +msgid " of 9" +msgstr " de 9" + +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:2988 +msgid "[0;0] point offset" +msgstr "[0;0] punto offset" + +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +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 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio" + +# +#: ultralcd.cpp:2410 +msgid ">Cancel" +msgstr ">Cancelar" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3108 +msgid "Adjusting Z:" +msgstr "Ajustar-Z:" + +# MSG_SELFTEST_CHECK_ALLCORRECT c=20 +#: ultralcd.cpp:8390 +msgid "All correct " +msgstr "Todo bien" + +# MSG_WIZARD_DONE c=20 r=8 +#: messages.c:116 +msgid "All is done. Happy printing!" +msgstr "Terminado! Feliz impresion!" + +# +#: ultralcd.cpp:1902 +msgid "Ambient" +msgstr "Ambiente" + +# MSG_AUTO c=6 +#: messages.c:160 +msgid "Auto" +msgstr "" + +# MSG_PRESS c=20 r=2 +#: ultralcd.cpp:2567 +msgid "and press the knob" +msgstr "Haz clic" + +# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#: ultralcd.cpp:3429 +msgid "Are left and right Z~carriages all up?" +msgstr "Carros Z izq./der. estan arriba maximo?" + +# MSG_AUTO_DEPLETE c=17 r=1 +#: messages.c:125 +msgid "SpoolJoin" +msgstr "" + +# MSG_AUTO_HOME +#: messages.c:11 +msgid "Auto home" +msgstr "Llevar al origen" + +# MSG_AUTOLOAD_FILAMENT c=18 +#: ultralcd.cpp:6716 +msgid "AutoLoad filament" +msgstr "Carga auto. filam." + +# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +#: ultralcd.cpp:4346 +msgid "Autoloading filament available only when filament sensor is turned on..." +msgstr "La carga automatica solo funciona si el sensor de filamento esta activado..." + +# MSG_AUTOLOADING_ENABLED c=20 r=4 +#: ultralcd.cpp:2730 +msgid "Autoloading filament is active, just press the knob and insert filament..." +msgstr "La carga automatica esta activada, pulse el dial e inserte el filamento..." + +# MSG_SELFTEST_AXIS_LENGTH +#: ultralcd.cpp:8073 +msgid "Axis length" +msgstr "Longitud del eje" + +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:8074 +msgid "Axis" +msgstr "Eje" + +# MSG_SELFTEST_BEDHEATER +#: ultralcd.cpp:8031 +msgid "Bed / Heater" +msgstr "Base / Calentador" + +# MSG_BED_DONE +#: messages.c:15 +msgid "Bed done" +msgstr "Base preparada" + +# MSG_BED_HEATING +#: messages.c:16 +msgid "Bed Heating" +msgstr "Calentando Base" + +# MSG_BED_CORRECTION_MENU +#: ultralcd.cpp:5802 +msgid "Bed level correct" +msgstr "Corr. de la cama" + +# MSG_BELTTEST c=17 +#: ultralcd.cpp:5782 +msgid "Belt test " +msgstr "Test cinturon " + +# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 +#: messages.c:17 +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_BRIGHT c=6 +#: messages.c:158 +msgid "Bright" +msgstr "Brill." + +# MSG_BRIGHTNESS c=18 +#: messages.c:154 +msgid "Brightness" +msgstr "Brillo" + +# MSG_BED +#: messages.c:14 +msgid "Bed" +msgstr "Base" + +# MSG_BELT_STATUS c=18 +#: +msgid "Belt status" +msgstr "Estado de correa" + +# MSG_RECOVER_PRINT c=20 r=2 +#: messages.c:80 +msgid "Blackout occurred. Recover print?" +msgstr "Se fue la luz. ?Reanudar la impresion?" + +# +#: ultralcd.cpp:8392 +msgid "Calibrating home" +msgstr "Calibrando posicion inicial" + +# MSG_CALIBRATE_BED +#: ultralcd.cpp:5791 +msgid "Calibrate XYZ" +msgstr "Calibrar XYZ" + +# MSG_HOMEYZ +#: messages.c:51 +msgid "Calibrate Z" +msgstr "Calibrar Z" + +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4538 +msgid "Calibrate" +msgstr "Calibrar" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 +#: ultralcd.cpp:3392 +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." + +# MSG_CALIBRATE_Z_AUTO c=20 r=2 +#: messages.c:20 +msgid "Calibrating Z" +msgstr "Calibrando Z" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 +#: ultralcd.cpp:3392 +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:813 +msgid "Calibration done" +msgstr "Calibracion OK" + +# MSG_MENU_CALIBRATION +#: messages.c:67 +msgid "Calibration" +msgstr "Calibracion" + +# +#: ultralcd.cpp:4716 +msgid "Cancel" +msgstr "Cancelar" + +# MSG_SD_REMOVED +#: ultralcd.cpp:8842 +msgid "Card removed" +msgstr "Tarjeta retirada" + +# MSG_NOT_COLOR +#: ultralcd.cpp:2647 +msgid "Color not correct" +msgstr "Color no homogeneo" + +# MSG_COOLDOWN +#: messages.c:25 +msgid "Cooldown" +msgstr "Enfriar" + +# +#: ultralcd.cpp:4471 +msgid "Copy selected language?" +msgstr "Copiar idioma seleccionado?" + +# MSG_CRASHDETECT c=13 +#: messages.c:28 +msgid "Crash det." +msgstr "Det. choque" + +# +#: ultralcd.cpp:4851 +msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." +msgstr "Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla." + +# MSG_CRASH_DETECTED c=20 r=1 +#: messages.c:27 +msgid "Crash detected." +msgstr "Choque detectado." + +# +#: Marlin_main.cpp:657 +msgid "Crash detected. Resume print?" +msgstr "Choque detectado. Continuar impresion?" + +# MSG_CRASH c=7 +#: messages.c:26 +msgid "Crash" +msgstr "Choque" + +# MSG_CURRENT c=19 r=1 +#: ultralcd.cpp:5933 +msgid "Current" +msgstr "Actual" + +# MSG_DATE c=17 r=1 +#: ultralcd.cpp:2112 +msgid "Date:" +msgstr "Fecha:" + +# MSG_DISABLE_STEPPERS +#: ultralcd.cpp:5683 +msgid "Disable steppers" +msgstr "Apagar motores" + +# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 +#: messages.c:13 +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 "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_FS_CONTINUE c=5 +#: messages.c:152 +msgid "Cont." +msgstr "" + +# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 +#: ultralcd.cpp:5026 +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=13 +#: ultralcd.cpp:5095 +msgid "E-correct:" +msgstr "Corregir-E:" + +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 +msgid "Eject filament" +msgstr "Expulsar fil." + +# MSG_EJECTING_FILAMENT c=20 r=1 +#: mmu.cpp:1414 +msgid "Ejecting filament" +msgstr "Expulsando filamento" + +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 +#: ultralcd.cpp:8049 +msgid "Endstop not hit" +msgstr "Endstop no alcanzado" + +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:8044 +msgid "Endstop" +msgstr "" + +# MSG_SELFTEST_ENDSTOPS +#: ultralcd.cpp:8035 +msgid "Endstops" +msgstr "" + +# MSG_STACK_ERROR c=20 r=4 +#: ultralcd.cpp:6753 +msgid "Error - static memory has been overwritten" +msgstr "Error - se ha sobre-escrito la memoria estatica" + +# MSG_CUT_FILAMENT c=16 +#: messages.c:59 +msgid "Cut filament" +msgstr "Cortar filament" + +# MSG_CUTTER c=9 +#: messages.c:126 +msgid "Cutter" +msgstr "Cuchillo" + +# c=18 +#: mmu.cpp:1386 +msgid "Cutting filament" +msgstr "Corte de filament" + +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4359 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." + +# MSG_DIM c=6 +#: messages.c:159 +msgid "Dim" +msgstr "" + +# MSG_ERROR +#: messages.c:29 +msgid "ERROR:" +msgstr "" + +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8398 +msgid "Extruder fan:" +msgstr "Vent.extrusor:" + +# MSG_INFO_EXTRUDER c=18 +#: ultralcd.cpp:2153 +msgid "Extruder info" +msgstr "Info. del extrusor" + +# MSG_EXTRUDER c=17 +#: messages.c:30 +msgid "Extruder" +msgstr "Extruir" + +# +#: ultralcd.cpp:6740 +msgid "Fail stats MMU" +msgstr "Estadistica de fallos MMU" + +# MSG_FSENSOR_AUTOLOAD c=13 +#: messages.c:47 +msgid "F. autoload" +msgstr "Autocarg.fil." + +# +#: ultralcd.cpp:6737 +msgid "Fail stats" +msgstr "Estadistica de fallos" + +# MSG_FAN_SPEED c=14 +#: messages.c:34 +msgid "Fan speed" +msgstr "Velocidad Vent" + +# MSG_SELFTEST_FAN c=20 +#: messages.c:89 +msgid "Fan test" +msgstr "Test ventiladores" + +# MSG_FANS_CHECK c=13 +#: messages.c:31 +msgid "Fans check" +msgstr "Comprob.vent" + +# MSG_FSENSOR +#: messages.c:48 +msgid "Fil. sensor" +msgstr "Sensor Fil." + +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fil. acabado " + +# MSG_FILAMENT_CLEAN c=20 r=2 +#: messages.c:35 +msgid "Filament extruding & with correct color?" +msgstr "Es nitido el color nuevo?" + +# MSG_NOT_LOADED c=19 +#: ultralcd.cpp:2646 +msgid "Filament not loaded" +msgstr "Fil. no introducido" + +# MSG_FILAMENT_SENSOR c=20 +#: messages.c:95 +msgid "Filament sensor" +msgstr "Sensor de filamento" + +# MSG_FILAMENT_USED c=19 +#: ultralcd.cpp:2795 +msgid "Filament used" +msgstr "Filamento usado" + +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2796 +msgid "Print time" +msgstr "Tiempo de imp.:" + +# MSG_FS_ACTION c=10 +#: messages.c:151 +msgid "FS Action" +msgstr "FS accion" + +# MSG_FILE_INCOMPLETE c=20 r=3 +#: ultralcd.cpp:8540 +msgid "File incomplete. Continue anyway?" +msgstr "Archivo incompleto. ?Continuar de todos modos?" + +# MSG_FINISHING_MOVEMENTS c=20 +#: messages.c:44 +msgid "Finishing movements" +msgstr "Term. movimientos" + +# MSG_V2_CALIBRATION c=18 +#: messages.c:120 +msgid "First layer cal." +msgstr "Cal. primera cap." + +# MSG_WIZARD_SELFTEST c=20 r=8 +#: ultralcd.cpp:4947 +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:726 +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:6880 +msgid "Flow" +msgstr "Flujo" + +# MSG_PRUSA3D_FORUM +#: ultralcd.cpp:2105 +msgid "forum.prusa3d.com" +msgstr "" + +# MSG_SELFTEST_COOLING_FAN c=20 +#: messages.c:86 +msgid "Front print fan?" +msgstr "Vent. frontal?" + +# MSG_BED_CORRECTION_FRONT c=14 r=1 +#: ultralcd.cpp:3190 +msgid "Front side[um]" +msgstr "Frontal [um]" + +# MSG_SELFTEST_FANS +#: ultralcd.cpp:8079 +msgid "Front/left fans" +msgstr "Ventiladores frontal/izquierdo" + +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:8027 +msgid "Heater/Thermistor" +msgstr "Calentador/Termistor" + +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:9616 +msgid "Heating disabled by safety timer." +msgstr "Calentadores desactivados por el temporizador de seguridad." + +# MSG_HEATING_COMPLETE c=20 +#: messages.c:50 +msgid "Heating done." +msgstr "Calentando acabado." + +# MSG_HEATING +#: messages.c:49 +msgid "Heating" +msgstr "Calentando..." + +# MSG_WIZARD_WELCOME c=20 r=7 +#: ultralcd.cpp:4926 +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:2106 +msgid "howto.prusa3d.com" +msgstr "" + +# MSG_FILAMENTCHANGE +#: messages.c:41 +msgid "Change filament" +msgstr "Cambiar filamento" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2576 +msgid "Change success!" +msgstr "Cambio correcto" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2644 +msgid "Changed correctly?" +msgstr "Cambio correcto?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:92 +msgid "Checking bed " +msgstr "Control base cal." + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8381 +msgid "Checking endstops" +msgstr "Control endstops" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8387 +msgid "Checking hotend " +msgstr "Control fusor" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:93 +msgid "Checking sensors " +msgstr "Comprobando sensores" + +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Control sensor X" + +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Control sensor Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: +msgid "Checking Z axis" +msgstr "Control sensor Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:52 +msgid "Choose extruder:" +msgstr "Elegir extrusor:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:53 +msgid "Choose filament:" +msgstr "Elije filamento:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:33 +msgid "Filament" +msgstr "Filamento" + +# MSG_WIZARD_XYZ_CAL c=20 r=8 +#: ultralcd.cpp:4956 +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:4964 +msgid "I will run z calibration now." +msgstr "Voy a hacer Calibracion Z ahora." + +# MSG_WATCH +#: messages.c:114 +msgid "Info screen" +msgstr "Monitorizar" + +# MSG_INSERT_FILAMENT c=20 +#: ultralcd.cpp:2564 +msgid "Insert filament" +msgstr "Introducir filamento" + +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 +msgid "Is filament loaded?" +msgstr "Esta el filamento cargado?" + +# MSG_STEEL_SHEET_CHECK c=20 r=2 +#: messages.c:107 +msgid "Is steel sheet on heatbed?" +msgstr "?Esta colocada la lamina sobre la base" + +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 +msgid "Last print failures" +msgstr "Ultimos imp. fallos" + +# +#: ultralcd.cpp:5034 +msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +msgstr "Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero." + +# MSG_LAST_PRINT c=18 +#: messages.c:54 +msgid "Last print" +msgstr "Ultima impresion" + +# MSG_SELFTEST_EXTRUDER_FAN c=20 +#: messages.c:87 +msgid "Left hotend fan?" +msgstr "Vent. izquierdo?" + +# +#: ultralcd.cpp:2919 +msgid "Left" +msgstr "Izquierda" + +# MSG_BED_CORRECTION_LEFT c=14 r=1 +#: ultralcd.cpp:3188 +msgid "Left side [um]" +msgstr "Izquierda [um]" + +# +#: ultralcd.cpp:5706 +msgid "Lin. correction" +msgstr "Correccion de Linealidad" + +# MSG_BABYSTEP_Z +#: messages.c:12 +msgid "Live adjust Z" +msgstr "Micropaso Eje Z" + +# c=20 r=6 +#: ultralcd.cpp:7280 +msgid "Insert the filament (do not load it) into the extruder and then press the knob." +msgstr "Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial." + +# MSG_LOAD_FILAMENT c=17 +#: messages.c:56 +msgid "Load filament" +msgstr "Introducir filam." + +# MSG_LOADING_COLOR +#: ultralcd.cpp:2598 +msgid "Loading color" +msgstr "Cambiando color" + +# MSG_LOADING_FILAMENT c=20 +#: messages.c:57 +msgid "Loading filament" +msgstr "Introduciendo filam." + +# MSG_LOOSE_PULLEY c=20 r=1 +#: ultralcd.cpp:8067 +msgid "Loose pulley" +msgstr "Polea suelta" + +# +#: ultralcd.cpp:6699 +msgid "Load to nozzle" +msgstr "Cargar a la boquilla" + +# MSG_M117_V2_CALIBRATION c=25 +#: messages.c:60 +msgid "M117 First layer cal." +msgstr "M117 Cal. primera cap." + +# MSG_MAIN +#: messages.c:61 +msgid "Main" +msgstr "Menu principal" + +# MSG_BL_HIGH c=12 +#: messages.c:155 +msgid "Level Bright" +msgstr "Valor brill." + +# MSG_BL_LOW c=12 +#: messages.c:156 +msgid "Level Dimmed" +msgstr "" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 +#: messages.c:65 +msgid "Measuring reference height of calibration point" +msgstr "Midiendo altura del punto de calibracion" + +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 +msgid "Mesh Bed Leveling" +msgstr "Nivela. Mesh Level" + +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:764 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Restaurando posicion..." + +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:757 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Restaurando temperatura..." + +# +#: ultralcd.cpp:2960 +msgid "Measured skew" +msgstr "Desviacion med:" + +# MSG_MMU_FAILS c=14 +#: messages.c:68 +msgid "MMU fails" +msgstr "Fallos MMU" + +# +#: mmu.cpp:1586 +msgid "MMU load failed " +msgstr "Carga MMU fallida" + +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 +msgid "MMU load fails" +msgstr "Carga MMU falla" + +# MSG_MMU_OK_RESUMING c=20 r=4 +#: mmu.cpp:775 +msgid "MMU OK. Resuming..." +msgstr "MMU OK. Resumiendo..." + +# MSG_MODE +#: messages.c:101 +msgid "Mode" +msgstr "Modo" + +# c=20 r=3 +#: Marlin_main.cpp:934 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detectado en impresora MK3S" + +# MSG_NORMAL +#: messages.c:105 +msgid "Normal" +msgstr "" + +# MSG_SILENT +#: messages.c:104 +msgid "Silent" +msgstr "Silencio" + +# +#: mmu.cpp:721 +msgid "MMU needs user attention." +msgstr "MMU necesita atencion del usuario." + +# +#: ultralcd.cpp:1701 +msgid "MMU power fails" +msgstr "Fallo de energia en MMU" + +# MSG_STEALTH +#: messages.c:106 +msgid "Stealth" +msgstr "Silencio" + +# MSG_AUTO_POWER +#: messages.c:103 +msgid "Auto power" +msgstr "Fuerza auto" + +# MSG_HIGH_POWER +#: messages.c:102 +msgid "High power" +msgstr "Rend.pleno" + +# +#: ultralcd.cpp:2124 +msgid "MMU2 connected" +msgstr "MMU2 conectado" + +# MSG_SELFTEST_MOTOR +#: messages.c:94 +msgid "Motor" +msgstr "" + +# MSG_MOVE_AXIS +#: ultralcd.cpp:5681 +msgid "Move axis" +msgstr "Mover ejes" + +# MSG_MOVE_X +#: ultralcd.cpp:4262 +msgid "Move X" +msgstr "Mover X" + +# MSG_MOVE_Y +#: ultralcd.cpp:4263 +msgid "Move Y" +msgstr "Mover Y" + +# MSG_MOVE_Z +#: ultralcd.cpp:4264 +msgid "Move Z" +msgstr "Mover Z" + +# MSG_NO_MOVE +#: Marlin_main.cpp:5719 +msgid "No move." +msgstr "Sin movimiento" + +# MSG_NO_CARD +#: ultralcd.cpp:6673 +msgid "No SD card" +msgstr "No hay tarjeta SD" + +# MSG_NA +#: messages.c:124 +msgid "N/A" +msgstr "N/A" + +# MSG_NO +#: messages.c:70 +msgid "No" +msgstr "" + +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:8028 +msgid "Not connected" +msgstr "No hay conexion " + +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Nuevo firmware disponible:" + +# MSG_SELFTEST_FAN_NO c=19 +#: messages.c:90 +msgid "Not spinning" +msgstr "Ventilador no gira" + +# MSG_WIZARD_V2_CAL c=20 r=8 +#: ultralcd.cpp:4847 +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:4972 +msgid "Now I will preheat nozzle for PLA." +msgstr "Ahora precalentare la boquilla para PLA." + +# MSG_NOZZLE +#: messages.c:71 +msgid "Nozzle" +msgstr "Boquilla" + +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 +#: Marlin_main.cpp:1581 +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:4963 +msgid "Now remove the test print from steel sheet." +msgstr "Ahora retira la prueba de la lamina de acero." + +# +#: ultralcd.cpp:1600 +msgid "Nozzle FAN" +msgstr "Vent. capa" + +# MSG_PAUSE_PRINT +#: ultralcd.cpp:6637 +msgid "Pause print" +msgstr "Pausar impresion" + +# MSG_PID_RUNNING c=20 r=1 +#: ultralcd.cpp:1485 +msgid "PID cal. " +msgstr "Cal. PID " + +# MSG_PID_FINISHED c=20 r=1 +#: ultralcd.cpp:1491 +msgid "PID cal. finished" +msgstr "Cal. PID terminada" + +# MSG_PID_EXTRUDER c=17 r=1 +#: ultralcd.cpp:5803 +msgid "PID calibration" +msgstr "Calibracion PID" + +# MSG_PINDA_PREHEAT c=20 r=1 +#: ultralcd.cpp:843 +msgid "PINDA Heating" +msgstr "Calentando PINDA" + +# MSG_PAPER c=20 r=10 +#: messages.c:72 +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:5029 +msgid "Please clean heatbed and then press the knob." +msgstr "Limpia la superficie de la base, por favor, y haz clic" + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:24 +msgid "Please clean the nozzle for calibration. Click when done." +msgstr "Limpia boquilla para calibracion. Click cuando acabes." + +# MSG_SELFTEST_PLEASECHECK +#: ultralcd.cpp:8022 +msgid "Please check :" +msgstr "Controla :" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:115 +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_CHECK_IDLER c=20 r=4 +#: Marlin_main.cpp:3317 +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:73 +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:77 +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:79 +msgid "Please pull out filament immediately" +msgstr "Por favor retire el filamento de inmediato" + +# MSG_EJECT_REMOVE c=20 r=4 +#: mmu.cpp:1420 +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:82 +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:4766 +msgid "Please run XYZ calibration first." +msgstr "Por favor realiza la calibracion XYZ primero." + +# MSG_UPDATE_MMU2_FW c=20 r=4 +#: mmu.cpp:1340 +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:74 +msgid "Please wait" +msgstr "Por Favor Espere" + +# +#: ultralcd.cpp:4962 +msgid "Please remove shipping helpers first." +msgstr "Por favor retira los soportes de envio primero." + +# MSG_PREHEAT_NOZZLE c=20 +#: messages.c:76 +msgid "Preheat the nozzle!" +msgstr "Precalienta extrusor" + +# MSG_PREHEAT +#: ultralcd.cpp:6615 +msgid "Preheat" +msgstr "Precalentar" + +# MSG_WIZARD_HEATING c=20 r=3 +#: messages.c:117 +msgid "Preheating nozzle. Please wait." +msgstr "Precalentando nozzle. Espera por favor." + +# c=14 +#: ultralcd.cpp:1905 +msgid "PINDA" +msgstr "" + +# +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Actualize por favor" + +# MSG_PRESS_TO_PREHEAT c=20 r=4 +#: Marlin_main.cpp:11718 +msgid "Press knob to preheat nozzle and continue." +msgstr "Pulsa el dial para precalentar la boquilla y continue." + +# MSG_FS_PAUSE c=5 +#: fsensor.cpp:728 +msgid "Pause" +msgstr "Pausa" + +# MSG_POWER_FAILURES c=14 +#: messages.c:75 +msgid "Power failures" +msgstr "Cortes de energia" + +# MSG_PRINT_ABORTED c=20 +#: messages.c:78 +msgid "Print aborted" +msgstr "Impresion cancelada" + +# c=20 +#: ultralcd.cpp:2390 +msgid "Preheating to load" +msgstr "Precalent. cargar" + +# c=20 +#: ultralcd.cpp:2395 +msgid "Preheating to unload" +msgstr "Precalent. descargar" + +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8401 +msgid "Print fan:" +msgstr "Vent.fusor:" + +# MSG_CARD_MENU +#: messages.c:21 +msgid "Print from SD" +msgstr "Menu tarjeta SD" + +# +#: ultralcd.cpp:2231 +msgid "Press the knob" +msgstr "Pulsa el dial" + +# MSG_PRINT_PAUSED c=20 r=1 +#: ultralcd.cpp:1065 +msgid "Print paused" +msgstr "Impresion en pausa" + +# +#: mmu.cpp:725 +msgid "Press the knob to resume nozzle temperature." +msgstr "Presiona el dial para continuar con la temperatura de la boquilla." + +# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +#: messages.c:45 +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." + +# +#: ultralcd.cpp:1601 +msgid "Print FAN" +msgstr "Vent. extr" + +# +#: ultralcd.cpp:4827 +msgid "Please insert filament into the extruder, then press the knob to load it." +msgstr "Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo." + +# +#: ultralcd.cpp:4822 +msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." +msgstr "Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo." + +# +#: ultralcd.cpp:4744 +msgid "Please load filament first." +msgstr "Por favor, cargar primero el filamento. " + +# MSG_PRUSA3D +#: ultralcd.cpp:2104 +msgid "prusa3d.com" +msgstr "prusa3d.es" + +# MSG_BED_CORRECTION_REAR c=14 r=1 +#: ultralcd.cpp:3191 +msgid "Rear side [um]" +msgstr "Trasera [um]" + +# c=20 r=4 +#: ultralcd.cpp:7304 +msgid "Please unload the filament first, then repeat this action." +msgstr "Primero descargue el filamento, luego repita esta accion." + +# c=20 r=4 +#: ultralcd.cpp:7307 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Por favor comprueba la conexion del IR sensor y filamento esta descargado." + +# MSG_RECOVERING_PRINT c=20 +#: Marlin_main.cpp:11076 +msgid "Recovering print " +msgstr "Recuper. impresion " + +# MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#: mmu.cpp:832 +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." + +# c=20 +#: +msgid "Prusa i3 MK3S OK." +msgstr "" + +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5808 +msgid "Reset XYZ calibr." +msgstr "" + +# MSG_RESET c=14 +#: messages.c:83 +msgid "Reset" +msgstr "" + +# MSG_RESUME_PRINT c=18 +#: messages.c:84 +msgid "Resume print" +msgstr "Reanudar impres." + +# MSG_RESUMING_PRINT c=20 +#: messages.c:85 +msgid "Resuming print" +msgstr "Continuan. impresion" + +# MSG_BED_CORRECTION_RIGHT c=14 r=1 +#: ultralcd.cpp:3189 +msgid "Right side[um]" +msgstr "Derecha [um]" + +# MSG_RPI_PORT +#: messages.c:142 +msgid "RPi port" +msgstr "Puerto RPi" + +# MSG_WIZARD_RERUN c=20 r=7 +#: ultralcd.cpp:4765 +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_SD_CARD +#: messages.c:137 +msgid "SD card" +msgstr "Tarj. SD" + +# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +#: messages.c:138 +msgid "FlashAir" +msgstr "" + +# +#: ultralcd.cpp:2920 +msgid "Right" +msgstr "Derecha" + +# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 +#: messages.c:42 +msgid "Searching bed calibration point" +msgstr "Buscando punto de calibracion base" + +# MSG_LANGUAGE_SELECT +#: ultralcd.cpp:5721 +msgid "Select language" +msgstr "Cambiar el idioma" + +# MSG_SELFTEST_OK +#: ultralcd.cpp:7579 +msgid "Self test OK" +msgstr "" + +# MSG_SELFTEST_START c=20 +#: ultralcd.cpp:7347 +msgid "Self test start " +msgstr "Iniciar Selftest" + +# MSG_SELFTEST +#: ultralcd.cpp:5784 +msgid "Selftest " +msgstr "" + +# MSG_SELFTEST_ERROR +#: ultralcd.cpp:8021 +msgid "Selftest error !" +msgstr "Error Selftest !" + +# MSG_SELFTEST_FAILED c=20 +#: messages.c:88 +msgid "Selftest failed " +msgstr "Fallo Selftest" + +# MSG_FORCE_SELFTEST c=20 r=8 +#: Marlin_main.cpp:1613 +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:5003 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. " + +# MSG_SET_TEMPERATURE c=19 r=1 +#: ultralcd.cpp:3209 +msgid "Set temperature:" +msgstr "Establecer temp.:" + +# c=20 +#: +msgid "Prusa i3 MK2.5 OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK2.5S OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK3 OK." +msgstr "" + +# MSG_SETTINGS +#: messages.c:97 +msgid "Settings" +msgstr "Configuracion" + +# MSG_SHOW_END_STOPS c=18 +#: ultralcd.cpp:5805 +msgid "Show end stops" +msgstr "Mostrar endstops" + +# +#: ultralcd.cpp:3915 +msgid "Sensor state" +msgstr "Estado del sensor" + +# MSG_FILE_CNT c=20 r=6 +#: 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 +#: messages.c:139 +msgid "Sort" +msgstr "Ordenar" + +# MSG_NONE +#: messages.c:127 +msgid "None" +msgstr "Ninguno" + +# MSG_SORT_TIME +#: messages.c:140 +msgid "Time" +msgstr "Fecha" + +# +#: ultralcd.cpp:2963 +msgid "Severe skew:" +msgstr "Incl.severa:" + +# MSG_SORT_ALPHA +#: messages.c:141 +msgid "Alphabet" +msgstr "Alfabet" + +# MSG_SORTING c=20 r=1 +#: cardreader.cpp:746 +msgid "Sorting files" +msgstr "Ordenando archivos" + +# MSG_SOUND_LOUD +#: messages.c:144 +msgid "Loud" +msgstr "Alto" + +# +#: ultralcd.cpp:2962 +msgid "Slight skew:" +msgstr "Liger.incl.:" + +# MSG_SOUND +#: messages.c:143 +msgid "Sound" +msgstr "Sonido" + +# c=7 +#: ultralcd.cpp:1768 +msgid "Runouts" +msgstr "" + +# +#: Marlin_main.cpp:5280 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Problema encontrado, nivelacion Z forzosa ..." + +# MSG_SOUND_ONCE +#: messages.c:145 +msgid "Once" +msgstr "Una vez" + +# MSG_SPEED +#: ultralcd.cpp:6874 +msgid "Speed" +msgstr "Velocidad" + +# MSG_SELFTEST_FAN_YES c=19 +#: messages.c:91 +msgid "Spinning" +msgstr "Ventilador girando" + +# MSG_TEMP_CAL_WARNING c=20 r=4 +#: Marlin_main.cpp:4779 +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:6733 +msgid "Statistics " +msgstr "Estadisticas " + +# MSG_STOP_PRINT +#: messages.c:108 +msgid "Stop print" +msgstr "Detener impresion" + +# MSG_STOPPED +#: messages.c:109 +msgid "STOPPED. " +msgstr "PARADA" + +# MSG_SUPPORT +#: ultralcd.cpp:6742 +msgid "Support" +msgstr "Soporte" + +# MSG_SELFTEST_SWAPPED +#: ultralcd.cpp:8080 +msgid "Swapped" +msgstr "Intercambiado" + +# +#: ultralcd.cpp:4715 +msgid "Select filament:" +msgstr "Selecciona filamento:" + +# MSG_TEMP_CALIBRATION c=14 +#: messages.c:110 +msgid "Temp. cal." +msgstr "Cal. temp." + +# +#: ultralcd.cpp:4856 +msgid "Select temperature which matches your material." +msgstr "Selecciona la temperatura adecuada a tu material." + +# MSG_CALIBRATION_PINDA_MENU c=17 r=1 +#: ultralcd.cpp:5816 +msgid "Temp. calibration" +msgstr "Calibracion temp." + +# MSG_TEMP_CAL_FAILED c=20 r=8 +#: ultralcd.cpp:3845 +msgid "Temperature calibration failed" +msgstr "Fallo de la calibracion de temperatura" + +# MSG_TEMP_CALIBRATION_DONE c=20 r=12 +#: messages.c:111 +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." + +# c=20 r=3 +#: ultralcd.cpp:7311 +msgid "Sensor verified, remove the filament now." +msgstr "Sensor verificado, retire el filamento ahora." + +# MSG_TEMPERATURE +#: ultralcd.cpp:5679 +msgid "Temperature" +msgstr "Temperatura" + +# MSG_MENU_TEMPERATURES c=15 r=1 +#: ultralcd.cpp:2160 +msgid "Temperatures" +msgstr "Temperaturas" + +# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#: messages.c:46 +msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo." + +# +#: ultralcd.cpp:2817 +msgid "Total filament" +msgstr "Filamento total" + +# +#: ultralcd.cpp:2818 +msgid "Total print time" +msgstr "Tiempo total" + +# MSG_TUNE +#: ultralcd.cpp:6612 +msgid "Tune" +msgstr "Ajustar" + +# +#: +msgid "Unload" +msgstr "Descargar" + +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 +msgid "Total failures" +msgstr "Fallos totales" + +# +#: ultralcd.cpp:2238 +msgid "to load filament" +msgstr "para cargar el filamento" + +# +#: ultralcd.cpp:2242 +msgid "to unload filament" +msgstr "para descargar el filamento" + +# MSG_UNLOAD_FILAMENT c=17 +#: messages.c:112 +msgid "Unload filament" +msgstr "Soltar filamento" + +# MSG_UNLOADING_FILAMENT c=20 r=1 +#: messages.c:113 +msgid "Unloading filament" +msgstr "Soltando filamento" + +# MSG_TOTAL c=6 +#: messages.c:98 +msgid "Total" +msgstr "" + +# MSG_USED c=19 r=1 +#: ultralcd.cpp:5932 +msgid "Used during print" +msgstr "Usado en impresion" + +# MSG_MENU_VOLTAGES c=15 r=1 +#: ultralcd.cpp:2163 +msgid "Voltages" +msgstr "Voltajes" + +# +#: ultralcd.cpp:2132 +msgid "unknown" +msgstr "desconocido" + +# MSG_USERWAIT +#: Marlin_main.cpp:5689 +msgid "Wait for user..." +msgstr "Esperando ordenes" + +# MSG_WAITING_TEMP c=20 r=3 +#: ultralcd.cpp:3357 +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:3318 +msgid "Waiting for PINDA probe cooling" +msgstr "Esperando a que se enfrie la sonda PINDA" + +# +#: +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:1573 +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:1565 +msgid "Warning: motherboard type changed." +msgstr "Cuidado: el tipo de placa ha cambiado." + +# MSG_CHANGED_PRINTER c=20 r=4 +#: Marlin_main.cpp:1569 +msgid "Warning: printer type changed." +msgstr "Cuidado: Ha cambiado el tipo de impresora." + +# MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#: Marlin_main.cpp:3308 +msgid "Was filament unload successful?" +msgstr "?Se cargocon exito el filamento?" + +# MSG_SELFTEST_WIRINGERROR +#: messages.c:96 +msgid "Wiring error" +msgstr "Error de conexion" + +# MSG_WIZARD c=17 r=1 +#: ultralcd.cpp:5775 +msgid "Wizard" +msgstr "" + +# MSG_XYZ_DETAILS c=18 +#: ultralcd.cpp:2152 +msgid "XYZ cal. details" +msgstr "Detalles cal. XYZ" + +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:18 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Calibracion XYZ fallada. Consulta el manual por favor." + +# MSG_YES +#: messages.c:119 +msgid "Yes" +msgstr "Si" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:118 +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:3817 +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:3814 +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_TIMEOUT c=12 +#: messages.c:157 +msgid "Timeout" +msgstr "Expirar" + +# MSG_X_CORRECTION c=13 +#: ultralcd.cpp:5091 +msgid "X-correct:" +msgstr "Corregir-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3811 +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:3795 +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:3798 +msgid "XYZ calibration compromised. Right front calibration point not reachable." +msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6171 +msgid "Load all" +msgstr "Intr. todos fil." + +# +#: ultralcd.cpp:3777 +msgid "XYZ calibration failed. Bed calibration point was not found." +msgstr "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." + +# +#: ultralcd.cpp:3783 +msgid "XYZ calibration failed. Front calibration points not reachable." +msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." + +# +#: ultralcd.cpp:3786 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." + +# +#: ultralcd.cpp:2917 +msgid "Y distance from min" +msgstr "Distancia en Y desde el min" + +# +#: ultralcd.cpp:4859 +msgid "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)." +msgstr "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)." + +# c=20 r=5 +#: ultralcd.cpp:7315 +msgid "Verification failed, remove the filament and try again." +msgstr "La verificacion fallo, retire el filamento e intente nuevamente." + +# MSG_Y_CORRECTION c=13 +#: ultralcd.cpp:5092 +msgid "Y-correct:" +msgstr "Corregir-Y:" + +# MSG_OFF +#: messages.c:122 +msgid "Off" +msgstr "Ina" + +# MSG_ON +#: messages.c:123 +msgid "On" +msgstr "Act" + +# +#: messages.c:62 +msgid "Back" +msgstr "atras" + +# +#: ultralcd.cpp:5647 +msgid "Checks" +msgstr "Comprobaciones" + +# +#: ultralcd.cpp:8090 +msgid "False triggering" +msgstr "Falsa activacion" + +# +#: ultralcd.cpp:3920 +msgid "FINDA:" +msgstr "FINDA:" + +# MSG_FIRMWARE +#: language.h:24 +msgid "Firmware" +msgstr "" + +# MSG_STRICT +#: messages.c:129 +msgid "Strict" +msgstr "Estrict" + +# MSG_WARN +#: messages.c:128 +msgid "Warn" +msgstr "Aviso" + +# MSG_HW_SETUP c=18 +#: messages.c:100 +msgid "HW Setup" +msgstr "Configuracion HW" + +# +#: ultralcd.cpp:3924 +msgid "IR:" +msgstr "" + +# MSG_MAGNETS_COMP +#: messages.c:150 +msgid "Magnets comp." +msgstr "Comp. imanes" + +# MSG_MESH +#: messages.c:147 +msgid "Mesh" +msgstr "Malla" + +# +#: Marlin_main.cpp:927 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detectado en impresora MK3" + +# MSG_MMU_MODE +#: messages.c:136 +msgid "MMU Mode" +msgstr "Modo MMU" + +# +#: ultralcd.cpp:4395 +msgid "Mode change in progress ..." +msgstr "Cambio de modo progresando ..." + +# MSG_MODEL +#: messages.c:130 +msgid "Model" +msgstr "Modelo" + +# MSG_NOZZLE_DIAMETER +#: messages.c:135 +msgid "Nozzle d." +msgstr "Diam. nozzl" + +# +#: util.cpp:514 +msgid "G-code sliced for a different level. Continue?" +msgstr "Codigo G laminado para un nivel diferente. ?Continuar?" + +# +#: util.cpp:520 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "Codigo G laminado para un nivel diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "Codigo G laminado para un tipo de impresora diferente. ?Continuar?" + +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 +msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." +msgstr "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." + +# +#: util.cpp:481 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "Codigo G laminado para nuevo firmware. ?Continuar?" + +# +#: util.cpp:487 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada." + +# +#: ultralcd.cpp:3916 +msgid "PINDA:" +msgstr "PINDA:" + +# c=20 +#: ultralcd.cpp:2402 +msgid "Preheating to cut" +msgstr "Precalent. laminar" + +# c=20 +#: ultralcd.cpp:2399 +msgid "Preheating to eject" +msgstr "Precalent. expulsar" + +# +#: util.cpp:394 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro nozzle impresora difiere de cod.G. ?Continuar?" + +# +#: util.cpp:401 +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." + +# c=20 +#: ultralcd.cpp:8095 +msgid "%s level expected" +msgstr "" + +# +#: ultralcd.cpp:6574 +msgid "Rename" +msgstr "Renombrar" + +# +#: ultralcd.cpp:6567 +msgid "Select" +msgstr "Seleccionar" + +# +#: ultralcd.cpp:2154 +msgid "Sensor info" +msgstr "Info sensor" + +# MSG_SHEET c=10 +#: messages.c:63 +msgid "Sheet" +msgstr "Lamina" + +# MSG_SOUND_BLIND +#: messages.c:146 +msgid "Assist" +msgstr "Asistido" + +# MSG_STEEL_SHEET c=18 +#: messages.c:64 +msgid "Steel sheets" +msgstr "Lamina de acero" + +# MSG_Z_CORRECTION c=13 +#: ultralcd.cpp:5093 +msgid "Z-correct:" +msgstr "Corregir-Z:" + +# MSG_Z_PROBE_NR +#: messages.c:149 +msgid "Z-probe nr." +msgstr "Z-sensor nr." + diff --git a/lang/po/new/fr.po b/lang/po/new/fr.po index fdfd39174..e5a1f586d 100644 --- a/lang/po/new/fr.po +++ b/lang/po/new/fr.po @@ -1,1857 +1,1852 @@ -# Translation of Prusa-Firmware into French. -# -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri Sep 18 15:24:37 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:24:37 CEST 2020\n" -"Language-Team: \n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -# -#: -msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -msgstr "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" - -# MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 -msgid " 0.3 or older" -msgstr " 0.3 ou +ancien" - -# c=18 -#: Marlin_main.cpp:9463 -msgid "FS v0.3 or older" -msgstr "FS v0.3 ou +ancien" - -# MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 -msgid " 0.4 or newer" -msgstr " 0.4 ou +recent" - -# c=18 -#: Marlin_main.cpp:9462 -msgid "FS v0.4 or newer" -msgstr "FS v0.4 ou +recent" - -# MSG_IR_UNKNOWN c=18 -#: messages.c:145 -msgid "unknown state" -msgstr "Etat inconnu" - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 -msgid " of 4" -msgstr " de 4" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 -msgid " of 9" -msgstr " de 9" - -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 -msgid "[0;0] point offset" -msgstr "Offset point [0;0]" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: -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 -#: -msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif" - -# -#: ultralcd.cpp:2451 -msgid ">Cancel" -msgstr ">Annuler" - -# MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 -msgid "Adjusting Z:" -msgstr "Ajuster Z:" - -# MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 -msgid "All correct " -msgstr "Tout est correct" - -# MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 -msgid "All is done. Happy printing!" -msgstr "Tout est pret. Bonne impression!" - -# -#: ultralcd.cpp:1956 -msgid "Ambient" -msgstr "Ambiant" - -# MSG_AUTO c=6 -#: messages.c:140 -msgid "Auto" -msgstr "" - -# MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 -msgid "and press the knob" -msgstr "et appuyez sur le bouton" - -# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 -msgid "Are left and right Z~carriages all up?" -msgstr "Z~carriages gauche + droite tout en haut?" - -# MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 -msgid "SpoolJoin" -msgstr "" - -# MSG_AUTO_HOME -#: messages.c:11 -msgid "Auto home" -msgstr "Mise a 0 des axes" - -# MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 -msgid "AutoLoad filament" -msgstr "Autocharge du fil." - -# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 -msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "Chargement auto du filament uniquement si le capteur de filament est active." - -# MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 -msgid "Autoloading filament is active, just press the knob and insert filament..." -msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." - -# MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 -msgid "Axis length" -msgstr "Longueur de l'axe" - -# MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 -msgid "Axis" -msgstr "Axe" - -# MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 -msgid "Bed / Heater" -msgstr "Lit / Chauffage" - -# MSG_BED_DONE -#: messages.c:15 -msgid "Bed done" -msgstr "Plateau termine" - -# MSG_BED_HEATING -#: messages.c:16 -msgid "Bed Heating" -msgstr "Chauffe du lit" - -# MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 -msgid "Bed level correct" -msgstr "Corr. niveau plateau" - -# MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 -msgid "Belt test " -msgstr "Test de courroie " - -# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 -#: messages.c:17 -msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -msgstr "Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset." - -# MSG_BRIGHT c=6 -#: messages.c:138 -msgid "Bright" -msgstr "Brill." - -# MSG_BRIGHTNESS c=18 -#: messages.c:134 -msgid "Brightness" -msgstr "Luminosite" - -# MSG_BED -#: messages.c:14 -msgid "Bed" -msgstr "Lit" - -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 -msgid "Belt status" -msgstr "Statut courroie" - -# MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 -msgid "Blackout occurred. Recover print?" -msgstr "Coupure detectee. Reprendre impression?" - -# -#: ultralcd.cpp:8706 -msgid "Calibrating home" -msgstr "Calib. mise a 0" - -# MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 -msgid "Calibrate XYZ" -msgstr "Calibrer XYZ" - -# MSG_HOMEYZ -#: messages.c:44 -msgid "Calibrate Z" -msgstr "Calibrer Z" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 -msgid "Calibrate" -msgstr "Calibrer" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 -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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." - -# MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 -msgid "Calibrating Z" -msgstr "Calibration Z" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 -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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." - -# MSG_HOMEYZ_DONE -#: ultralcd.cpp:865 -msgid "Calibration done" -msgstr "Calibration terminee" - -# MSG_MENU_CALIBRATION -#: messages.c:57 -msgid "Calibration" -msgstr "" - -# -#: ultralcd.cpp:4811 -msgid "Cancel" -msgstr "Annuler" - -# MSG_SD_REMOVED -#: ultralcd.cpp:9142 -msgid "Card removed" -msgstr "Carte retiree" - -# MSG_NOT_COLOR -#: ultralcd.cpp:2707 -msgid "Color not correct" -msgstr "Couleur incorrecte" - -# MSG_COOLDOWN -#: messages.c:22 -msgid "Cooldown" -msgstr "Refroidissement" - -# -#: ultralcd.cpp:4566 -msgid "Copy selected language?" -msgstr "Copier la langue choisie?" - -# MSG_CRASHDETECT c=13 -#: messages.c:24 -msgid "Crash det." -msgstr "Detect.crash" - -# -#: ultralcd.cpp:4946 -msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." -msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." - -# MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 -msgid "Crash detected." -msgstr "Crash detecte." - -# -#: Marlin_main.cpp:605 -msgid "Crash detected. Resume print?" -msgstr "Crash detecte. Poursuivre l'impression?" - -# -#: ultralcd.cpp:1785 -msgid "Crash" -msgstr "" - -# MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 -msgid "Current" -msgstr "Actuel" - -# MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 -msgid "Date:" -msgstr "Date:" - -# MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 -msgid "Disable steppers" -msgstr "Desactiver moteurs" - -# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: messages.c:13 -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 plateau n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche." - -# MSG_FS_CONTINUE c=5 -#: messages.c:132 -msgid "Cont." -msgstr "" - -# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 -msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -msgstr "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?" - -# MSG_EXTRUDER_CORRECTION c=13 -#: ultralcd.cpp:5190 -msgid "E-correct:" -msgstr "Correct-E:" - -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 -msgid "Eject filament" -msgstr "Remonter le fil." - -# MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 -msgid "Ejecting filament" -msgstr "Le fil. remonte" - -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 -msgid "Endstop not hit" -msgstr "Butee non atteinte" - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 -msgid "Endstop" -msgstr "Butee" - -# MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 -msgid "Endstops" -msgstr "Butees" - -# MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 -msgid "Error - static memory has been overwritten" -msgstr "Erreur - la memoire statique a ete ecrasee" - -# MSG_CUT_FILAMENT c=16 -#: messages.c:50 -msgid "Cut filament" -msgstr "Coupe filament" - -# MSG_CUTTER c=9 -#: messages.c:109 -msgid "Cutter" -msgstr "Coupeur" - -# c=18 -#: mmu.cpp:1388 -msgid "Cutting filament" -msgstr "Je coupe filament" - -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." - -# MSG_DIM c=6 -#: messages.c:139 -msgid "Dim" -msgstr "" - -# MSG_ERROR -#: messages.c:25 -msgid "ERROR:" -msgstr "ERREUR:" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 -msgid "Extruder fan:" -msgstr "Ventilo extrudeur:" - -# MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 -msgid "Extruder info" -msgstr "Infos extrudeur" - -# MSG_MOVE_E -#: messages.c:26 -msgid "Extruder" -msgstr "Extrudeur" - -# -#: ultralcd.cpp:7017 -msgid "Fail stats MMU" -msgstr "Stat. d'echec MMU" - -# MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 -msgid "F. autoload" -msgstr "F. autocharg." - -# -#: ultralcd.cpp:7014 -msgid "Fail stats" -msgstr "Stat. d'echec" - -# MSG_FAN_SPEED c=14 -#: messages.c:28 -msgid "Fan speed" -msgstr "Vitesse vent." - -# MSG_SELFTEST_FAN c=20 -#: messages.c:74 -msgid "Fan test" -msgstr "Test du ventilateur" - -# MSG_FANS_CHECK -#: ultralcd.cpp:5777 -msgid "Fans check" -msgstr "Verif vent." - -# MSG_FSENSOR -#: messages.c:41 -msgid "Fil. sensor" -msgstr "Capteur Fil." - -# c=14 -#: ultralcd.cpp:1784 -msgid "Filam. runouts" -msgstr "Fins filament" - -# MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 -msgid "Filament extruding & with correct color?" -msgstr "Filament extrude et avec bonne couleur?" - -# MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 -msgid "Filament not loaded" -msgstr "Filament non charge" - -# MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 -msgid "Filament sensor" -msgstr "Capteur de filament" - -# MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 -msgid "Filament used" -msgstr "Filament utilise" - -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 -msgid "Print time" -msgstr "Temps d'impression" - -# MSG_FS_ACTION c=10 -#: messages.c:131 -msgid "FS Action" -msgstr "" - -# MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 -msgid "File incomplete. Continue anyway?" -msgstr "Fichier incomplet. Continuer qd meme?" - -# MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 -msgid "Finishing movements" -msgstr "Mouvement final" - -# MSG_V2_CALIBRATION c=18 -#: messages.c:103 -msgid "First layer cal." -msgstr "Cal. 1ere couche" - -# MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 -msgid "First, I will run the selftest to check most common assembly problems." -msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." - -# -#: mmu.cpp:727 -msgid "Fix the issue and then press button on MMU unit." -msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." - -# MSG_FLOW -#: ultralcd.cpp:7157 -msgid "Flow" -msgstr "Flux" - -# MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 -msgid "forum.prusa3d.com" -msgstr "" - -# MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 -msgid "Front print fan?" -msgstr "Ventilo impr avant?" - -# MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 -msgid "Front side[um]" -msgstr "Avant [um]" - -# MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 -msgid "Front/left fans" -msgstr "Ventilos avt/gauche" - -# MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 -msgid "Heater/Thermistor" -msgstr "Chauffage/Thermistor" - -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 -msgid "Heating disabled by safety timer." -msgstr "Chauffage desactivee par le compteur de securite." - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:43 -msgid "Heating done." -msgstr "Chauffe terminee." - -# MSG_HEATING -#: messages.c:42 -msgid "Heating" -msgstr "Chauffe" - -# MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 -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:2158 -msgid "howto.prusa3d.com" -msgstr "" - -# MSG_FILAMENTCHANGE -#: messages.c:34 -msgid "Change filament" -msgstr "Changer filament" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 -msgid "Change success!" -msgstr "Changement reussi!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 -msgid "Changed correctly?" -msgstr "Change correctement?" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 -msgid "Checking bed " -msgstr "Verif. plateau chauf" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 -msgid "Checking endstops" -msgstr "Verification butees" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 -msgid "Checking hotend " -msgstr "Verif. du hotend" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 -msgid "Checking sensors " -msgstr "Verif. des capteurs" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 -msgid "Checking X axis " -msgstr "Verification axe X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 -msgid "Checking Y axis " -msgstr "Verification axe Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 -msgid "Checking Z axis " -msgstr "Verification axe Z" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 -msgid "Choose extruder:" -msgstr "Choisir extrudeur:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 -msgid "Choose filament:" -msgstr "Choix du filament:" - -# MSG_FILAMENT c=17 r=1 -#: messages.c:27 -msgid "Filament" -msgstr "" - -# MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 -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:5059 -msgid "I will run z calibration now." -msgstr "Je vais maintenant lancer la calibration Z." - -# MSG_WATCH -#: messages.c:97 -msgid "Info screen" -msgstr "Ecran d'info" - -# MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 -msgid "Insert filament" -msgstr "Inserez le filament" - -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 -msgid "Is filament loaded?" -msgstr "Fil. est-il charge?" - -# MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 -msgid "Is steel sheet on heatbed?" -msgstr "Est la plaque sur le plat. chauffant?" - -# -#: ultralcd.cpp:1727 -msgid "Last print failures" -msgstr "Echecs derniere imp." - -# -#: ultralcd.cpp:5129 -msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -msgstr "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." - -# -#: ultralcd.cpp:1704 -msgid "Last print" -msgstr "Derniere impres." - -# MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 -msgid "Left hotend fan?" -msgstr "Ventilo gauche?" - -# -#: ultralcd.cpp:2991 -msgid "Left" -msgstr "Gauche" - -# MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 -msgid "Left side [um]" -msgstr "Gauche [um]" - -# -#: ultralcd.cpp:5792 -msgid "Lin. correction" -msgstr "Correction lin." - -# MSG_BABYSTEP_Z -#: messages.c:12 -msgid "Live adjust Z" -msgstr "Ajuster Z en dir." - -# c=20 r=6 -#: ultralcd.cpp:7559 -msgid "Insert the filament (do not load it) into the extruder and then press the knob." -msgstr "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton." - -# MSG_LOAD_FILAMENT c=17 -#: messages.c:47 -msgid "Load filament" -msgstr "Charger filament" - -# MSG_LOADING_COLOR -#: ultralcd.cpp:2643 -msgid "Loading color" -msgstr "Charg. de la couleur" - -# MSG_LOADING_FILAMENT c=20 -#: messages.c:48 -msgid "Loading filament" -msgstr "Chargement du fil." - -# MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 -msgid "Loose pulley" -msgstr "Poulie lache" - -# -#: ultralcd.cpp:6976 -msgid "Load to nozzle" -msgstr "Charger la buse" - -# MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 -msgid "M117 First layer cal." -msgstr "M117 Cal. 1ere couche" - -# MSG_MAIN -#: messages.c:52 -msgid "Main" -msgstr "Menu principal" - -# MSG_BL_HIGH c=12 -#: messages.c:135 -msgid "Level Bright" -msgstr "Niveau brill" - -# MSG_BL_LOW c=12 -#: messages.c:136 -msgid "Level Dimmed" -msgstr "" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 -msgid "Measuring reference height of calibration point" -msgstr "Je mesure la hauteur de reference du point de calibrage" - -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 -msgid "Mesh Bed Leveling" -msgstr "" - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Reprise de la position ..." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Rechauffage de la buse..." - -# -#: ultralcd.cpp:3032 -msgid "Measured skew" -msgstr "Deviat.mesuree" - -# -#: ultralcd.cpp:1728 -msgid "MMU fails" -msgstr "Echecs MMU" - -# -#: mmu.cpp:1588 -msgid "MMU load failed " -msgstr "Echec chargement MMU" - -# -#: ultralcd.cpp:1729 -msgid "MMU load fails" -msgstr "Echecs charg. MMU" - -# MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 -msgid "MMU OK. Resuming..." -msgstr "MMU OK. Reprise ..." - -# MSG_MODE -#: messages.c:84 -msgid "Mode" -msgstr "" - -# c=20 r=3 -#: Marlin_main.cpp:884 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Firmware MK3 detecte sur imprimante MK3S" - -# MSG_NORMAL -#: messages.c:88 -msgid "Normal" -msgstr "" - -# MSG_SILENT -#: messages.c:87 -msgid "Silent" -msgstr "Furtif" - -# -#: mmu.cpp:722 -msgid "MMU needs user attention." -msgstr "Le MMU necessite l'attention de l'utilisateur." - -# -#: ultralcd.cpp:1755 -msgid "MMU power fails" -msgstr "Echecs alim. MMU" - -# MSG_STEALTH -#: messages.c:89 -msgid "Stealth" -msgstr "Furtif" - -# MSG_AUTO_POWER -#: messages.c:86 -msgid "Auto power" -msgstr "Puiss.auto" - -# MSG_HIGH_POWER -#: messages.c:85 -msgid "High power" -msgstr "Haute puiss" - -# -#: ultralcd.cpp:2176 -msgid "MMU2 connected" -msgstr "MMU2 connecte" - -# MSG_SELFTEST_MOTOR -#: messages.c:79 -msgid "Motor" -msgstr "Moteur" - -# MSG_MOVE_AXIS -#: ultralcd.cpp:5767 -msgid "Move axis" -msgstr "Deplacer l'axe" - -# MSG_MOVE_X -#: ultralcd.cpp:4357 -msgid "Move X" -msgstr "Deplacer X" - -# MSG_MOVE_Y -#: ultralcd.cpp:4358 -msgid "Move Y" -msgstr "Deplacer Y" - -# MSG_MOVE_Z -#: ultralcd.cpp:4359 -msgid "Move Z" -msgstr "Deplacer Z" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5555 -msgid "No move." -msgstr "Pas de mouvement." - -# MSG_NO_CARD -#: ultralcd.cpp:6943 -msgid "No SD card" -msgstr "Pas de carte SD" - -# MSG_NA -#: messages.c:107 -msgid "N/A" -msgstr "" - -# MSG_NO -#: messages.c:58 -msgid "No" -msgstr "Non" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 -msgid "Not connected" -msgstr "Non connecte" - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Nouvelle version de firmware disponible:" - -# MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 -msgid "Not spinning" -msgstr "Ne tourne pas" - -# MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 -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 la surface du plateau chauffant." - -# MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ultralcd.cpp:5067 -msgid "Now I will preheat nozzle for PLA." -msgstr "Maintenant je vais prechauffer la buse pour du PLA." - -# MSG_NOZZLE -#: messages.c:59 -msgid "Nozzle" -msgstr "Buse" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 -msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" - -# -#: ultralcd.cpp:5058 -msgid "Now remove the test print from steel sheet." -msgstr "Retirez maintenant l'impression de test de la plaque en acier." - -# -#: ultralcd.cpp:1654 -msgid "Nozzle FAN" -msgstr "Vent. buse" - -# MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 -msgid "Pause print" -msgstr "Pause de l'impr." - -# MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 -msgid "PID cal. " -msgstr "Calib. PID" - -# MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 -msgid "PID cal. finished" -msgstr "Calib. PID terminee" - -# MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 -msgid "PID calibration" -msgstr "Calibration PID" - -# MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 -msgid "PINDA Heating" -msgstr "Chauffe de la PINDA" - -# MSG_PAPER c=20 r=10 -#: messages.c:60 -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 vite l'imprimante." - -# MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ultralcd.cpp:5124 -msgid "Please clean heatbed and then press the knob." -msgstr "Nettoyez plateau chauffant en acier et appuyez sur le bouton." - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 -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:8303 -msgid "Please check :" -msgstr "Verifiez:" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 -msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." -msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." - -# MSG_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 -msgid "Please open idler and remove filament manually." -msgstr "Ouvrez l'idler et retirez le filament manuellement." - -# MSG_PLACE_STEEL_SHEET c=20 r=4 -#: messages.c:61 -msgid "Please place steel sheet on heatbed." -msgstr "Placez la plaque en acier sur le plateau chauffant." - -# MSG_PRESS_TO_UNLOAD c=20 r=4 -#: messages.c:64 -msgid "Please press the knob to unload filament" -msgstr "Appuyez sur le bouton pour decharger le filament" - -# MSG_PULL_OUT_FILAMENT c=20 r=4 -#: messages.c:66 -msgid "Please pull out filament immediately" -msgstr "Retirez immediatement le filament" - -# MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 -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 -msgid "Please remove steel sheet from heatbed." -msgstr "Retirez la plaque en acier du plateau chauffant." - -# MSG_RUN_XYZ c=20 r=4 -#: Marlin_main.cpp:4601 -msgid "Please run XYZ calibration first." -msgstr "Veuillez d'abord lancer la calibration XYZ." - -# MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 -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 -msgid "Please wait" -msgstr "Merci de patienter" - -# -#: ultralcd.cpp:5057 -msgid "Please remove shipping helpers first." -msgstr "Retirez d'abord les protections de transport." - -# MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 -msgid "Preheat the nozzle!" -msgstr "Prechauffez la buse!" - -# MSG_PREHEAT -#: ultralcd.cpp:6885 -msgid "Preheat" -msgstr "Prechauffage" - -# MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 -msgid "Preheating nozzle. Please wait." -msgstr "Prechauffage de la buse. Merci de patienter." - -# c=14 -#: ultralcd.cpp:1959 -msgid "PINDA" -msgstr "" - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Mettez a jour le FW." - -# MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 -msgid "Press knob to preheat nozzle and continue." -msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." - -# MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 -msgid "Pause" -msgstr "" - -# -#: ultralcd.cpp:1783 -msgid "Power failures" -msgstr "Coup.de courant" - -# MSG_PRINT_ABORTED c=20 -#: messages.c:65 -msgid "Print aborted" -msgstr "Impression annulee" - -# c=20 -#: ultralcd.cpp:2433 -msgid "Preheating to load" -msgstr "Chauffe pour charger" - -# c=20 -#: ultralcd.cpp:2437 -msgid "Preheating to unload" -msgstr "Chauf.pour decharger" - -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 -msgid "Print fan:" -msgstr "Vent. impr:" - -# MSG_CARD_MENU -#: messages.c:20 -msgid "Print from SD" -msgstr "Impr. depuis la SD" - -# -#: ultralcd.cpp:2280 -msgid "Press the knob" -msgstr "App. sur sur bouton" - -# MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 -msgid "Print paused" -msgstr "Impression en pause" - -# -#: mmu.cpp:726 -msgid "Press the knob to resume nozzle temperature." -msgstr "Appuyez sur le bouton pour rechauffer la buse." - -# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 -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." - -# -#: ultralcd.cpp:1655 -msgid "Print FAN" -msgstr "Vent. impr" - -# -#: ultralcd.cpp:4922 -msgid "Please insert filament into the extruder, then press the knob to load it." -msgstr "Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." - -# -#: ultralcd.cpp:4917 -msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." -msgstr "Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." - -# -#: ultralcd.cpp:4839 -msgid "Please load filament first." -msgstr "Veuillez d'abord charger un filament." - -# MSG_PRUSA3D -#: ultralcd.cpp:2156 -msgid "prusa3d.com" -msgstr "" - -# MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 -msgid "Rear side [um]" -msgstr "Arriere [um]" - -# c=20 r=4 -#: ultralcd.cpp:7583 -msgid "Please unload the filament first, then repeat this action." -msgstr "SVP, dechargez le filament et reessayez." - -# c=20 r=4 -#: ultralcd.cpp:7586 -msgid "Please check the IR sensor connection, unload filament if present." -msgstr "SVP, verifiez la connexion du capteur IR et si le filament est decharge." - -# MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 -msgid "Recovering print " -msgstr "Recup. impression " - -# MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 -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." - -# c=20 -#: -msgid "Prusa i3 MK3S OK." -msgstr "" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 -msgid "Reset XYZ calibr." -msgstr "Reinit. calib. XYZ" - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 -msgid "Reset" -msgstr "Reinitialiser" - -# MSG_RESUME_PRINT -#: ultralcd.cpp:6893 -msgid "Resume print" -msgstr "Reprendre impression" - -# MSG_RESUMING_PRINT c=20 -#: messages.c:69 -msgid "Resuming print" -msgstr "Reprise de l'impr." - -# MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 -msgid "Right side[um]" -msgstr "Droite [um]" - -# MSG_RPI_PORT -#: messages.c:123 -msgid "RPi port" -msgstr "Port RPi" - -# MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 -msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" -msgstr "Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" - -# MSG_SD_CARD -#: messages.c:118 -msgid "SD card" -msgstr "Carte SD" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 -msgid "FlashAir" -msgstr "FlshAir" - -# -#: ultralcd.cpp:2992 -msgid "Right" -msgstr "Droite" - -# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 -msgid "Searching bed calibration point" -msgstr "Recherche du point de calibration du plateau chauffant" - -# MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 -msgid "Select language" -msgstr "Choisir langue" - -# MSG_SELFTEST_OK -#: ultralcd.cpp:7858 -msgid "Self test OK" -msgstr "Auto-test OK" - -# MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 -msgid "Self test start " -msgstr "Debut auto-test" - -# MSG_SELFTEST -#: ultralcd.cpp:5871 -msgid "Selftest " -msgstr "Auto-test" - -# MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 -msgid "Selftest error !" -msgstr "Erreur auto-test!" - -# MSG_SELFTEST_FAILED c=20 -#: messages.c:73 -msgid "Selftest failed " -msgstr "Echec de l'auto-test" - -# MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 -msgid "Selftest will be run to calibrate accurate sensorless rehoming." -msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" - -# -#: ultralcd.cpp:5098 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." - -# MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 -msgid "Set temperature:" -msgstr "Regler temp.:" - -# c=20 -#: -msgid "Prusa i3 MK2.5 OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK2.5S OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK3 OK." -msgstr "" - -# MSG_SETTINGS -#: messages.c:82 -msgid "Settings" -msgstr "Reglages" - -# MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 -msgid "Show end stops" -msgstr "Afficher butees" - -# -#: ultralcd.cpp:4004 -msgid "Sensor state" -msgstr "Etat capteur" - -# MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 -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 -#: messages.c:120 -msgid "Sort" -msgstr "Tri" - -# MSG_NONE -#: messages.c:110 -msgid "None" -msgstr "Aucun" - -# MSG_SORT_TIME -#: messages.c:121 -msgid "Time" -msgstr "Heure" - -# -#: ultralcd.cpp:3035 -msgid "Severe skew:" -msgstr "Deviat.sev.:" - -# MSG_SORT_ALPHA -#: messages.c:122 -msgid "Alphabet" -msgstr "" - -# MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 -msgid "Sorting files" -msgstr "Tri des fichiers" - -# MSG_SOUND_LOUD -#: messages.c:125 -msgid "Loud" -msgstr "Fort" - -# -#: ultralcd.cpp:3034 -msgid "Slight skew:" -msgstr "Deviat.leg.:" - -# MSG_SOUND -#: messages.c:124 -msgid "Sound" -msgstr "Son" - -# c=7 -#: ultralcd.cpp:1822 -msgid "Runouts" -msgstr "" - -# -#: Marlin_main.cpp:5115 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." - -# MSG_SOUND_ONCE -#: messages.c:126 -msgid "Once" -msgstr "Une fois" - -# MSG_SPEED -#: ultralcd.cpp:7151 -msgid "Speed" -msgstr "Vitesse" - -# MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 -msgid "Spinning" -msgstr "Tourne" - -# MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 -msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." -msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." - -# MSG_STATISTICS -#: ultralcd.cpp:7010 -msgid "Statistics " -msgstr "Statistiques" - -# MSG_STOP_PRINT -#: messages.c:91 -msgid "Stop print" -msgstr "Arreter impression" - -# MSG_STOPPED -#: messages.c:92 -msgid "STOPPED. " -msgstr "ARRETE." - -# MSG_SUPPORT -#: ultralcd.cpp:7019 -msgid "Support" -msgstr "" - -# MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 -msgid "Swapped" -msgstr "Echange" - -# -#: ultralcd.cpp:4810 -msgid "Select filament:" -msgstr "Selectionnez le filament:" - -# MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 -msgid "Temp. cal." -msgstr "Calib. Temp." - -# -#: ultralcd.cpp:4951 -msgid "Select temperature which matches your material." -msgstr "Selectionnez la temperature qui correspond a votre materiau." - -# MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 -msgid "Temp. calibration" -msgstr "Calibration temp." - -# MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 -msgid "Temperature calibration failed" -msgstr "Echec de la calibration en temperature" - -# MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 -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 activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." - -# c=20 r=3 -#: ultralcd.cpp:7590 -msgid "Sensor verified, remove the filament now." -msgstr "Capteur verifie, retirez le filament maintenant." - -# MSG_TEMPERATURE -#: ultralcd.cpp:5765 -msgid "Temperature" -msgstr "" - -# MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 -msgid "Temperatures" -msgstr "" - -# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 -msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." - -# -#: ultralcd.cpp:2889 -msgid "Total filament" -msgstr "Filament total" - -# -#: ultralcd.cpp:2890 -msgid "Total print time" -msgstr "Temps total impr." - -# MSG_TUNE -#: ultralcd.cpp:6882 -msgid "Tune" -msgstr "Regler" - -# -#: -msgid "Unload" -msgstr "Decharger" - -# -#: ultralcd.cpp:1752 -msgid "Total failures" -msgstr "Total des echecs" - -# -#: ultralcd.cpp:2287 -msgid "to load filament" -msgstr "pour charger le fil." - -# -#: ultralcd.cpp:2291 -msgid "to unload filament" -msgstr "pour decharger fil." - -# MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 -msgid "Unload filament" -msgstr "Decharger fil." - -# MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 -msgid "Unloading filament" -msgstr "Dechargement fil." - -# -#: ultralcd.cpp:1705 -msgid "Total" -msgstr "Totale" - -# MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 -msgid "Used during print" -msgstr "Utilise pdt impr." - -# MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 -msgid "Voltages" -msgstr "Tensions" - -# -#: ultralcd.cpp:2184 -msgid "unknown" -msgstr "inconnu" - -# MSG_USERWAIT -#: Marlin_main.cpp:5525 -msgid "Wait for user..." -msgstr "Attente utilisateur..." - -# MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 -msgid "Waiting for nozzle and bed cooling" -msgstr "Attente du refroidissement des buse et plateau chauffant" - -# MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 -msgid "Waiting for PINDA probe cooling" -msgstr "Attente du refroidissement de la sonde PINDA" - -# -#: -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 Remonter le fil. 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:1525 -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:1517 -msgid "Warning: motherboard type changed." -msgstr "Attention: Type de carte mere modifie." - -# MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 -msgid "Warning: printer type changed." -msgstr "Attention: Type d'imprimante modifie" - -# MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 -msgid "Was filament unload successful?" -msgstr "Dechargement du filament reussi?" - -# MSG_SELFTEST_WIRINGERROR -#: messages.c:81 -msgid "Wiring error" -msgstr "Erreur de cablage" - -# MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 -msgid "Wizard" -msgstr "Assistant" - -# MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 -msgid "XYZ cal. details" -msgstr "Details calib. XYZ" - -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:18 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Echec calibration XYZ. Consultez le manuel." - -# MSG_YES -#: messages.c:102 -msgid "Yes" -msgstr "Oui" - -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 -msgid "You can always resume the Wizard from Calibration -> Wizard." -msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." - -# MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ultralcd.cpp:3902 -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:3899 -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!" - -# MSG_TIMEOUT c=12 -#: messages.c:137 -msgid "Timeout" -msgstr "" - -# MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 -msgid "X-correct:" -msgstr "Correct-X:" - -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 -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:3880 -msgid "XYZ calibration compromised. Front calibration points not reachable." -msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." - -# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ultralcd.cpp:3883 -msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 -msgid "Load all" -msgstr "Charger un par un" - -# -#: ultralcd.cpp:3862 -msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." - -# -#: ultralcd.cpp:3868 -msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." - -# -#: ultralcd.cpp:3871 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." - -# -#: ultralcd.cpp:2989 -msgid "Y distance from min" -msgstr "Distance Y du min" - -# -#: ultralcd.cpp:4954 -msgid "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)." -msgstr "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)." - -# c=20 r=5 -#: ultralcd.cpp:7594 -msgid "Verification failed, remove the filament and try again." -msgstr "Verification en echec, retirez le filament et reessayez." - -# MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 -msgid "Y-correct:" -msgstr "Correct-Y:" - -# MSG_OFF -#: messages.c:105 -msgid "Off" -msgstr "" - -# MSG_ON -#: messages.c:106 -msgid "On" -msgstr "" - -# -#: messages.c:53 -msgid "Back" -msgstr "Retour" - -# -#: ultralcd.cpp:5742 -msgid "Checks" -msgstr "Verifications" - -# -#: ultralcd.cpp:8395 -msgid "False triggering" -msgstr "Faux declenchement" - -# -#: ultralcd.cpp:4009 -msgid "FINDA:" -msgstr "FINDA:" - -# MSG_FIRMWARE -#: language.h:23 -msgid "Firmware" -msgstr "" - -# MSG_STRICT -#: messages.c:112 -msgid "Strict" -msgstr "Stricte" - -# MSG_WARN -#: messages.c:111 -msgid "Warn" -msgstr "Avert" - -# -#: messages.c:83 -msgid "HW Setup" -msgstr "Config HW" - -# -#: ultralcd.cpp:4013 -msgid "IR:" -msgstr "IR:" - -# MSG_MAGNETS_COMP -#: messages.c:130 -msgid "Magnets comp." -msgstr "Compens. aim." - -# MSG_MESH -#: messages.c:128 -msgid "Mesh" -msgstr "" - -# -#: ultralcd.cpp:5789 -msgid "Mesh bed leveling" -msgstr "" - -# -#: Marlin_main.cpp:877 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Firmware MK3S detecte sur imprimante MK3" - -# MSG_MMU_MODE -#: messages.c:117 -msgid "MMU Mode" -msgstr "Mode MMU" - -# -#: ultralcd.cpp:4490 -msgid "Mode change in progress ..." -msgstr "Changement de mode en cours..." - -# MSG_MODEL -#: messages.c:113 -msgid "Model" -msgstr "Modele" - -# MSG_NOZZLE_DIAMETER -#: messages.c:116 -msgid "Nozzle d." -msgstr "Diam. buse" - -# -#: util.cpp:514 -msgid "G-code sliced for a different level. Continue?" -msgstr "Le G-code a ete prepare pour un niveau different. Continuer?" - -# -#: util.cpp:520 -msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." -msgstr "Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee." - -# -#: util.cpp:431 -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:437 -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:481 -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:487 -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." - -# -#: ultralcd.cpp:4005 -msgid "PINDA:" -msgstr "PINDA:" - -# c=20 -#: ultralcd.cpp:2443 -msgid "Preheating to cut" -msgstr "Chauffe pour couper" - -# c=20 -#: ultralcd.cpp:2440 -msgid "Preheating to eject" -msgstr "Chauf. pour remonter" - -# -#: util.cpp:394 -msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?" - -# -#: util.cpp:401 -msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." -msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." - -# c=20 -#: ultralcd.cpp:8401 -msgid "%s level expected" -msgstr "" - -# -#: ultralcd.cpp:6846 -msgid "Rename" -msgstr "Renommer" - -# -#: ultralcd.cpp:6839 -msgid "Select" -msgstr "Selectionner" - -# -#: ultralcd.cpp:2202 -msgid "Sensor info" -msgstr "Info capteur" - -# MSG_SHEET c=10 -#: messages.c:54 -msgid "Sheet" -msgstr "Plaque" - -# MSG_SOUND_BLIND -#: messages.c:127 -msgid "Assist" -msgstr "" - -# c=18 -#: ultralcd.cpp:5740 -msgid "Steel sheets" -msgstr "Plaques en acier" - -# MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 -msgid "Z-correct:" -msgstr "Correct-Z:" - -# MSG_Z_PROBE_NR -#: messages.c:129 -msgid "Z-probe nr." -msgstr "Mesurer x-fois" - +# Translation of Prusa-Firmware into French. +# +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Di 26. Jan 11:04:08 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:08 CET 2021\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +# +#: +msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +msgstr "[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset" + +# MSG_IR_03_OR_OLDER c=18 +#: messages.c:164 +msgid " 0.3 or older" +msgstr " 0.3 ou +ancien" + +# c=18 +#: Marlin_main.cpp:9626 +msgid "FS v0.3 or older" +msgstr "FS v0.3 ou +ancien" + +# MSG_IR_04_OR_NEWER c=18 +#: messages.c:163 +msgid " 0.4 or newer" +msgstr " 0.4 ou +recent" + +# c=18 +#: Marlin_main.cpp:9625 +msgid "FS v0.4 or newer" +msgstr "FS v0.4 ou +recent" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:165 +msgid "unknown state" +msgstr "Etat inconnu" + +# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 +#: messages.c:43 +msgid " of 4" +msgstr " de 4" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 +#: messages.c:66 +msgid " of 9" +msgstr " de 9" + +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:2988 +msgid "[0;0] point offset" +msgstr "Offset point [0;0]" + +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +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 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif" + +# +#: ultralcd.cpp:2410 +msgid ">Cancel" +msgstr ">Annuler" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3108 +msgid "Adjusting Z:" +msgstr "Ajuster Z:" + +# MSG_SELFTEST_CHECK_ALLCORRECT c=20 +#: ultralcd.cpp:8390 +msgid "All correct " +msgstr "Tout est correct" + +# MSG_WIZARD_DONE c=20 r=8 +#: messages.c:116 +msgid "All is done. Happy printing!" +msgstr "Tout est pret. Bonne impression!" + +# +#: ultralcd.cpp:1902 +msgid "Ambient" +msgstr "Ambiant" + +# MSG_AUTO c=6 +#: messages.c:160 +msgid "Auto" +msgstr "" + +# MSG_PRESS c=20 r=2 +#: ultralcd.cpp:2567 +msgid "and press the knob" +msgstr "et appuyez sur le bouton" + +# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#: ultralcd.cpp:3429 +msgid "Are left and right Z~carriages all up?" +msgstr "Z~carriages gauche + droite tout en haut?" + +# MSG_AUTO_DEPLETE c=17 r=1 +#: messages.c:125 +msgid "SpoolJoin" +msgstr "" + +# MSG_AUTO_HOME +#: messages.c:11 +msgid "Auto home" +msgstr "Mise a 0 des axes" + +# MSG_AUTOLOAD_FILAMENT c=18 +#: ultralcd.cpp:6716 +msgid "AutoLoad filament" +msgstr "Autocharge du fil." + +# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +#: ultralcd.cpp:4346 +msgid "Autoloading filament available only when filament sensor is turned on..." +msgstr "Chargement auto du filament uniquement si le capteur de filament est active." + +# MSG_AUTOLOADING_ENABLED c=20 r=4 +#: ultralcd.cpp:2730 +msgid "Autoloading filament is active, just press the knob and insert filament..." +msgstr "Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil." + +# MSG_SELFTEST_AXIS_LENGTH +#: ultralcd.cpp:8073 +msgid "Axis length" +msgstr "Longueur de l'axe" + +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:8074 +msgid "Axis" +msgstr "Axe" + +# MSG_SELFTEST_BEDHEATER +#: ultralcd.cpp:8031 +msgid "Bed / Heater" +msgstr "Lit / Chauffage" + +# MSG_BED_DONE +#: messages.c:15 +msgid "Bed done" +msgstr "Plateau termine" + +# MSG_BED_HEATING +#: messages.c:16 +msgid "Bed Heating" +msgstr "Chauffe du lit" + +# MSG_BED_CORRECTION_MENU +#: ultralcd.cpp:5802 +msgid "Bed level correct" +msgstr "Corr. niveau plateau" + +# MSG_BELTTEST c=17 +#: ultralcd.cpp:5782 +msgid "Belt test " +msgstr "Test de courroie " + +# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 +#: messages.c:17 +msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." +msgstr "Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset." + +# MSG_BRIGHT c=6 +#: messages.c:158 +msgid "Bright" +msgstr "Brill." + +# MSG_BRIGHTNESS c=18 +#: messages.c:154 +msgid "Brightness" +msgstr "Luminosite" + +# MSG_BED +#: messages.c:14 +msgid "Bed" +msgstr "Lit" + +# MSG_BELT_STATUS c=18 +#: +msgid "Belt status" +msgstr "Statut courroie" + +# MSG_RECOVER_PRINT c=20 r=2 +#: messages.c:80 +msgid "Blackout occurred. Recover print?" +msgstr "Coupure detectee. Reprendre impression?" + +# +#: ultralcd.cpp:8392 +msgid "Calibrating home" +msgstr "Calib. mise a 0" + +# MSG_CALIBRATE_BED +#: ultralcd.cpp:5791 +msgid "Calibrate XYZ" +msgstr "Calibrer XYZ" + +# MSG_HOMEYZ +#: messages.c:51 +msgid "Calibrate Z" +msgstr "Calibrer Z" + +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4538 +msgid "Calibrate" +msgstr "Calibrer" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 +#: ultralcd.cpp:3392 +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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." + +# MSG_CALIBRATE_Z_AUTO c=20 r=2 +#: messages.c:20 +msgid "Calibrating Z" +msgstr "Calibration Z" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 +#: ultralcd.cpp:3392 +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 faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." + +# MSG_HOMEYZ_DONE +#: ultralcd.cpp:813 +msgid "Calibration done" +msgstr "Calibration terminee" + +# MSG_MENU_CALIBRATION +#: messages.c:67 +msgid "Calibration" +msgstr "" + +# +#: ultralcd.cpp:4716 +msgid "Cancel" +msgstr "Annuler" + +# MSG_SD_REMOVED +#: ultralcd.cpp:8842 +msgid "Card removed" +msgstr "Carte retiree" + +# MSG_NOT_COLOR +#: ultralcd.cpp:2647 +msgid "Color not correct" +msgstr "Couleur incorrecte" + +# MSG_COOLDOWN +#: messages.c:25 +msgid "Cooldown" +msgstr "Refroidissement" + +# +#: ultralcd.cpp:4471 +msgid "Copy selected language?" +msgstr "Copier la langue choisie?" + +# MSG_CRASHDETECT c=13 +#: messages.c:28 +msgid "Crash det." +msgstr "Detect.crash" + +# +#: ultralcd.cpp:4851 +msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." +msgstr "Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran." + +# MSG_CRASH_DETECTED c=20 r=1 +#: messages.c:27 +msgid "Crash detected." +msgstr "Crash detecte." + +# +#: Marlin_main.cpp:657 +msgid "Crash detected. Resume print?" +msgstr "Crash detecte. Poursuivre l'impression?" + +# MSG_CRASH c=7 +#: messages.c:26 +msgid "Crash" +msgstr "" + +# MSG_CURRENT c=19 r=1 +#: ultralcd.cpp:5933 +msgid "Current" +msgstr "Actuel" + +# MSG_DATE c=17 r=1 +#: ultralcd.cpp:2112 +msgid "Date:" +msgstr "Date:" + +# MSG_DISABLE_STEPPERS +#: ultralcd.cpp:5683 +msgid "Disable steppers" +msgstr "Desactiver moteurs" + +# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 +#: messages.c:13 +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 plateau n'a pas encore ete reglee. Suivez le manuel, chapitre Premiers pas, section Calibration de la premiere couche." + +# MSG_FS_CONTINUE c=5 +#: messages.c:152 +msgid "Cont." +msgstr "" + +# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 +#: ultralcd.cpp:5026 +msgid "Do you want to repeat last step to readjust distance between nozzle and heatbed?" +msgstr "Voulez-vous refaire l'etape pour reajuster la hauteur entre la buse et le plateau chauffant?" + +# MSG_EXTRUDER_CORRECTION c=13 +#: ultralcd.cpp:5095 +msgid "E-correct:" +msgstr "Correct-E:" + +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 +msgid "Eject filament" +msgstr "Remonter le fil." + +# MSG_EJECTING_FILAMENT c=20 r=1 +#: mmu.cpp:1414 +msgid "Ejecting filament" +msgstr "Le fil. remonte" + +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 +#: ultralcd.cpp:8049 +msgid "Endstop not hit" +msgstr "Butee non atteinte" + +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:8044 +msgid "Endstop" +msgstr "Butee" + +# MSG_SELFTEST_ENDSTOPS +#: ultralcd.cpp:8035 +msgid "Endstops" +msgstr "Butees" + +# MSG_STACK_ERROR c=20 r=4 +#: ultralcd.cpp:6753 +msgid "Error - static memory has been overwritten" +msgstr "Erreur - la memoire statique a ete ecrasee" + +# MSG_CUT_FILAMENT c=16 +#: messages.c:59 +msgid "Cut filament" +msgstr "Coupe filament" + +# MSG_CUTTER c=9 +#: messages.c:126 +msgid "Cutter" +msgstr "Coupeur" + +# c=18 +#: mmu.cpp:1386 +msgid "Cutting filament" +msgstr "Je coupe filament" + +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4359 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "ERREUR: Le capteur de filament ne repond pas, verifiez le branchement." + +# MSG_DIM c=6 +#: messages.c:159 +msgid "Dim" +msgstr "" + +# MSG_ERROR +#: messages.c:29 +msgid "ERROR:" +msgstr "ERREUR:" + +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8398 +msgid "Extruder fan:" +msgstr "Ventilo extrudeur:" + +# MSG_INFO_EXTRUDER c=18 +#: ultralcd.cpp:2153 +msgid "Extruder info" +msgstr "Infos extrudeur" + +# MSG_EXTRUDER c=17 +#: messages.c:30 +msgid "Extruder" +msgstr "Extrudeur" + +# +#: ultralcd.cpp:6740 +msgid "Fail stats MMU" +msgstr "Stat. d'echec MMU" + +# MSG_FSENSOR_AUTOLOAD c=13 +#: messages.c:47 +msgid "F. autoload" +msgstr "F. autocharg." + +# +#: ultralcd.cpp:6737 +msgid "Fail stats" +msgstr "Stat. d'echec" + +# MSG_FAN_SPEED c=14 +#: messages.c:34 +msgid "Fan speed" +msgstr "Vitesse vent." + +# MSG_SELFTEST_FAN c=20 +#: messages.c:89 +msgid "Fan test" +msgstr "Test du ventilateur" + +# MSG_FANS_CHECK c=13 +#: messages.c:31 +msgid "Fans check" +msgstr "Verif vent." + +# MSG_FSENSOR +#: messages.c:48 +msgid "Fil. sensor" +msgstr "Capteur Fil." + +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fins filament " + +# MSG_FILAMENT_CLEAN c=20 r=2 +#: messages.c:35 +msgid "Filament extruding & with correct color?" +msgstr "Filament extrude et avec bonne couleur?" + +# MSG_NOT_LOADED c=19 +#: ultralcd.cpp:2646 +msgid "Filament not loaded" +msgstr "Filament non charge" + +# MSG_FILAMENT_SENSOR c=20 +#: messages.c:95 +msgid "Filament sensor" +msgstr "Capteur de filament" + +# MSG_FILAMENT_USED c=19 +#: ultralcd.cpp:2795 +msgid "Filament used" +msgstr "Filament utilise" + +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2796 +msgid "Print time" +msgstr "Temps d'impression" + +# MSG_FS_ACTION c=10 +#: messages.c:151 +msgid "FS Action" +msgstr "" + +# MSG_FILE_INCOMPLETE c=20 r=3 +#: ultralcd.cpp:8540 +msgid "File incomplete. Continue anyway?" +msgstr "Fichier incomplet. Continuer qd meme?" + +# MSG_FINISHING_MOVEMENTS c=20 +#: messages.c:44 +msgid "Finishing movements" +msgstr "Mouvement final" + +# MSG_V2_CALIBRATION c=18 +#: messages.c:120 +msgid "First layer cal." +msgstr "Cal. 1ere couche" + +# MSG_WIZARD_SELFTEST c=20 r=8 +#: ultralcd.cpp:4947 +msgid "First, I will run the selftest to check most common assembly problems." +msgstr "D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs." + +# +#: mmu.cpp:726 +msgid "Fix the issue and then press button on MMU unit." +msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." + +# MSG_FLOW +#: ultralcd.cpp:6880 +msgid "Flow" +msgstr "Flux" + +# MSG_PRUSA3D_FORUM +#: ultralcd.cpp:2105 +msgid "forum.prusa3d.com" +msgstr "" + +# MSG_SELFTEST_COOLING_FAN c=20 +#: messages.c:86 +msgid "Front print fan?" +msgstr "Ventilo impr avant?" + +# MSG_BED_CORRECTION_FRONT c=14 r=1 +#: ultralcd.cpp:3190 +msgid "Front side[um]" +msgstr "Avant [um]" + +# MSG_SELFTEST_FANS +#: ultralcd.cpp:8079 +msgid "Front/left fans" +msgstr "Ventilos avt/gauche" + +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:8027 +msgid "Heater/Thermistor" +msgstr "Chauffage/Thermistor" + +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:9616 +msgid "Heating disabled by safety timer." +msgstr "Chauffage desactivee par le compteur de securite." + +# MSG_HEATING_COMPLETE c=20 +#: messages.c:50 +msgid "Heating done." +msgstr "Chauffe terminee." + +# MSG_HEATING +#: messages.c:49 +msgid "Heating" +msgstr "Chauffe" + +# MSG_WIZARD_WELCOME c=20 r=7 +#: ultralcd.cpp:4926 +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:2106 +msgid "howto.prusa3d.com" +msgstr "" + +# MSG_FILAMENTCHANGE +#: messages.c:41 +msgid "Change filament" +msgstr "Changer filament" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2576 +msgid "Change success!" +msgstr "Changement reussi!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2644 +msgid "Changed correctly?" +msgstr "Change correctement?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:92 +msgid "Checking bed " +msgstr "Verif. plateau chauf" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8381 +msgid "Checking endstops" +msgstr "Verification butees" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8387 +msgid "Checking hotend " +msgstr "Verif. du hotend" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:93 +msgid "Checking sensors " +msgstr "Verif. des capteurs" + +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Verification axe X" + +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Verification axe Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: +msgid "Checking Z axis" +msgstr "Verification axe Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:52 +msgid "Choose extruder:" +msgstr "Choisir extrudeur:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:53 +msgid "Choose filament:" +msgstr "Choix du filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:33 +msgid "Filament" +msgstr "" + +# MSG_WIZARD_XYZ_CAL c=20 r=8 +#: ultralcd.cpp:4956 +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:4964 +msgid "I will run z calibration now." +msgstr "Je vais maintenant lancer la calibration Z." + +# MSG_WATCH +#: messages.c:114 +msgid "Info screen" +msgstr "Ecran d'info" + +# MSG_INSERT_FILAMENT c=20 +#: ultralcd.cpp:2564 +msgid "Insert filament" +msgstr "Inserez le filament" + +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 +msgid "Is filament loaded?" +msgstr "Fil. est-il charge?" + +# MSG_STEEL_SHEET_CHECK c=20 r=2 +#: messages.c:107 +msgid "Is steel sheet on heatbed?" +msgstr "Est la plaque sur le plat. chauffant?" + +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 +msgid "Last print failures" +msgstr "Echecs derniere imp." + +# +#: ultralcd.cpp:5034 +msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +msgstr "Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier." + +# MSG_LAST_PRINT c=18 +#: messages.c:54 +msgid "Last print" +msgstr "Derniere impres." + +# MSG_SELFTEST_EXTRUDER_FAN c=20 +#: messages.c:87 +msgid "Left hotend fan?" +msgstr "Ventilo gauche?" + +# +#: ultralcd.cpp:2919 +msgid "Left" +msgstr "Gauche" + +# MSG_BED_CORRECTION_LEFT c=14 r=1 +#: ultralcd.cpp:3188 +msgid "Left side [um]" +msgstr "Gauche [um]" + +# +#: ultralcd.cpp:5706 +msgid "Lin. correction" +msgstr "Correction lin." + +# MSG_BABYSTEP_Z +#: messages.c:12 +msgid "Live adjust Z" +msgstr "Ajuster Z en dir." + +# c=20 r=6 +#: ultralcd.cpp:7280 +msgid "Insert the filament (do not load it) into the extruder and then press the knob." +msgstr "Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton." + +# MSG_LOAD_FILAMENT c=17 +#: messages.c:56 +msgid "Load filament" +msgstr "Charger filament" + +# MSG_LOADING_COLOR +#: ultralcd.cpp:2598 +msgid "Loading color" +msgstr "Charg. de la couleur" + +# MSG_LOADING_FILAMENT c=20 +#: messages.c:57 +msgid "Loading filament" +msgstr "Chargement du fil." + +# MSG_LOOSE_PULLEY c=20 r=1 +#: ultralcd.cpp:8067 +msgid "Loose pulley" +msgstr "Poulie lache" + +# +#: ultralcd.cpp:6699 +msgid "Load to nozzle" +msgstr "Charger la buse" + +# MSG_M117_V2_CALIBRATION c=25 +#: messages.c:60 +msgid "M117 First layer cal." +msgstr "M117 Cal. 1ere couche" + +# MSG_MAIN +#: messages.c:61 +msgid "Main" +msgstr "Menu principal" + +# MSG_BL_HIGH c=12 +#: messages.c:155 +msgid "Level Bright" +msgstr "Niveau brill" + +# MSG_BL_LOW c=12 +#: messages.c:156 +msgid "Level Dimmed" +msgstr "" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 +#: messages.c:65 +msgid "Measuring reference height of calibration point" +msgstr "Je mesure la hauteur de reference du point de calibrage" + +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 +msgid "Mesh Bed Leveling" +msgstr "" + +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:764 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Reprise de la position ..." + +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:757 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Rechauffage de la buse..." + +# +#: ultralcd.cpp:2960 +msgid "Measured skew" +msgstr "Deviat.mesuree" + +# MSG_MMU_FAILS c=14 +#: messages.c:68 +msgid "MMU fails" +msgstr "Echecs MMU" + +# +#: mmu.cpp:1586 +msgid "MMU load failed " +msgstr "Echec chargement MMU" + +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 +msgid "MMU load fails" +msgstr "Echecs charg. MMU" + +# MSG_MMU_OK_RESUMING c=20 r=4 +#: mmu.cpp:775 +msgid "MMU OK. Resuming..." +msgstr "MMU OK. Reprise ..." + +# MSG_MODE +#: messages.c:101 +msgid "Mode" +msgstr "" + +# c=20 r=3 +#: Marlin_main.cpp:934 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detecte sur imprimante MK3S" + +# MSG_NORMAL +#: messages.c:105 +msgid "Normal" +msgstr "" + +# MSG_SILENT +#: messages.c:104 +msgid "Silent" +msgstr "Furtif" + +# +#: mmu.cpp:721 +msgid "MMU needs user attention." +msgstr "Le MMU necessite l'attention de l'utilisateur." + +# +#: ultralcd.cpp:1701 +msgid "MMU power fails" +msgstr "Echecs alim. MMU" + +# MSG_STEALTH +#: messages.c:106 +msgid "Stealth" +msgstr "Furtif" + +# MSG_AUTO_POWER +#: messages.c:103 +msgid "Auto power" +msgstr "Puiss.auto" + +# MSG_HIGH_POWER +#: messages.c:102 +msgid "High power" +msgstr "Haute puiss" + +# +#: ultralcd.cpp:2124 +msgid "MMU2 connected" +msgstr "MMU2 connecte" + +# MSG_SELFTEST_MOTOR +#: messages.c:94 +msgid "Motor" +msgstr "Moteur" + +# MSG_MOVE_AXIS +#: ultralcd.cpp:5681 +msgid "Move axis" +msgstr "Deplacer l'axe" + +# MSG_MOVE_X +#: ultralcd.cpp:4262 +msgid "Move X" +msgstr "Deplacer X" + +# MSG_MOVE_Y +#: ultralcd.cpp:4263 +msgid "Move Y" +msgstr "Deplacer Y" + +# MSG_MOVE_Z +#: ultralcd.cpp:4264 +msgid "Move Z" +msgstr "Deplacer Z" + +# MSG_NO_MOVE +#: Marlin_main.cpp:5719 +msgid "No move." +msgstr "Pas de mouvement." + +# MSG_NO_CARD +#: ultralcd.cpp:6673 +msgid "No SD card" +msgstr "Pas de carte SD" + +# MSG_NA +#: messages.c:124 +msgid "N/A" +msgstr "" + +# MSG_NO +#: messages.c:70 +msgid "No" +msgstr "Non" + +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:8028 +msgid "Not connected" +msgstr "Non connecte" + +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Nouvelle version de firmware disponible:" + +# MSG_SELFTEST_FAN_NO c=19 +#: messages.c:90 +msgid "Not spinning" +msgstr "Ne tourne pas" + +# MSG_WIZARD_V2_CAL c=20 r=8 +#: ultralcd.cpp:4847 +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 la surface du plateau chauffant." + +# MSG_WIZARD_WILL_PREHEAT c=20 r=4 +#: ultralcd.cpp:4972 +msgid "Now I will preheat nozzle for PLA." +msgstr "Maintenant je vais prechauffer la buse pour du PLA." + +# MSG_NOZZLE +#: messages.c:71 +msgid "Nozzle" +msgstr "Buse" + +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 +#: Marlin_main.cpp:1581 +msgid "Old settings found. Default PID, Esteps etc. will be set." +msgstr "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" + +# +#: ultralcd.cpp:4963 +msgid "Now remove the test print from steel sheet." +msgstr "Retirez maintenant l'impression de test de la plaque en acier." + +# +#: ultralcd.cpp:1600 +msgid "Nozzle FAN" +msgstr "Vent. buse" + +# MSG_PAUSE_PRINT +#: ultralcd.cpp:6637 +msgid "Pause print" +msgstr "Pause de l'impr." + +# MSG_PID_RUNNING c=20 r=1 +#: ultralcd.cpp:1485 +msgid "PID cal. " +msgstr "Calib. PID" + +# MSG_PID_FINISHED c=20 r=1 +#: ultralcd.cpp:1491 +msgid "PID cal. finished" +msgstr "Calib. PID terminee" + +# MSG_PID_EXTRUDER c=17 r=1 +#: ultralcd.cpp:5803 +msgid "PID calibration" +msgstr "Calibration PID" + +# MSG_PINDA_PREHEAT c=20 r=1 +#: ultralcd.cpp:843 +msgid "PINDA Heating" +msgstr "Chauffe de la PINDA" + +# MSG_PAPER c=20 r=10 +#: messages.c:72 +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 vite l'imprimante." + +# MSG_WIZARD_CLEAN_HEATBED c=20 r=8 +#: ultralcd.cpp:5029 +msgid "Please clean heatbed and then press the knob." +msgstr "Nettoyez plateau chauffant en acier et appuyez sur le bouton." + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:24 +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:8022 +msgid "Please check :" +msgstr "Verifiez:" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:115 +msgid "Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer." +msgstr "Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante." + +# MSG_CHECK_IDLER c=20 r=4 +#: Marlin_main.cpp:3317 +msgid "Please open idler and remove filament manually." +msgstr "Ouvrez l'idler et retirez le filament manuellement." + +# MSG_PLACE_STEEL_SHEET c=20 r=4 +#: messages.c:73 +msgid "Please place steel sheet on heatbed." +msgstr "Placez la plaque en acier sur le plateau chauffant." + +# MSG_PRESS_TO_UNLOAD c=20 r=4 +#: messages.c:77 +msgid "Please press the knob to unload filament" +msgstr "Appuyez sur le bouton pour decharger le filament" + +# MSG_PULL_OUT_FILAMENT c=20 r=4 +#: messages.c:79 +msgid "Please pull out filament immediately" +msgstr "Retirez immediatement le filament" + +# MSG_EJECT_REMOVE c=20 r=4 +#: mmu.cpp:1420 +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:82 +msgid "Please remove steel sheet from heatbed." +msgstr "Retirez la plaque en acier du plateau chauffant." + +# MSG_RUN_XYZ c=20 r=4 +#: Marlin_main.cpp:4766 +msgid "Please run XYZ calibration first." +msgstr "Veuillez d'abord lancer la calibration XYZ." + +# MSG_UPDATE_MMU2_FW c=20 r=4 +#: mmu.cpp:1340 +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:74 +msgid "Please wait" +msgstr "Merci de patienter" + +# +#: ultralcd.cpp:4962 +msgid "Please remove shipping helpers first." +msgstr "Retirez d'abord les protections de transport." + +# MSG_PREHEAT_NOZZLE c=20 +#: messages.c:76 +msgid "Preheat the nozzle!" +msgstr "Prechauffez la buse!" + +# MSG_PREHEAT +#: ultralcd.cpp:6615 +msgid "Preheat" +msgstr "Prechauffage" + +# MSG_WIZARD_HEATING c=20 r=3 +#: messages.c:117 +msgid "Preheating nozzle. Please wait." +msgstr "Prechauffage de la buse. Merci de patienter." + +# c=14 +#: ultralcd.cpp:1905 +msgid "PINDA" +msgstr "" + +# +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Mettez a jour le FW." + +# MSG_PRESS_TO_PREHEAT c=20 r=4 +#: Marlin_main.cpp:11718 +msgid "Press knob to preheat nozzle and continue." +msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." + +# MSG_FS_PAUSE c=5 +#: fsensor.cpp:728 +msgid "Pause" +msgstr "" + +# MSG_POWER_FAILURES c=14 +#: messages.c:75 +msgid "Power failures" +msgstr "Coup.de courant" + +# MSG_PRINT_ABORTED c=20 +#: messages.c:78 +msgid "Print aborted" +msgstr "Impression annulee" + +# c=20 +#: ultralcd.cpp:2390 +msgid "Preheating to load" +msgstr "Chauffe pour charger" + +# c=20 +#: ultralcd.cpp:2395 +msgid "Preheating to unload" +msgstr "Chauf.pour decharger" + +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8401 +msgid "Print fan:" +msgstr "Vent. impr:" + +# MSG_CARD_MENU +#: messages.c:21 +msgid "Print from SD" +msgstr "Impr. depuis la SD" + +# +#: ultralcd.cpp:2231 +msgid "Press the knob" +msgstr "App. sur sur bouton" + +# MSG_PRINT_PAUSED c=20 r=1 +#: ultralcd.cpp:1065 +msgid "Print paused" +msgstr "Impression en pause" + +# +#: mmu.cpp:725 +msgid "Press the knob to resume nozzle temperature." +msgstr "Appuyez sur le bouton pour rechauffer la buse." + +# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +#: messages.c:45 +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." + +# +#: ultralcd.cpp:1601 +msgid "Print FAN" +msgstr "Vent. impr" + +# +#: ultralcd.cpp:4827 +msgid "Please insert filament into the extruder, then press the knob to load it." +msgstr "Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger." + +# +#: ultralcd.cpp:4822 +msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." +msgstr "Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger." + +# +#: ultralcd.cpp:4744 +msgid "Please load filament first." +msgstr "Veuillez d'abord charger un filament." + +# MSG_PRUSA3D +#: ultralcd.cpp:2104 +msgid "prusa3d.com" +msgstr "" + +# MSG_BED_CORRECTION_REAR c=14 r=1 +#: ultralcd.cpp:3191 +msgid "Rear side [um]" +msgstr "Arriere [um]" + +# c=20 r=4 +#: ultralcd.cpp:7304 +msgid "Please unload the filament first, then repeat this action." +msgstr "SVP, dechargez le filament et reessayez." + +# c=20 r=4 +#: ultralcd.cpp:7307 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." + +# MSG_RECOVERING_PRINT c=20 +#: Marlin_main.cpp:11076 +msgid "Recovering print " +msgstr "Recup. impression " + +# MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#: mmu.cpp:832 +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." + +# c=20 +#: +msgid "Prusa i3 MK3S OK." +msgstr "" + +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5808 +msgid "Reset XYZ calibr." +msgstr "Reinit. calib. XYZ" + +# MSG_RESET c=14 +#: messages.c:83 +msgid "Reset" +msgstr "Reinitialiser" + +# MSG_RESUME_PRINT c=18 +#: messages.c:84 +msgid "Resume print" +msgstr "Reprendre impression" + +# MSG_RESUMING_PRINT c=20 +#: messages.c:85 +msgid "Resuming print" +msgstr "Reprise de l'impr." + +# MSG_BED_CORRECTION_RIGHT c=14 r=1 +#: ultralcd.cpp:3189 +msgid "Right side[um]" +msgstr "Droite [um]" + +# MSG_RPI_PORT +#: messages.c:142 +msgid "RPi port" +msgstr "Port RPi" + +# MSG_WIZARD_RERUN c=20 r=7 +#: ultralcd.cpp:4765 +msgid "Running Wizard will delete current calibration results and start from the beginning. Continue?" +msgstr "Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?" + +# MSG_SD_CARD +#: messages.c:137 +msgid "SD card" +msgstr "Carte SD" + +# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +#: messages.c:138 +msgid "FlashAir" +msgstr "FlshAir" + +# +#: ultralcd.cpp:2920 +msgid "Right" +msgstr "Droite" + +# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 +#: messages.c:42 +msgid "Searching bed calibration point" +msgstr "Recherche du point de calibration du plateau chauffant" + +# MSG_LANGUAGE_SELECT +#: ultralcd.cpp:5721 +msgid "Select language" +msgstr "Choisir langue" + +# MSG_SELFTEST_OK +#: ultralcd.cpp:7579 +msgid "Self test OK" +msgstr "Auto-test OK" + +# MSG_SELFTEST_START c=20 +#: ultralcd.cpp:7347 +msgid "Self test start " +msgstr "Debut auto-test" + +# MSG_SELFTEST +#: ultralcd.cpp:5784 +msgid "Selftest " +msgstr "Auto-test" + +# MSG_SELFTEST_ERROR +#: ultralcd.cpp:8021 +msgid "Selftest error !" +msgstr "Erreur auto-test!" + +# MSG_SELFTEST_FAILED c=20 +#: messages.c:88 +msgid "Selftest failed " +msgstr "Echec de l'auto-test" + +# MSG_FORCE_SELFTEST c=20 r=8 +#: Marlin_main.cpp:1613 +msgid "Selftest will be run to calibrate accurate sensorless rehoming." +msgstr "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" + +# +#: ultralcd.cpp:5003 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau." + +# MSG_SET_TEMPERATURE c=19 r=1 +#: ultralcd.cpp:3209 +msgid "Set temperature:" +msgstr "Regler temp.:" + +# c=20 +#: +msgid "Prusa i3 MK2.5 OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK2.5S OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK3 OK." +msgstr "" + +# MSG_SETTINGS +#: messages.c:97 +msgid "Settings" +msgstr "Reglages" + +# MSG_SHOW_END_STOPS c=18 +#: ultralcd.cpp:5805 +msgid "Show end stops" +msgstr "Afficher butees" + +# +#: ultralcd.cpp:3915 +msgid "Sensor state" +msgstr "Etat capteur" + +# MSG_FILE_CNT c=20 r=6 +#: 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 +#: messages.c:139 +msgid "Sort" +msgstr "Tri" + +# MSG_NONE +#: messages.c:127 +msgid "None" +msgstr "Aucun" + +# MSG_SORT_TIME +#: messages.c:140 +msgid "Time" +msgstr "Heure" + +# +#: ultralcd.cpp:2963 +msgid "Severe skew:" +msgstr "Deviat.sev.:" + +# MSG_SORT_ALPHA +#: messages.c:141 +msgid "Alphabet" +msgstr "" + +# MSG_SORTING c=20 r=1 +#: cardreader.cpp:746 +msgid "Sorting files" +msgstr "Tri des fichiers" + +# MSG_SOUND_LOUD +#: messages.c:144 +msgid "Loud" +msgstr "Fort" + +# +#: ultralcd.cpp:2962 +msgid "Slight skew:" +msgstr "Deviat.leg.:" + +# MSG_SOUND +#: messages.c:143 +msgid "Sound" +msgstr "Son" + +# c=7 +#: ultralcd.cpp:1768 +msgid "Runouts" +msgstr "" + +# +#: Marlin_main.cpp:5280 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." + +# MSG_SOUND_ONCE +#: messages.c:145 +msgid "Once" +msgstr "Une fois" + +# MSG_SPEED +#: ultralcd.cpp:6874 +msgid "Speed" +msgstr "Vitesse" + +# MSG_SELFTEST_FAN_YES c=19 +#: messages.c:91 +msgid "Spinning" +msgstr "Tourne" + +# MSG_TEMP_CAL_WARNING c=20 r=4 +#: Marlin_main.cpp:4779 +msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." +msgstr "Une temperature ambiante stable de 21-26C et un support stable sont requis." + +# MSG_STATISTICS +#: ultralcd.cpp:6733 +msgid "Statistics " +msgstr "Statistiques" + +# MSG_STOP_PRINT +#: messages.c:108 +msgid "Stop print" +msgstr "Arreter impression" + +# MSG_STOPPED +#: messages.c:109 +msgid "STOPPED. " +msgstr "ARRETE." + +# MSG_SUPPORT +#: ultralcd.cpp:6742 +msgid "Support" +msgstr "" + +# MSG_SELFTEST_SWAPPED +#: ultralcd.cpp:8080 +msgid "Swapped" +msgstr "Echange" + +# +#: ultralcd.cpp:4715 +msgid "Select filament:" +msgstr "Selectionnez le filament:" + +# MSG_TEMP_CALIBRATION c=14 +#: messages.c:110 +msgid "Temp. cal." +msgstr "Calib. Temp." + +# +#: ultralcd.cpp:4856 +msgid "Select temperature which matches your material." +msgstr "Selectionnez la temperature qui correspond a votre materiau." + +# MSG_CALIBRATION_PINDA_MENU c=17 r=1 +#: ultralcd.cpp:5816 +msgid "Temp. calibration" +msgstr "Calibration temp." + +# MSG_TEMP_CAL_FAILED c=20 r=8 +#: ultralcd.cpp:3845 +msgid "Temperature calibration failed" +msgstr "Echec de la calibration en temperature" + +# MSG_TEMP_CALIBRATION_DONE c=20 r=12 +#: messages.c:111 +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 activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." + +# c=20 r=3 +#: ultralcd.cpp:7311 +msgid "Sensor verified, remove the filament now." +msgstr "Capteur verifie, retirez le filament maintenant." + +# MSG_TEMPERATURE +#: ultralcd.cpp:5679 +msgid "Temperature" +msgstr "" + +# MSG_MENU_TEMPERATURES c=15 r=1 +#: ultralcd.cpp:2160 +msgid "Temperatures" +msgstr "" + +# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#: messages.c:46 +msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration." + +# +#: ultralcd.cpp:2817 +msgid "Total filament" +msgstr "Filament total" + +# +#: ultralcd.cpp:2818 +msgid "Total print time" +msgstr "Temps total impr." + +# MSG_TUNE +#: ultralcd.cpp:6612 +msgid "Tune" +msgstr "Regler" + +# +#: +msgid "Unload" +msgstr "Decharger" + +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 +msgid "Total failures" +msgstr "Total des echecs" + +# +#: ultralcd.cpp:2238 +msgid "to load filament" +msgstr "pour charger le fil." + +# +#: ultralcd.cpp:2242 +msgid "to unload filament" +msgstr "pour decharger fil." + +# MSG_UNLOAD_FILAMENT c=17 +#: messages.c:112 +msgid "Unload filament" +msgstr "Decharger fil." + +# MSG_UNLOADING_FILAMENT c=20 r=1 +#: messages.c:113 +msgid "Unloading filament" +msgstr "Dechargement fil." + +# MSG_TOTAL c=6 +#: messages.c:98 +msgid "Total" +msgstr "Totale" + +# MSG_USED c=19 r=1 +#: ultralcd.cpp:5932 +msgid "Used during print" +msgstr "Utilise pdt impr." + +# MSG_MENU_VOLTAGES c=15 r=1 +#: ultralcd.cpp:2163 +msgid "Voltages" +msgstr "Tensions" + +# +#: ultralcd.cpp:2132 +msgid "unknown" +msgstr "inconnu" + +# MSG_USERWAIT +#: Marlin_main.cpp:5689 +msgid "Wait for user..." +msgstr "Attente utilisateur..." + +# MSG_WAITING_TEMP c=20 r=3 +#: ultralcd.cpp:3357 +msgid "Waiting for nozzle and bed cooling" +msgstr "Attente du refroidissement des buse et plateau chauffant" + +# MSG_WAITING_TEMP_PINDA c=20 r=3 +#: ultralcd.cpp:3318 +msgid "Waiting for PINDA probe cooling" +msgstr "Attente du refroidissement de la sonde PINDA" + +# +#: +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 Remonter le fil. 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:1573 +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:1565 +msgid "Warning: motherboard type changed." +msgstr "Attention: Type de carte mere modifie." + +# MSG_CHANGED_PRINTER c=20 r=4 +#: Marlin_main.cpp:1569 +msgid "Warning: printer type changed." +msgstr "Attention: Type d'imprimante modifie" + +# MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#: Marlin_main.cpp:3308 +msgid "Was filament unload successful?" +msgstr "Dechargement du filament reussi?" + +# MSG_SELFTEST_WIRINGERROR +#: messages.c:96 +msgid "Wiring error" +msgstr "Erreur de cablage" + +# MSG_WIZARD c=17 r=1 +#: ultralcd.cpp:5775 +msgid "Wizard" +msgstr "Assistant" + +# MSG_XYZ_DETAILS c=18 +#: ultralcd.cpp:2152 +msgid "XYZ cal. details" +msgstr "Details calib. XYZ" + +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:18 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Echec calibration XYZ. Consultez le manuel." + +# MSG_YES +#: messages.c:119 +msgid "Yes" +msgstr "Oui" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:118 +msgid "You can always resume the Wizard from Calibration -> Wizard." +msgstr "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." + +# MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 +#: ultralcd.cpp:3817 +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:3814 +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!" + +# MSG_TIMEOUT c=12 +#: messages.c:157 +msgid "Timeout" +msgstr "" + +# MSG_X_CORRECTION c=13 +#: ultralcd.cpp:5091 +msgid "X-correct:" +msgstr "Correct-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3811 +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:3795 +msgid "XYZ calibration compromised. Front calibration points not reachable." +msgstr "Calibration XYZ compromise. Les points de calibration en avant ne sont pas atteignables." + +# MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 +#: ultralcd.cpp:3798 +msgid "XYZ calibration compromised. Right front calibration point not reachable." +msgstr "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6171 +msgid "Load all" +msgstr "Charger un par un" + +# +#: ultralcd.cpp:3777 +msgid "XYZ calibration failed. Bed calibration point was not found." +msgstr "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." + +# +#: ultralcd.cpp:3783 +msgid "XYZ calibration failed. Front calibration points not reachable." +msgstr "Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables." + +# +#: ultralcd.cpp:3786 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." + +# +#: ultralcd.cpp:2917 +msgid "Y distance from min" +msgstr "Distance Y du min" + +# +#: ultralcd.cpp:4859 +msgid "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)." +msgstr "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)." + +# c=20 r=5 +#: ultralcd.cpp:7315 +msgid "Verification failed, remove the filament and try again." +msgstr "Verification en echec, retirez le filament et reessayez." + +# MSG_Y_CORRECTION c=13 +#: ultralcd.cpp:5092 +msgid "Y-correct:" +msgstr "Correct-Y:" + +# MSG_OFF +#: messages.c:122 +msgid "Off" +msgstr "" + +# MSG_ON +#: messages.c:123 +msgid "On" +msgstr "" + +# +#: messages.c:62 +msgid "Back" +msgstr "Retour" + +# +#: ultralcd.cpp:5647 +msgid "Checks" +msgstr "Verifications" + +# +#: ultralcd.cpp:8090 +msgid "False triggering" +msgstr "Faux declenchement" + +# +#: ultralcd.cpp:3920 +msgid "FINDA:" +msgstr "FINDA:" + +# MSG_FIRMWARE +#: language.h:24 +msgid "Firmware" +msgstr "" + +# MSG_STRICT +#: messages.c:129 +msgid "Strict" +msgstr "Stricte" + +# MSG_WARN +#: messages.c:128 +msgid "Warn" +msgstr "Avert" + +# MSG_HW_SETUP c=18 +#: messages.c:100 +msgid "HW Setup" +msgstr "Config HW" + +# +#: ultralcd.cpp:3924 +msgid "IR:" +msgstr "IR:" + +# MSG_MAGNETS_COMP +#: messages.c:150 +msgid "Magnets comp." +msgstr "Compens. aim." + +# MSG_MESH +#: messages.c:147 +msgid "Mesh" +msgstr "" + +# +#: Marlin_main.cpp:927 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detecte sur imprimante MK3" + +# MSG_MMU_MODE +#: messages.c:136 +msgid "MMU Mode" +msgstr "Mode MMU" + +# +#: ultralcd.cpp:4395 +msgid "Mode change in progress ..." +msgstr "Changement de mode en cours..." + +# MSG_MODEL +#: messages.c:130 +msgid "Model" +msgstr "Modele" + +# MSG_NOZZLE_DIAMETER +#: messages.c:135 +msgid "Nozzle d." +msgstr "Diam. buse" + +# +#: util.cpp:514 +msgid "G-code sliced for a different level. Continue?" +msgstr "Le G-code a ete prepare pour un niveau different. Continuer?" + +# +#: util.cpp:520 +msgid "G-code sliced for a different level. Please re-slice the model again. Print cancelled." +msgstr "Le G-code a ete prepare pour un niveau different. Veuillez decouper le modele a nouveau. L'impression a ete annulee." + +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 +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?" + +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 +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:481 +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:487 +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." + +# +#: ultralcd.cpp:3916 +msgid "PINDA:" +msgstr "PINDA:" + +# c=20 +#: ultralcd.cpp:2402 +msgid "Preheating to cut" +msgstr "Chauffe pour couper" + +# c=20 +#: ultralcd.cpp:2399 +msgid "Preheating to eject" +msgstr "Chauf. pour remonter" + +# +#: util.cpp:394 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?" + +# +#: util.cpp:401 +msgid "Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled." +msgstr "Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee." + +# c=20 +#: ultralcd.cpp:8095 +msgid "%s level expected" +msgstr "" + +# +#: ultralcd.cpp:6574 +msgid "Rename" +msgstr "Renommer" + +# +#: ultralcd.cpp:6567 +msgid "Select" +msgstr "Selectionner" + +# +#: ultralcd.cpp:2154 +msgid "Sensor info" +msgstr "Info capteur" + +# MSG_SHEET c=10 +#: messages.c:63 +msgid "Sheet" +msgstr "Plaque" + +# MSG_SOUND_BLIND +#: messages.c:146 +msgid "Assist" +msgstr "" + +# MSG_STEEL_SHEET c=18 +#: messages.c:64 +msgid "Steel sheets" +msgstr "Plaques en acier" + +# MSG_Z_CORRECTION c=13 +#: ultralcd.cpp:5093 +msgid "Z-correct:" +msgstr "Correct-Z:" + +# MSG_Z_PROBE_NR +#: messages.c:149 +msgid "Z-probe nr." +msgstr "Mesurer x-fois" + diff --git a/lang/po/new/it.po b/lang/po/new/it.po index 2c1a41d92..e033acc47 100644 --- a/lang/po/new/it.po +++ b/lang/po/new/it.po @@ -1,1857 +1,1852 @@ -# Translation of Prusa-Firmware into Italian. -# -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: it\n" -"Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri Sep 18 15:25:10 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:25:10 CEST 2020\n" -"Language-Team: \n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -# -#: -msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -msgstr "[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset" - -# MSG_03_OR_OLDER c=18 -#: messages.c:144 -msgid " 0.3 or older" -msgstr " 0.3 o inferiore" - -# c=18 -#: Marlin_main.cpp:9463 -msgid "FS v0.3 or older" -msgstr "FS 0.3 o inferiore" - -# MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 -msgid " 0.4 or newer" -msgstr " 0.4 o superiore" - -# c=18 -#: Marlin_main.cpp:9462 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 o superiore" - -# MSG_IR_UNKNOWN c=18 -#: messages.c:145 -msgid "unknown state" -msgstr "stato sconosciuto" - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 -msgid " of 4" -msgstr " su 4" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 -msgid " of 9" -msgstr " su 9" - -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 -msgid "[0;0] point offset" -msgstr "[0;0] punto offset" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: -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 -#: -msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" - -# -#: ultralcd.cpp:2451 -msgid ">Cancel" -msgstr ">Annulla" - -# MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 -msgid "Adjusting Z:" -msgstr "Compensaz. Z:" - -# MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 -msgid "All correct " -msgstr "Nessun errore" - -# MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 -msgid "All is done. Happy printing!" -msgstr "Tutto fatto. Buona stampa!" - -# -#: ultralcd.cpp:1956 -msgid "Ambient" -msgstr "Ambiente" - -# MSG_AUTO c=6 -#: messages.c:140 -msgid "Auto" -msgstr "" - -# MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 -msgid "and press the knob" -msgstr "e cliccare manopola" - -# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 -msgid "Are left and right Z~carriages all up?" -msgstr "I carrelli Z sin/des sono altezza max?" - -# MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 -msgid "SpoolJoin" -msgstr "" - -# MSG_AUTO_HOME -#: messages.c:11 -msgid "Auto home" -msgstr "Trova origine" - -# MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 -msgid "AutoLoad filament" -msgstr "Autocaric. filam." - -# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 -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:2802 -msgid "Autoloading filament is active, just press the knob and insert filament..." -msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." - -# MSG_SELFTEST_AXIS_LENGTH -#: ultralcd.cpp:8371 -msgid "Axis length" -msgstr "Lunghezza dell'asse" - -# MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 -msgid "Axis" -msgstr "Assi" - -# MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 -msgid "Bed / Heater" -msgstr "Piano/Riscald." - -# MSG_BED_DONE -#: messages.c:15 -msgid "Bed done" -msgstr "Piano fatto." - -# MSG_BED_HEATING -#: messages.c:16 -msgid "Bed Heating" -msgstr "Riscald. piano" - -# MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 -msgid "Bed level correct" -msgstr "Correz. liv.piano" - -# MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 -msgid "Belt test " -msgstr "Test cinghie " - -# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 -#: messages.c:17 -msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -msgstr "Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset." - -# MSG_BRIGHT c=6 -#: messages.c:138 -msgid "Bright" -msgstr "Chiaro" - -# MSG_BRIGHTNESS c=18 -#: messages.c:134 -msgid "Brightness" -msgstr "Luminosita'" - -# MSG_BED -#: messages.c:14 -msgid "Bed" -msgstr "Piano" - -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 -msgid "Belt status" -msgstr "Stato cinghie" - -# MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 -msgid "Blackout occurred. Recover print?" -msgstr "Blackout rilevato. Recuperare la stampa?" - -# -#: ultralcd.cpp:8706 -msgid "Calibrating home" -msgstr "Calibrazione Home" - -# MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 -msgid "Calibrate XYZ" -msgstr "Calibra XYZ" - -# MSG_HOMEYZ -#: messages.c:44 -msgid "Calibrate Z" -msgstr "Calibra Z" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 -msgid "Calibrate" -msgstr "Calibra" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 -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." - -# MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 -msgid "Calibrating Z" -msgstr "Calibrando Z" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 -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:865 -msgid "Calibration done" -msgstr "Calibrazione completa" - -# MSG_MENU_CALIBRATION -#: messages.c:57 -msgid "Calibration" -msgstr "Calibrazione" - -# -#: ultralcd.cpp:4811 -msgid "Cancel" -msgstr "Annulla" - -# MSG_SD_REMOVED -#: ultralcd.cpp:9142 -msgid "Card removed" -msgstr "SD rimossa" - -# MSG_NOT_COLOR -#: ultralcd.cpp:2707 -msgid "Color not correct" -msgstr "Colore non puro" - -# MSG_COOLDOWN -#: messages.c:22 -msgid "Cooldown" -msgstr "Raffredda" - -# -#: ultralcd.cpp:4566 -msgid "Copy selected language?" -msgstr "Copiare la lingua selezionata?" - -# MSG_CRASHDETECT c=13 -#: messages.c:24 -msgid "Crash det." -msgstr "Rileva.crash" - -# -#: ultralcd.cpp:4946 -msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." -msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." - -# MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 -msgid "Crash detected." -msgstr "Rilevato impatto." - -# -#: Marlin_main.cpp:605 -msgid "Crash detected. Resume print?" -msgstr "Scontro rilevato. Riprendere la stampa?" - -# -#: ultralcd.cpp:1785 -msgid "Crash" -msgstr "Impatto" - -# MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 -msgid "Current" -msgstr "Attuale" - -# MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 -msgid "Date:" -msgstr "Data:" - -# MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 -msgid "Disable steppers" -msgstr "Disabilita motori" - -# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: messages.c:13 -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 "Distanza tra la punta dell'ugello e la superficie del piano non ancora impostata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo strato." - -# MSG_FS_CONTINUE c=5 -#: messages.c:132 -msgid "Cont." -msgstr "" - -# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 -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=13 -#: ultralcd.cpp:5190 -msgid "E-correct:" -msgstr "Correzione-E:" - -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 -msgid "Eject filament" -msgstr "Espelli filamento" - -# MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 -msgid "Ejecting filament" -msgstr "Espellendo filamento" - -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 -msgid "Endstop not hit" -msgstr "Finec. fuori portata" - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 -msgid "Endstop" -msgstr "Finecorsa" - -# MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 -msgid "Endstops" -msgstr "Finecorsa" - -# MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 -msgid "Error - static memory has been overwritten" -msgstr "Errore - la memoria statica e' stata sovrascritta" - -# MSG_CUT_FILAMENT c=16 -#: messages.c:50 -msgid "Cut filament" -msgstr "Taglia filamento" - -# MSG_CUTTER c=9 -#: messages.c:109 -msgid "Cutter" -msgstr "Tagliatr." - -# c=18 -#: mmu.cpp:1388 -msgid "Cutting filament" -msgstr "Tagliando filam." - -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." - -# MSG_DIM c=6 -#: messages.c:139 -msgid "Dim" -msgstr "Scuro" - -# MSG_ERROR -#: messages.c:25 -msgid "ERROR:" -msgstr "ERRORE:" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 -msgid "Extruder fan:" -msgstr "Ventola estr:" - -# MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 -msgid "Extruder info" -msgstr "Info estrusore" - -# MSG_MOVE_E -#: messages.c:26 -msgid "Extruder" -msgstr "Estrusore" - -# -#: ultralcd.cpp:7017 -msgid "Fail stats MMU" -msgstr "Stat.fall. MMU" - -# MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 -msgid "F. autoload" -msgstr "Autocar.fil." - -# -#: ultralcd.cpp:7014 -msgid "Fail stats" -msgstr "Stat. fallimenti" - -# MSG_FAN_SPEED c=14 -#: messages.c:28 -msgid "Fan speed" -msgstr "Velocita vent." - -# MSG_SELFTEST_FAN c=20 -#: messages.c:74 -msgid "Fan test" -msgstr "Test ventola" - -# MSG_FANS_CHECK -#: ultralcd.cpp:5777 -msgid "Fans check" -msgstr "Control.vent" - -# MSG_FSENSOR -#: messages.c:41 -msgid "Fil. sensor" -msgstr "Sensore fil." - -# c=14 -#: ultralcd.cpp:1784 -msgid "Filam. runouts" -msgstr "Fil. esauriti" - -# MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 -msgid "Filament extruding & with correct color?" -msgstr "Filamento estruso e con colore corretto?" - -# MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 -msgid "Filament not loaded" -msgstr "Fil. non caricato" - -# MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 -msgid "Filament sensor" -msgstr "Sensore filam." - -# MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 -msgid "Filament used" -msgstr "Fil. utilizzato" - -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 -msgid "Print time" -msgstr "Tempo di stampa" - -# MSG_FS_ACTION c=10 -#: messages.c:131 -msgid "FS Action" -msgstr "Azione FS" - -# MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 -msgid "File incomplete. Continue anyway?" -msgstr "File incompleto. Continuare comunque?" - -# MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 -msgid "Finishing movements" -msgstr "Finaliz. spostamenti" - -# MSG_V2_CALIBRATION c=18 -#: messages.c:103 -msgid "First layer cal." -msgstr "Cal. primo strato" - -# MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 -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:727 -msgid "Fix the issue and then press button on MMU unit." -msgstr "Risolvere il problema e premere il bottone sull'unita MMU. " - -# MSG_FLOW -#: ultralcd.cpp:7157 -msgid "Flow" -msgstr "Flusso" - -# MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 -msgid "forum.prusa3d.com" -msgstr "" - -# MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 -msgid "Front print fan?" -msgstr "Ventola frontale?" - -# MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 -msgid "Front side[um]" -msgstr "Fronte [um]" - -# MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 -msgid "Front/left fans" -msgstr "Ventola frontale/sinistra" - -# MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 -msgid "Heater/Thermistor" -msgstr "Riscald./Termist." - -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 -msgid "Heating disabled by safety timer." -msgstr "Riscaldamento fermato dal timer di sicurezza." - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:43 -msgid "Heating done." -msgstr "Riscald. completo" - -# MSG_HEATING -#: messages.c:42 -msgid "Heating" -msgstr "Riscaldamento..." - -# MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 -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:2158 -msgid "howto.prusa3d.com" -msgstr "" - -# MSG_FILAMENTCHANGE -#: messages.c:34 -msgid "Change filament" -msgstr "Cambia filamento" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 -msgid "Change success!" -msgstr "Cambio riuscito!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 -msgid "Changed correctly?" -msgstr "Cambio corretto?" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 -msgid "Checking bed " -msgstr "Verifica piano" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 -msgid "Checking endstops" -msgstr "Verifica finecorsa" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 -msgid "Checking hotend " -msgstr "Verifica ugello" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 -msgid "Checking sensors " -msgstr "Controllo sensori" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 -msgid "Checking X axis " -msgstr "Verifica asse X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 -msgid "Checking Y axis " -msgstr "Verifica asse Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 -msgid "Checking Z axis " -msgstr "Verifica asse Z" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 -msgid "Choose extruder:" -msgstr "Seleziona estrusore:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 -msgid "Choose filament:" -msgstr "Scegliere filamento:" - -# MSG_FILAMENT c=17 r=1 -#: messages.c:27 -msgid "Filament" -msgstr "Filamento" - -# MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 -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:5059 -msgid "I will run z calibration now." -msgstr "Adesso avviero la Calibrazione Z." - -# MSG_WATCH -#: messages.c:97 -msgid "Info screen" -msgstr "Schermata info" - -# MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 -msgid "Insert filament" -msgstr "Inserire filamento" - -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 -msgid "Is filament loaded?" -msgstr "Il filamento e' stato caricato?" - -# MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 -msgid "Is steel sheet on heatbed?" -msgstr "Piastra d'acciaio su piano riscaldato?" - -# -#: ultralcd.cpp:1727 -msgid "Last print failures" -msgstr "Fallimenti ultima stampa" - -# -#: ultralcd.cpp:5129 -msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -msgstr "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." - -# -#: ultralcd.cpp:1704 -msgid "Last print" -msgstr "Ultima stampa" - -# MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 -msgid "Left hotend fan?" -msgstr "Vent SX hotend?" - -# -#: ultralcd.cpp:2991 -msgid "Left" -msgstr "Sinistra" - -# MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 -msgid "Left side [um]" -msgstr "Sinistra [um]" - -# -#: ultralcd.cpp:5792 -msgid "Lin. correction" -msgstr "Correzione lineare" - -# MSG_BABYSTEP_Z -#: messages.c:12 -msgid "Live adjust Z" -msgstr "Compensazione Z" - -# c=20 r=6 -#: ultralcd.cpp:7559 -msgid "Insert the filament (do not load it) into the extruder and then press the knob." -msgstr "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." - -# MSG_LOAD_FILAMENT c=17 -#: messages.c:47 -msgid "Load filament" -msgstr "Carica filamento" - -# MSG_LOADING_COLOR -#: ultralcd.cpp:2643 -msgid "Loading color" -msgstr "Caricando colore" - -# MSG_LOADING_FILAMENT c=20 -#: messages.c:48 -msgid "Loading filament" -msgstr "Caricando filamento" - -# MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 -msgid "Loose pulley" -msgstr "Puleggia lenta" - -# -#: ultralcd.cpp:6976 -msgid "Load to nozzle" -msgstr "Carica ugello" - -# MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 -msgid "M117 First layer cal." -msgstr "M117 Calibr. primo strato" - -# MSG_MAIN -#: messages.c:52 -msgid "Main" -msgstr "Menu principale" - -# MSG_BL_HIGH c=12 -#: messages.c:135 -msgid "Level Bright" -msgstr "Liv. Chiaro" - -# MSG_BL_LOW c=12 -#: messages.c:136 -msgid "Level Dimmed" -msgstr "Liv. Scuro" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 -msgid "Measuring reference height of calibration point" -msgstr "Misura altezza di rif. del punto di calib." - -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 -msgid "Mesh Bed Leveling" -msgstr "Liv. grilia piano" - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. riprendendo la posizione... " - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Ripristino temperatura... " - -# -#: ultralcd.cpp:3032 -msgid "Measured skew" -msgstr "Deviazione mis" - -# -#: ultralcd.cpp:1728 -msgid "MMU fails" -msgstr "Fallimenti MMU" - -# -#: mmu.cpp:1588 -msgid "MMU load failed " -msgstr "Caricamento MMU fallito" - -# -#: ultralcd.cpp:1729 -msgid "MMU load fails" -msgstr "Caricamenti MMU falliti" - -# MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 -msgid "MMU OK. Resuming..." -msgstr "MMU OK. Riprendendo... " - -# MSG_MODE -#: messages.c:84 -msgid "Mode" -msgstr "Mod." - -# c=20 r=3 -#: Marlin_main.cpp:884 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Firmware MK3 rilevato su stampante MK3S" - -# MSG_NORMAL -#: messages.c:88 -msgid "Normal" -msgstr "Normale" - -# MSG_SILENT -#: messages.c:87 -msgid "Silent" -msgstr "Silenzioso" - -# -#: mmu.cpp:722 -msgid "MMU needs user attention." -msgstr "Il MMU richiede attenzione dall'utente." - -# -#: ultralcd.cpp:1755 -msgid "MMU power fails" -msgstr "Manc. corr. MMU" - -# MSG_STEALTH -#: messages.c:89 -msgid "Stealth" -msgstr "Silenziosa" - -# MSG_AUTO_POWER -#: messages.c:86 -msgid "Auto power" -msgstr "Auto" - -# MSG_HIGH_POWER -#: messages.c:85 -msgid "High power" -msgstr "Forte" - -# -#: ultralcd.cpp:2176 -msgid "MMU2 connected" -msgstr "MMU2 connessa" - -# MSG_SELFTEST_MOTOR -#: messages.c:79 -msgid "Motor" -msgstr "Motore" - -# MSG_MOVE_AXIS -#: ultralcd.cpp:5767 -msgid "Move axis" -msgstr "Muovi asse" - -# MSG_MOVE_X -#: ultralcd.cpp:4357 -msgid "Move X" -msgstr "Sposta X" - -# MSG_MOVE_Y -#: ultralcd.cpp:4358 -msgid "Move Y" -msgstr "Sposta Y" - -# MSG_MOVE_Z -#: ultralcd.cpp:4359 -msgid "Move Z" -msgstr "Sposta Z" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5555 -msgid "No move." -msgstr "Nessun movimento." - -# MSG_NO_CARD -#: ultralcd.cpp:6943 -msgid "No SD card" -msgstr "Nessuna SD" - -# MSG_NA -#: messages.c:107 -msgid "N/A" -msgstr "N/D" - -# MSG_NO -#: messages.c:58 -msgid "No" -msgstr "" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 -msgid "Not connected" -msgstr "Non connesso" - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Nuova versione firmware disponibile:" - -# MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 -msgid "Not spinning" -msgstr "Non gira" - -# MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 -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:5067 -msgid "Now I will preheat nozzle for PLA." -msgstr "Adesso preriscaldero l'ugello per PLA." - -# MSG_NOZZLE -#: messages.c:59 -msgid "Nozzle" -msgstr "Ugello" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 -msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." - -# -#: ultralcd.cpp:5058 -msgid "Now remove the test print from steel sheet." -msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." - -# -#: ultralcd.cpp:1654 -msgid "Nozzle FAN" -msgstr "Ventola estrusore" - -# MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 -msgid "Pause print" -msgstr "Metti in pausa" - -# MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 -msgid "PID cal. " -msgstr "Calibrazione PID" - -# MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 -msgid "PID cal. finished" -msgstr "Calib. PID completa" - -# MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 -msgid "PID calibration" -msgstr "Calibrazione PID" - -# MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 -msgid "PINDA Heating" -msgstr "Riscaldamento PINDA" - -# MSG_PAPER c=20 r=10 -#: messages.c:60 -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:5124 -msgid "Please clean heatbed and then press the knob." -msgstr "Per favore pulisci il piatto, poi premi la manopola." - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 -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:8303 -msgid "Please check :" -msgstr "Verifica:" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 -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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 -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 -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 -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 -msgid "Please pull out filament immediately" -msgstr "Estrarre il filamento immediatamente" - -# MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 -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 -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:4601 -msgid "Please run XYZ calibration first." -msgstr "Esegui la calibrazione XYZ prima. " - -# MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 -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 -msgid "Please wait" -msgstr "Attendere" - -# -#: ultralcd.cpp:5057 -msgid "Please remove shipping helpers first." -msgstr "Per favore rimuovete i materiali da spedizione" - -# MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 -msgid "Preheat the nozzle!" -msgstr "Prerisc. ugello!" - -# MSG_PREHEAT -#: ultralcd.cpp:6885 -msgid "Preheat" -msgstr "Preriscalda" - -# MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 -msgid "Preheating nozzle. Please wait." -msgstr "Preriscaldando l'ugello. Attendere prego." - -# c=14 -#: ultralcd.cpp:1959 -msgid "PINDA" -msgstr "" - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Prego aggiornare." - -# MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 -msgid "Press knob to preheat nozzle and continue." -msgstr "Premete la manopola per preriscaldare l'ugello e continuare." - -# MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 -msgid "Pause" -msgstr "Pausa" - -# -#: ultralcd.cpp:1783 -msgid "Power failures" -msgstr "Mancanza corrente" - -# MSG_PRINT_ABORTED c=20 -#: messages.c:65 -msgid "Print aborted" -msgstr "Stampa interrotta" - -# c=20 -#: ultralcd.cpp:2433 -msgid "Preheating to load" -msgstr "Preriscald. carico" - -# c=20 -#: ultralcd.cpp:2437 -msgid "Preheating to unload" -msgstr "Preriscald. scarico" - -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 -msgid "Print fan:" -msgstr "Vent.stam:" - -# MSG_CARD_MENU -#: messages.c:20 -msgid "Print from SD" -msgstr "Stampa da SD" - -# -#: ultralcd.cpp:2280 -msgid "Press the knob" -msgstr "Premere la manopola" - -# MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 -msgid "Print paused" -msgstr "Stampa in pausa" - -# -#: mmu.cpp:726 -msgid "Press the knob to resume nozzle temperature." -msgstr "Premete la manopola per recuperare la temperatura dell'ugello." - -# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 -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." - -# -#: ultralcd.cpp:1655 -msgid "Print FAN" -msgstr "Ventola di stampa" - -# -#: ultralcd.cpp:4922 -msgid "Please insert filament into the extruder, then press the knob to load it." -msgstr "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." - -# -#: ultralcd.cpp:4917 -msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." -msgstr "Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." - -# -#: ultralcd.cpp:4839 -msgid "Please load filament first." -msgstr "Per favore prima carica il filamento." - -# MSG_PRUSA3D -#: ultralcd.cpp:2156 -msgid "prusa3d.com" -msgstr "" - -# MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 -msgid "Rear side [um]" -msgstr "Retro [um]" - -# c=20 r=4 -#: ultralcd.cpp:7583 -msgid "Please unload the filament first, then repeat this action." -msgstr "Scaricare prima il filamento, poi ripetere l'operazione." - -# c=20 r=4 -#: ultralcd.cpp:7586 -msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Controllare il collegamento al sensore e rimuovere il filamento." - -# MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 -msgid "Recovering print " -msgstr "Recupero stampa " - -# MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 -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." - -# c=20 -#: -msgid "Prusa i3 MK3S OK." -msgstr "" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 -msgid "Reset XYZ calibr." -msgstr "Reset calibrazione XYZ." - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 -msgid "Reset" -msgstr "" - -# MSG_RESUME_PRINT -#: ultralcd.cpp:6893 -msgid "Resume print" -msgstr "Riprendi stampa" - -# MSG_RESUMING_PRINT c=20 -#: messages.c:69 -msgid "Resuming print" -msgstr "Riprendi stampa" - -# MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 -msgid "Right side[um]" -msgstr "Destra [um]" - -# MSG_RPI_PORT -#: messages.c:123 -msgid "RPi port" -msgstr "Porta RPi" - -# MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 -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_SD_CARD -#: messages.c:118 -msgid "SD card" -msgstr "Mem. SD" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 -msgid "FlashAir" -msgstr "" - -# -#: ultralcd.cpp:2992 -msgid "Right" -msgstr "Destra" - -# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 -msgid "Searching bed calibration point" -msgstr "Ricerca dei punti di calibrazione del piano" - -# MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 -msgid "Select language" -msgstr "Seleziona lingua" - -# MSG_SELFTEST_OK -#: ultralcd.cpp:7858 -msgid "Self test OK" -msgstr "Autotest OK" - -# MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 -msgid "Self test start " -msgstr "Avvia autotest" - -# MSG_SELFTEST -#: ultralcd.cpp:5871 -msgid "Selftest " -msgstr "Autotest " - -# MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 -msgid "Selftest error !" -msgstr "Errore Autotest !" - -# MSG_SELFTEST_FAILED c=20 -#: messages.c:73 -msgid "Selftest failed " -msgstr "Autotest fallito" - -# MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 -msgid "Selftest will be run to calibrate accurate sensorless rehoming." -msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" - -# -#: ultralcd.cpp:5098 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." - -# MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 -msgid "Set temperature:" -msgstr "Imposta temperatura" - -# c=20 -#: -msgid "Prusa i3 MK2.5 OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK2.5S OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK3 OK." -msgstr "" - -# MSG_SETTINGS -#: messages.c:82 -msgid "Settings" -msgstr "Impostazioni" - -# MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 -msgid "Show end stops" -msgstr "Stato finecorsa" - -# -#: ultralcd.cpp:4004 -msgid "Sensor state" -msgstr "Stato sensore" - -# MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 -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 -#: messages.c:120 -msgid "Sort" -msgstr "Ordina" - -# MSG_NONE -#: messages.c:110 -msgid "None" -msgstr "Nessuno" - -# MSG_SORT_TIME -#: messages.c:121 -msgid "Time" -msgstr "Cron." - -# -#: ultralcd.cpp:3035 -msgid "Severe skew:" -msgstr "Devia.grave:" - -# MSG_SORT_ALPHA -#: messages.c:122 -msgid "Alphabet" -msgstr "Alfabeti" - -# MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 -msgid "Sorting files" -msgstr "Ordinando i file" - -# MSG_SOUND_LOUD -#: messages.c:125 -msgid "Loud" -msgstr "Forte" - -# -#: ultralcd.cpp:3034 -msgid "Slight skew:" -msgstr "Devia.lieve:" - -# MSG_SOUND -#: messages.c:124 -msgid "Sound" -msgstr "Suono" - -# c=7 -#: ultralcd.cpp:1822 -msgid "Runouts" -msgstr "Esaurim" - -# -#: Marlin_main.cpp:5115 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." - -# MSG_SOUND_ONCE -#: messages.c:126 -msgid "Once" -msgstr "Singolo" - -# MSG_SPEED -#: ultralcd.cpp:7151 -msgid "Speed" -msgstr "Velocita" - -# MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 -msgid "Spinning" -msgstr "Gira" - -# MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 -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:7010 -msgid "Statistics " -msgstr "Statistiche" - -# MSG_STOP_PRINT -#: messages.c:91 -msgid "Stop print" -msgstr "Arresta stampa" - -# MSG_STOPPED -#: messages.c:92 -msgid "STOPPED. " -msgstr "ARRESTATO." - -# MSG_SUPPORT -#: ultralcd.cpp:7019 -msgid "Support" -msgstr "Supporto" - -# MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 -msgid "Swapped" -msgstr "Scambiato" - -# -#: ultralcd.cpp:4810 -msgid "Select filament:" -msgstr "Seleziona il filamento:" - -# MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 -msgid "Temp. cal." -msgstr "Calib. temp." - -# -#: ultralcd.cpp:4951 -msgid "Select temperature which matches your material." -msgstr "Seleziona la temperatura appropriata per il tuo materiale." - -# MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 -msgid "Temp. calibration" -msgstr "Calib. Temp." - -# MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 -msgid "Temperature calibration failed" -msgstr "Calibrazione temperatura fallita" - -# MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 -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." - -# c=20 r=3 -#: ultralcd.cpp:7590 -msgid "Sensor verified, remove the filament now." -msgstr "Sensore verificato, rimuovere il filamento." - -# MSG_TEMPERATURE -#: ultralcd.cpp:5765 -msgid "Temperature" -msgstr "" - -# MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 -msgid "Temperatures" -msgstr "Temperature" - -# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 -msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " - -# -#: ultralcd.cpp:2889 -msgid "Total filament" -msgstr "Filamento totale" - -# -#: ultralcd.cpp:2890 -msgid "Total print time" -msgstr "Tempo stampa totale" - -# MSG_TUNE -#: ultralcd.cpp:6882 -msgid "Tune" -msgstr "Regola" - -# -#: -msgid "Unload" -msgstr "Scarica" - -# -#: ultralcd.cpp:1752 -msgid "Total failures" -msgstr "Totale fallimenti" - -# -#: ultralcd.cpp:2287 -msgid "to load filament" -msgstr "per caricare il filamento" - -# -#: ultralcd.cpp:2291 -msgid "to unload filament" -msgstr "per scaricare il filamento" - -# MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 -msgid "Unload filament" -msgstr "Scarica filamento" - -# MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 -msgid "Unloading filament" -msgstr "Scaricando filamento" - -# -#: ultralcd.cpp:1705 -msgid "Total" -msgstr "Totale" - -# MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 -msgid "Used during print" -msgstr "Usati nella stampa" - -# MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 -msgid "Voltages" -msgstr "Voltaggi" - -# -#: ultralcd.cpp:2184 -msgid "unknown" -msgstr "sconosciuto" - -# MSG_USERWAIT -#: Marlin_main.cpp:5525 -msgid "Wait for user..." -msgstr "Attendendo utente..." - -# MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 -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:3393 -msgid "Waiting for PINDA probe cooling" -msgstr "In attesa del raffreddamento della sonda PINDA" - -# -#: -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:1525 -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:1517 -msgid "Warning: motherboard type changed." -msgstr "Avviso: tipo di scheda madre cambiato" - -# MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 -msgid "Warning: printer type changed." -msgstr "Avviso: tipo di stampante cambiato." - -# MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 -msgid "Was filament unload successful?" -msgstr "Filamento scaricato con successo?" - -# MSG_SELFTEST_WIRINGERROR -#: messages.c:81 -msgid "Wiring error" -msgstr "Errore cablaggio" - -# MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 -msgid "Wizard" -msgstr "" - -# MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 -msgid "XYZ cal. details" -msgstr "XYZ Cal. dettagli" - -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:18 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." - -# MSG_YES -#: messages.c:102 -msgid "Yes" -msgstr "Si" - -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 -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:3902 -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:3899 -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_TIMEOUT c=12 -#: messages.c:137 -msgid "Timeout" -msgstr "" - -# MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 -msgid "X-correct:" -msgstr "Correzione-X:" - -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 -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:3880 -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:3883 -msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 -msgid "Load all" -msgstr "Caricare tutti" - -# -#: ultralcd.cpp:3862 -msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato." - -# -#: ultralcd.cpp:3868 -msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." - -# -#: ultralcd.cpp:3871 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." - -# -#: ultralcd.cpp:2989 -msgid "Y distance from min" -msgstr "Distanza Y dal min" - -# -#: ultralcd.cpp:4954 -msgid "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)." -msgstr "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):" - -# c=20 r=5 -#: ultralcd.cpp:7594 -msgid "Verification failed, remove the filament and try again." -msgstr "Verifica fallita, rimuovere il filamento e riprovare." - -# MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 -msgid "Y-correct:" -msgstr "Correzione-Y:" - -# MSG_OFF -#: messages.c:105 -msgid "Off" -msgstr "" - -# MSG_ON -#: messages.c:106 -msgid "On" -msgstr "" - -# -#: messages.c:53 -msgid "Back" -msgstr "Indietro" - -# -#: ultralcd.cpp:5742 -msgid "Checks" -msgstr "Controlli" - -# -#: ultralcd.cpp:8395 -msgid "False triggering" -msgstr "Falso innesco" - -# -#: ultralcd.cpp:4009 -msgid "FINDA:" -msgstr "" - -# MSG_FIRMWARE -#: language.h:23 -msgid "Firmware" -msgstr "" - -# MSG_STRICT -#: messages.c:112 -msgid "Strict" -msgstr "Esatto" - -# MSG_WARN -#: messages.c:111 -msgid "Warn" -msgstr "Avviso" - -# -#: messages.c:83 -msgid "HW Setup" -msgstr "Impostazioni HW" - -# -#: ultralcd.cpp:4013 -msgid "IR:" -msgstr "" - -# MSG_MAGNETS_COMP -#: messages.c:130 -msgid "Magnets comp." -msgstr "Comp. Magneti" - -# MSG_MESH -#: messages.c:128 -msgid "Mesh" -msgstr "Griglia" - -# -#: ultralcd.cpp:5789 -msgid "Mesh bed leveling" -msgstr "Liv. griglia piano" - -# -#: Marlin_main.cpp:877 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Firmware MK3S rilevato su stampante MK3" - -# MSG_MMU_MODE -#: messages.c:117 -msgid "MMU Mode" -msgstr "Mod. MMU" - -# -#: ultralcd.cpp:4490 -msgid "Mode change in progress ..." -msgstr "Cambio modalita in corso ..." - -# MSG_MODEL -#: messages.c:113 -msgid "Model" -msgstr "Modello" - -# MSG_NOZZLE_DIAMETER -#: messages.c:116 -msgid "Nozzle d." -msgstr "Diam.Ugello" - -# -#: util.cpp:514 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code processato per un livello diverso. Continuare?" - -# -#: util.cpp:520 -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:431 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code processato per una stampante diversa. Continuare?" - -# -#: util.cpp:437 -msgid "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -msgstr "G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." - -# -#: util.cpp:481 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code processato per un firmware piu recente. Continuare?" - -# -#: util.cpp:487 -msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." -msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." - -# -#: ultralcd.cpp:4005 -msgid "PINDA:" -msgstr "" - -# c=20 -#: ultralcd.cpp:2443 -msgid "Preheating to cut" -msgstr "Preriscalda. taglio" - -# c=20 -#: ultralcd.cpp:2440 -msgid "Preheating to eject" -msgstr "Preriscalda. espuls." - -# -#: util.cpp:394 -msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "Diametro ugello diverso da G-Code. Continuare?" - -# -#: util.cpp:401 -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." - -# c=20 -#: ultralcd.cpp:8401 -msgid "%s level expected" -msgstr "atteso livello %s" - -# -#: ultralcd.cpp:6846 -msgid "Rename" -msgstr "Rinomina" - -# -#: ultralcd.cpp:6839 -msgid "Select" -msgstr "Seleziona" - -# -#: ultralcd.cpp:2202 -msgid "Sensor info" -msgstr "Info Sensore" - -# MSG_SHEET c=10 -#: messages.c:54 -msgid "Sheet" -msgstr "Piano" - -# MSG_SOUND_BLIND -#: messages.c:127 -msgid "Assist" -msgstr "Assist." - -# c=18 -#: ultralcd.cpp:5740 -msgid "Steel sheets" -msgstr "Piani d'acciaio" - -# MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 -msgid "Z-correct:" -msgstr "Correzione-Z:" - -# MSG_Z_PROBE_NR -#: messages.c:129 -msgid "Z-probe nr." -msgstr "Nr. Z-test" - +# Translation of Prusa-Firmware into Italian. +# +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Di 26. Jan 11:04:11 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:11 CET 2021\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +# +#: +msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +msgstr "[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset" + +# MSG_03_OR_OLDER c=18 +#: messages.c:164 +msgid " 0.3 or older" +msgstr " 0.3 o inferiore" + +# c=18 +#: Marlin_main.cpp:9626 +msgid "FS v0.3 or older" +msgstr "FS 0.3 o inferiore" + +# MSG_IR_04_OR_NEWER c=18 +#: messages.c:163 +msgid " 0.4 or newer" +msgstr " 0.4 o superiore" + +# c=18 +#: Marlin_main.cpp:9625 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 o superiore" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:165 +msgid "unknown state" +msgstr "stato sconosciuto" + +# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 +#: messages.c:43 +msgid " of 4" +msgstr " su 4" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 +#: messages.c:66 +msgid " of 9" +msgstr " su 9" + +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:2988 +msgid "[0;0] point offset" +msgstr "[0;0] punto offset" + +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +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 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa" + +# +#: ultralcd.cpp:2410 +msgid ">Cancel" +msgstr ">Annulla" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3108 +msgid "Adjusting Z:" +msgstr "Compensaz. Z:" + +# MSG_SELFTEST_CHECK_ALLCORRECT c=20 +#: ultralcd.cpp:8390 +msgid "All correct " +msgstr "Nessun errore" + +# MSG_WIZARD_DONE c=20 r=8 +#: messages.c:116 +msgid "All is done. Happy printing!" +msgstr "Tutto fatto. Buona stampa!" + +# +#: ultralcd.cpp:1902 +msgid "Ambient" +msgstr "Ambiente" + +# MSG_AUTO c=6 +#: messages.c:160 +msgid "Auto" +msgstr "" + +# MSG_PRESS c=20 r=2 +#: ultralcd.cpp:2567 +msgid "and press the knob" +msgstr "e cliccare manopola" + +# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#: ultralcd.cpp:3429 +msgid "Are left and right Z~carriages all up?" +msgstr "I carrelli Z sin/des sono altezza max?" + +# MSG_AUTO_DEPLETE c=17 r=1 +#: messages.c:125 +msgid "SpoolJoin" +msgstr "" + +# MSG_AUTO_HOME +#: messages.c:11 +msgid "Auto home" +msgstr "Trova origine" + +# MSG_AUTOLOAD_FILAMENT c=18 +#: ultralcd.cpp:6716 +msgid "AutoLoad filament" +msgstr "Autocaric. filam." + +# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +#: ultralcd.cpp:4346 +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:2730 +msgid "Autoloading filament is active, just press the knob and insert filament..." +msgstr "Caricamento automatico attivo, premi la manopola e inserisci il filamento." + +# MSG_SELFTEST_AXIS_LENGTH +#: ultralcd.cpp:8073 +msgid "Axis length" +msgstr "Lunghezza dell'asse" + +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:8074 +msgid "Axis" +msgstr "Assi" + +# MSG_SELFTEST_BEDHEATER +#: ultralcd.cpp:8031 +msgid "Bed / Heater" +msgstr "Piano/Riscald." + +# MSG_BED_DONE +#: messages.c:15 +msgid "Bed done" +msgstr "Piano fatto." + +# MSG_BED_HEATING +#: messages.c:16 +msgid "Bed Heating" +msgstr "Riscald. piano" + +# MSG_BED_CORRECTION_MENU +#: ultralcd.cpp:5802 +msgid "Bed level correct" +msgstr "Correz. liv.piano" + +# MSG_BELTTEST c=17 +#: ultralcd.cpp:5782 +msgid "Belt test " +msgstr "Test cinghie " + +# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 +#: messages.c:17 +msgid "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." +msgstr "Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset." + +# MSG_BRIGHT c=6 +#: messages.c:158 +msgid "Bright" +msgstr "Chiaro" + +# MSG_BRIGHTNESS c=18 +#: messages.c:154 +msgid "Brightness" +msgstr "Luminosita'" + +# MSG_BED +#: messages.c:14 +msgid "Bed" +msgstr "Piano" + +# MSG_BELT_STATUS c=18 +#: +msgid "Belt status" +msgstr "Stato cinghie" + +# MSG_RECOVER_PRINT c=20 r=2 +#: messages.c:80 +msgid "Blackout occurred. Recover print?" +msgstr "Blackout rilevato. Recuperare la stampa?" + +# +#: ultralcd.cpp:8392 +msgid "Calibrating home" +msgstr "Calibrazione Home" + +# MSG_CALIBRATE_BED +#: ultralcd.cpp:5791 +msgid "Calibrate XYZ" +msgstr "Calibra XYZ" + +# MSG_HOMEYZ +#: messages.c:51 +msgid "Calibrate Z" +msgstr "Calibra Z" + +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4538 +msgid "Calibrate" +msgstr "Calibra" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 +#: ultralcd.cpp:3392 +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." + +# MSG_CALIBRATE_Z_AUTO c=20 r=2 +#: messages.c:20 +msgid "Calibrating Z" +msgstr "Calibrando Z" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 +#: ultralcd.cpp:3392 +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:813 +msgid "Calibration done" +msgstr "Calibrazione completa" + +# MSG_MENU_CALIBRATION +#: messages.c:67 +msgid "Calibration" +msgstr "Calibrazione" + +# +#: ultralcd.cpp:4716 +msgid "Cancel" +msgstr "Annulla" + +# MSG_SD_REMOVED +#: ultralcd.cpp:8842 +msgid "Card removed" +msgstr "SD rimossa" + +# MSG_NOT_COLOR +#: ultralcd.cpp:2647 +msgid "Color not correct" +msgstr "Colore non puro" + +# MSG_COOLDOWN +#: messages.c:25 +msgid "Cooldown" +msgstr "Raffredda" + +# +#: ultralcd.cpp:4471 +msgid "Copy selected language?" +msgstr "Copiare la lingua selezionata?" + +# MSG_CRASHDETECT c=13 +#: messages.c:28 +msgid "Crash det." +msgstr "Rileva.crash" + +# +#: ultralcd.cpp:4851 +msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." +msgstr "Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo." + +# MSG_CRASH_DETECTED c=20 r=1 +#: messages.c:27 +msgid "Crash detected." +msgstr "Rilevato impatto." + +# +#: Marlin_main.cpp:657 +msgid "Crash detected. Resume print?" +msgstr "Scontro rilevato. Riprendere la stampa?" + +# MSG_CRASH c=7 +#: messages.c:26 +msgid "Crash" +msgstr "Impatto" + +# MSG_CURRENT c=19 r=1 +#: ultralcd.cpp:5933 +msgid "Current" +msgstr "Attuale" + +# MSG_DATE c=17 r=1 +#: ultralcd.cpp:2112 +msgid "Date:" +msgstr "Data:" + +# MSG_DISABLE_STEPPERS +#: ultralcd.cpp:5683 +msgid "Disable steppers" +msgstr "Disabilita motori" + +# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 +#: messages.c:13 +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 "Distanza tra la punta dell'ugello e la superficie del piano non ancora impostata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Calibrazione primo strato." + +# MSG_FS_CONTINUE c=5 +#: messages.c:152 +msgid "Cont." +msgstr "" + +# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 +#: ultralcd.cpp:5026 +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=13 +#: ultralcd.cpp:5095 +msgid "E-correct:" +msgstr "Correzione-E:" + +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 +msgid "Eject filament" +msgstr "Espelli fil." + +# MSG_EJECTING_FILAMENT c=20 r=1 +#: mmu.cpp:1414 +msgid "Ejecting filament" +msgstr "Espellendo filamento" + +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 +#: ultralcd.cpp:8049 +msgid "Endstop not hit" +msgstr "Finec. fuori portata" + +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:8044 +msgid "Endstop" +msgstr "Finecorsa" + +# MSG_SELFTEST_ENDSTOPS +#: ultralcd.cpp:8035 +msgid "Endstops" +msgstr "Finecorsa" + +# MSG_STACK_ERROR c=20 r=4 +#: ultralcd.cpp:6753 +msgid "Error - static memory has been overwritten" +msgstr "Errore - la memoria statica e' stata sovrascritta" + +# MSG_CUT_FILAMENT c=16 +#: messages.c:59 +msgid "Cut filament" +msgstr "Taglia filamento" + +# MSG_CUTTER c=9 +#: messages.c:126 +msgid "Cutter" +msgstr "Tagliatr." + +# c=18 +#: mmu.cpp:1386 +msgid "Cutting filament" +msgstr "Tagliando filam." + +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4359 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "ERRORE: il sensore filam. non risponde,Controllare conness." + +# MSG_DIM c=6 +#: messages.c:159 +msgid "Dim" +msgstr "Scuro" + +# MSG_ERROR +#: messages.c:29 +msgid "ERROR:" +msgstr "ERRORE:" + +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8398 +msgid "Extruder fan:" +msgstr "Ventola estr:" + +# MSG_INFO_EXTRUDER c=18 +#: ultralcd.cpp:2153 +msgid "Extruder info" +msgstr "Info estrusore" + +# MSG_EXTRUDER c=17 +#: messages.c:30 +msgid "Extruder" +msgstr "Estrusore" + +# +#: ultralcd.cpp:6740 +msgid "Fail stats MMU" +msgstr "Stat.fall. MMU" + +# MSG_FSENSOR_AUTOLOAD c=13 +#: messages.c:47 +msgid "F. autoload" +msgstr "Autocar.fil." + +# +#: ultralcd.cpp:6737 +msgid "Fail stats" +msgstr "Stat. fallimenti" + +# MSG_FAN_SPEED c=14 +#: messages.c:34 +msgid "Fan speed" +msgstr "Velocita vent." + +# MSG_SELFTEST_FAN c=20 +#: messages.c:89 +msgid "Fan test" +msgstr "Test ventola" + +# MSG_FANS_CHECK c=13 +#: messages.c:31 +msgid "Fans check" +msgstr "Control.vent" + +# MSG_FSENSOR +#: messages.c:48 +msgid "Fil. sensor" +msgstr "Sensore fil." + +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Fil. esauriti " + +# MSG_FILAMENT_CLEAN c=20 r=2 +#: messages.c:35 +msgid "Filament extruding & with correct color?" +msgstr "Filamento estruso e con colore corretto?" + +# MSG_NOT_LOADED c=19 +#: ultralcd.cpp:2646 +msgid "Filament not loaded" +msgstr "Fil. non caricato" + +# MSG_FILAMENT_SENSOR c=20 +#: messages.c:95 +msgid "Filament sensor" +msgstr "Sensore filam." + +# MSG_FILAMENT_USED c=19 +#: ultralcd.cpp:2795 +msgid "Filament used" +msgstr "Fil. utilizzato" + +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2796 +msgid "Print time" +msgstr "Tempo di stampa" + +# MSG_FS_ACTION c=10 +#: messages.c:151 +msgid "FS Action" +msgstr "Azione FS" + +# MSG_FILE_INCOMPLETE c=20 r=3 +#: ultralcd.cpp:8540 +msgid "File incomplete. Continue anyway?" +msgstr "File incompleto. Continuare comunque?" + +# MSG_FINISHING_MOVEMENTS c=20 +#: messages.c:44 +msgid "Finishing movements" +msgstr "Finaliz. spostamenti" + +# MSG_V2_CALIBRATION c=18 +#: messages.c:120 +msgid "First layer cal." +msgstr "Cal. primo strato" + +# MSG_WIZARD_SELFTEST c=20 r=8 +#: ultralcd.cpp:4947 +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:726 +msgid "Fix the issue and then press button on MMU unit." +msgstr "Risolvere il problema e premere il bottone sull'unita MMU. " + +# MSG_FLOW +#: ultralcd.cpp:6880 +msgid "Flow" +msgstr "Flusso" + +# MSG_PRUSA3D_FORUM +#: ultralcd.cpp:2105 +msgid "forum.prusa3d.com" +msgstr "" + +# MSG_SELFTEST_COOLING_FAN c=20 +#: messages.c:86 +msgid "Front print fan?" +msgstr "Ventola frontale?" + +# MSG_BED_CORRECTION_FRONT c=14 r=1 +#: ultralcd.cpp:3190 +msgid "Front side[um]" +msgstr "Fronte [um]" + +# MSG_SELFTEST_FANS +#: ultralcd.cpp:8079 +msgid "Front/left fans" +msgstr "Ventola frontale/sinistra" + +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:8027 +msgid "Heater/Thermistor" +msgstr "Riscald./Termist." + +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:9616 +msgid "Heating disabled by safety timer." +msgstr "Riscaldamento fermato dal timer di sicurezza." + +# MSG_HEATING_COMPLETE c=20 +#: messages.c:50 +msgid "Heating done." +msgstr "Riscald. completo" + +# MSG_HEATING +#: messages.c:49 +msgid "Heating" +msgstr "Riscaldamento..." + +# MSG_WIZARD_WELCOME c=20 r=7 +#: ultralcd.cpp:4926 +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:2106 +msgid "howto.prusa3d.com" +msgstr "" + +# MSG_FILAMENTCHANGE +#: messages.c:41 +msgid "Change filament" +msgstr "Cambia filamento" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2576 +msgid "Change success!" +msgstr "Cambio riuscito!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2644 +msgid "Changed correctly?" +msgstr "Cambio corretto?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:92 +msgid "Checking bed " +msgstr "Verifica piano" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8381 +msgid "Checking endstops" +msgstr "Verifica finecorsa" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8387 +msgid "Checking hotend " +msgstr "Verifica ugello" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:93 +msgid "Checking sensors " +msgstr "Controllo sensori" + +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Verifica asse X" + +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Verifica asse Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: +msgid "Checking Z axis" +msgstr "Verifica asse Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:52 +msgid "Choose extruder:" +msgstr "Seleziona estrusore:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:53 +msgid "Choose filament:" +msgstr "Scegliere filamento:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:33 +msgid "Filament" +msgstr "Filamento" + +# MSG_WIZARD_XYZ_CAL c=20 r=8 +#: ultralcd.cpp:4956 +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:4964 +msgid "I will run z calibration now." +msgstr "Adesso avviero la Calibrazione Z." + +# MSG_WATCH +#: messages.c:114 +msgid "Info screen" +msgstr "Schermata info" + +# MSG_INSERT_FILAMENT c=20 +#: ultralcd.cpp:2564 +msgid "Insert filament" +msgstr "Inserire filamento" + +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 +msgid "Is filament loaded?" +msgstr "Il filamento e' stato caricato?" + +# MSG_STEEL_SHEET_CHECK c=20 r=2 +#: messages.c:107 +msgid "Is steel sheet on heatbed?" +msgstr "Piastra d'acciaio su piano riscaldato?" + +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 +msgid "Last print failures" +msgstr "Errori ultima stampa" + +# +#: ultralcd.cpp:5034 +msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +msgstr "Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio." + +# MSG_LAST_PRINT c=18 +#: messages.c:54 +msgid "Last print" +msgstr "Ultima stampa" + +# MSG_SELFTEST_EXTRUDER_FAN c=20 +#: messages.c:87 +msgid "Left hotend fan?" +msgstr "Vent SX hotend?" + +# +#: ultralcd.cpp:2919 +msgid "Left" +msgstr "Sinistra" + +# MSG_BED_CORRECTION_LEFT c=14 r=1 +#: ultralcd.cpp:3188 +msgid "Left side [um]" +msgstr "Sinistra [um]" + +# +#: ultralcd.cpp:5706 +msgid "Lin. correction" +msgstr "Correzione lineare" + +# MSG_BABYSTEP_Z +#: messages.c:12 +msgid "Live adjust Z" +msgstr "Compensazione Z" + +# c=20 r=6 +#: ultralcd.cpp:7280 +msgid "Insert the filament (do not load it) into the extruder and then press the knob." +msgstr "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." + +# MSG_LOAD_FILAMENT c=17 +#: messages.c:56 +msgid "Load filament" +msgstr "Carica filamento" + +# MSG_LOADING_COLOR +#: ultralcd.cpp:2598 +msgid "Loading color" +msgstr "Caricando colore" + +# MSG_LOADING_FILAMENT c=20 +#: messages.c:57 +msgid "Loading filament" +msgstr "Caricando filamento" + +# MSG_LOOSE_PULLEY c=20 r=1 +#: ultralcd.cpp:8067 +msgid "Loose pulley" +msgstr "Puleggia lenta" + +# +#: ultralcd.cpp:6699 +msgid "Load to nozzle" +msgstr "Carica ugello" + +# MSG_M117_V2_CALIBRATION c=25 +#: messages.c:60 +msgid "M117 First layer cal." +msgstr "M117 Calibr. primo strato" + +# MSG_MAIN +#: messages.c:61 +msgid "Main" +msgstr "Menu principale" + +# MSG_BL_HIGH c=12 +#: messages.c:155 +msgid "Level Bright" +msgstr "Liv. Chiaro" + +# MSG_BL_LOW c=12 +#: messages.c:156 +msgid "Level Dimmed" +msgstr "Liv. Scuro" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 +#: messages.c:65 +msgid "Measuring reference height of calibration point" +msgstr "Misura altezza di rif. del punto di calib." + +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 +msgid "Mesh Bed Leveling" +msgstr "Liv. grilia piano" + +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:764 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. riprendendo la posizione... " + +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:757 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Ripristino temperatura... " + +# +#: ultralcd.cpp:2960 +msgid "Measured skew" +msgstr "Deviazione mis" + +# MSG_MMU_FAILS c=14 +#: messages.c:68 +msgid "MMU fails" +msgstr "Fallimenti MMU" + +# +#: mmu.cpp:1586 +msgid "MMU load failed " +msgstr "Caricamento MMU fallito" + +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 +msgid "MMU load fails" +msgstr "Caricamenti MMU falliti" + +# MSG_MMU_OK_RESUMING c=20 r=4 +#: mmu.cpp:775 +msgid "MMU OK. Resuming..." +msgstr "MMU OK. Riprendendo... " + +# MSG_MODE +#: messages.c:101 +msgid "Mode" +msgstr "Mod." + +# c=20 r=3 +#: Marlin_main.cpp:934 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 rilevato su stampante MK3S" + +# MSG_NORMAL +#: messages.c:105 +msgid "Normal" +msgstr "Normale" + +# MSG_SILENT +#: messages.c:104 +msgid "Silent" +msgstr "Silenzioso" + +# +#: mmu.cpp:721 +msgid "MMU needs user attention." +msgstr "Il MMU richiede attenzione dall'utente." + +# +#: ultralcd.cpp:1701 +msgid "MMU power fails" +msgstr "Manc. corr. MMU" + +# MSG_STEALTH +#: messages.c:106 +msgid "Stealth" +msgstr "Silenziosa" + +# MSG_AUTO_POWER +#: messages.c:103 +msgid "Auto power" +msgstr "Auto" + +# MSG_HIGH_POWER +#: messages.c:102 +msgid "High power" +msgstr "Forte" + +# +#: ultralcd.cpp:2124 +msgid "MMU2 connected" +msgstr "MMU2 connessa" + +# MSG_SELFTEST_MOTOR +#: messages.c:94 +msgid "Motor" +msgstr "Motore" + +# MSG_MOVE_AXIS +#: ultralcd.cpp:5681 +msgid "Move axis" +msgstr "Muovi asse" + +# MSG_MOVE_X +#: ultralcd.cpp:4262 +msgid "Move X" +msgstr "Sposta X" + +# MSG_MOVE_Y +#: ultralcd.cpp:4263 +msgid "Move Y" +msgstr "Sposta Y" + +# MSG_MOVE_Z +#: ultralcd.cpp:4264 +msgid "Move Z" +msgstr "Sposta Z" + +# MSG_NO_MOVE +#: Marlin_main.cpp:5719 +msgid "No move." +msgstr "Nessun movimento." + +# MSG_NO_CARD +#: ultralcd.cpp:6673 +msgid "No SD card" +msgstr "Nessuna SD" + +# MSG_NA +#: messages.c:124 +msgid "N/A" +msgstr "N/D" + +# MSG_NO +#: messages.c:70 +msgid "No" +msgstr "" + +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:8028 +msgid "Not connected" +msgstr "Non connesso" + +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Nuova versione firmware disponibile:" + +# MSG_SELFTEST_FAN_NO c=19 +#: messages.c:90 +msgid "Not spinning" +msgstr "Non gira" + +# MSG_WIZARD_V2_CAL c=20 r=8 +#: ultralcd.cpp:4847 +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:4972 +msgid "Now I will preheat nozzle for PLA." +msgstr "Adesso preriscaldero l'ugello per PLA." + +# MSG_NOZZLE +#: messages.c:71 +msgid "Nozzle" +msgstr "Ugello" + +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 +#: Marlin_main.cpp:1581 +msgid "Old settings found. Default PID, Esteps etc. will be set." +msgstr "Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc." + +# +#: ultralcd.cpp:4963 +msgid "Now remove the test print from steel sheet." +msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." + +# +#: ultralcd.cpp:1600 +msgid "Nozzle FAN" +msgstr "Ventola estrusore" + +# MSG_PAUSE_PRINT +#: ultralcd.cpp:6637 +msgid "Pause print" +msgstr "Metti in pausa" + +# MSG_PID_RUNNING c=20 r=1 +#: ultralcd.cpp:1485 +msgid "PID cal. " +msgstr "Calibrazione PID" + +# MSG_PID_FINISHED c=20 r=1 +#: ultralcd.cpp:1491 +msgid "PID cal. finished" +msgstr "Calib. PID completa" + +# MSG_PID_EXTRUDER c=17 r=1 +#: ultralcd.cpp:5803 +msgid "PID calibration" +msgstr "Calibrazione PID" + +# MSG_PINDA_PREHEAT c=20 r=1 +#: ultralcd.cpp:843 +msgid "PINDA Heating" +msgstr "Riscaldamento PINDA" + +# MSG_PAPER c=20 r=10 +#: messages.c:72 +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:5029 +msgid "Please clean heatbed and then press the knob." +msgstr "Per favore pulisci il piatto, poi premi la manopola." + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:24 +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:8022 +msgid "Please check :" +msgstr "Verifica:" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:115 +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_CHECK_IDLER c=20 r=4 +#: Marlin_main.cpp:3317 +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:73 +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:77 +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:79 +msgid "Please pull out filament immediately" +msgstr "Estrarre il filamento immediatamente" + +# MSG_EJECT_REMOVE c=20 r=4 +#: mmu.cpp:1420 +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:82 +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:4766 +msgid "Please run XYZ calibration first." +msgstr "Esegui la calibrazione XYZ prima. " + +# MSG_UPDATE_MMU2_FW c=20 r=4 +#: mmu.cpp:1340 +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:74 +msgid "Please wait" +msgstr "Attendere" + +# +#: ultralcd.cpp:4962 +msgid "Please remove shipping helpers first." +msgstr "Per favore rimuovete i materiali da spedizione" + +# MSG_PREHEAT_NOZZLE c=20 +#: messages.c:76 +msgid "Preheat the nozzle!" +msgstr "Prerisc. ugello!" + +# MSG_PREHEAT +#: ultralcd.cpp:6615 +msgid "Preheat" +msgstr "Preriscalda" + +# MSG_WIZARD_HEATING c=20 r=3 +#: messages.c:117 +msgid "Preheating nozzle. Please wait." +msgstr "Preriscaldando l'ugello. Attendere prego." + +# c=14 +#: ultralcd.cpp:1905 +msgid "PINDA" +msgstr "" + +# +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Prego aggiornare." + +# MSG_PRESS_TO_PREHEAT c=20 r=4 +#: Marlin_main.cpp:11718 +msgid "Press knob to preheat nozzle and continue." +msgstr "Premete la manopola per preriscaldare l'ugello e continuare." + +# MSG_FS_PAUSE c=5 +#: fsensor.cpp:728 +msgid "Pause" +msgstr "Pausa" + +# MSG_POWER_FAILURES c=14 +#: messages.c:75 +msgid "Power failures" +msgstr "Mancanza corrente" + +# MSG_PRINT_ABORTED c=20 +#: messages.c:78 +msgid "Print aborted" +msgstr "Stampa interrotta" + +# c=20 +#: ultralcd.cpp:2390 +msgid "Preheating to load" +msgstr "Preriscald. carico" + +# c=20 +#: ultralcd.cpp:2395 +msgid "Preheating to unload" +msgstr "Preriscald. scarico" + +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8401 +msgid "Print fan:" +msgstr "Vent.stam:" + +# MSG_CARD_MENU +#: messages.c:21 +msgid "Print from SD" +msgstr "Stampa da SD" + +# +#: ultralcd.cpp:2231 +msgid "Press the knob" +msgstr "Premere la manopola" + +# MSG_PRINT_PAUSED c=20 r=1 +#: ultralcd.cpp:1065 +msgid "Print paused" +msgstr "Stampa in pausa" + +# +#: mmu.cpp:725 +msgid "Press the knob to resume nozzle temperature." +msgstr "Premete la manopola per recuperare la temperatura dell'ugello." + +# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +#: messages.c:45 +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." + +# +#: ultralcd.cpp:1601 +msgid "Print FAN" +msgstr "Ventola di stampa" + +# +#: ultralcd.cpp:4827 +msgid "Please insert filament into the extruder, then press the knob to load it." +msgstr "Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo." + +# +#: ultralcd.cpp:4822 +msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." +msgstr "Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo." + +# +#: ultralcd.cpp:4744 +msgid "Please load filament first." +msgstr "Per favore prima carica il filamento." + +# MSG_PRUSA3D +#: ultralcd.cpp:2104 +msgid "prusa3d.com" +msgstr "" + +# MSG_BED_CORRECTION_REAR c=14 r=1 +#: ultralcd.cpp:3191 +msgid "Rear side [um]" +msgstr "Retro [um]" + +# c=20 r=4 +#: ultralcd.cpp:7304 +msgid "Please unload the filament first, then repeat this action." +msgstr "Scaricare prima il filamento, poi ripetere l'operazione." + +# c=20 r=4 +#: ultralcd.cpp:7307 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Controllare il collegamento al sensore e rimuovere il filamento." + +# MSG_RECOVERING_PRINT c=20 +#: Marlin_main.cpp:11076 +msgid "Recovering print " +msgstr "Recupero stampa " + +# MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#: mmu.cpp:832 +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." + +# c=20 +#: +msgid "Prusa i3 MK3S OK." +msgstr "" + +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5808 +msgid "Reset XYZ calibr." +msgstr "Reset calibrazione XYZ." + +# MSG_RESET c=14 +#: messages.c:83 +msgid "Reset" +msgstr "" + +# MSG_RESUME_PRINT c=18 +#: messages.c:84 +msgid "Resume print" +msgstr "Riprendi stampa" + +# MSG_RESUMING_PRINT c=20 +#: messages.c:85 +msgid "Resuming print" +msgstr "Riprendi stampa" + +# MSG_BED_CORRECTION_RIGHT c=14 r=1 +#: ultralcd.cpp:3189 +msgid "Right side[um]" +msgstr "Destra [um]" + +# MSG_RPI_PORT +#: messages.c:142 +msgid "RPi port" +msgstr "Porta RPi" + +# MSG_WIZARD_RERUN c=20 r=7 +#: ultralcd.cpp:4765 +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_SD_CARD +#: messages.c:137 +msgid "SD card" +msgstr "Mem. SD" + +# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +#: messages.c:138 +msgid "FlashAir" +msgstr "" + +# +#: ultralcd.cpp:2920 +msgid "Right" +msgstr "Destra" + +# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 +#: messages.c:42 +msgid "Searching bed calibration point" +msgstr "Ricerca dei punti di calibrazione del piano" + +# MSG_LANGUAGE_SELECT +#: ultralcd.cpp:5721 +msgid "Select language" +msgstr "Seleziona lingua" + +# MSG_SELFTEST_OK +#: ultralcd.cpp:7579 +msgid "Self test OK" +msgstr "Autotest OK" + +# MSG_SELFTEST_START c=20 +#: ultralcd.cpp:7347 +msgid "Self test start " +msgstr "Avvia autotest" + +# MSG_SELFTEST +#: ultralcd.cpp:5784 +msgid "Selftest " +msgstr "Autotest " + +# MSG_SELFTEST_ERROR +#: ultralcd.cpp:8021 +msgid "Selftest error !" +msgstr "Errore Autotest !" + +# MSG_SELFTEST_FAILED c=20 +#: messages.c:88 +msgid "Selftest failed " +msgstr "Autotest fallito" + +# MSG_FORCE_SELFTEST c=20 r=8 +#: Marlin_main.cpp:1613 +msgid "Selftest will be run to calibrate accurate sensorless rehoming." +msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" + +# +#: ultralcd.cpp:5003 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale." + +# MSG_SET_TEMPERATURE c=19 r=1 +#: ultralcd.cpp:3209 +msgid "Set temperature:" +msgstr "Imposta temperatura" + +# c=20 +#: +msgid "Prusa i3 MK2.5 OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK2.5S OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK3 OK." +msgstr "" + +# MSG_SETTINGS +#: messages.c:97 +msgid "Settings" +msgstr "Impostazioni" + +# MSG_SHOW_END_STOPS c=18 +#: ultralcd.cpp:5805 +msgid "Show end stops" +msgstr "Stato finecorsa" + +# +#: ultralcd.cpp:3915 +msgid "Sensor state" +msgstr "Stato sensore" + +# MSG_FILE_CNT c=20 r=6 +#: 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 +#: messages.c:139 +msgid "Sort" +msgstr "Ordina" + +# MSG_NONE +#: messages.c:127 +msgid "None" +msgstr "Nessuno" + +# MSG_SORT_TIME +#: messages.c:140 +msgid "Time" +msgstr "Cron." + +# +#: ultralcd.cpp:2963 +msgid "Severe skew:" +msgstr "Devia.grave:" + +# MSG_SORT_ALPHA +#: messages.c:141 +msgid "Alphabet" +msgstr "Alfabeti" + +# MSG_SORTING c=20 r=1 +#: cardreader.cpp:746 +msgid "Sorting files" +msgstr "Ordinando i file" + +# MSG_SOUND_LOUD +#: messages.c:144 +msgid "Loud" +msgstr "Forte" + +# +#: ultralcd.cpp:2962 +msgid "Slight skew:" +msgstr "Devia.lieve:" + +# MSG_SOUND +#: messages.c:143 +msgid "Sound" +msgstr "Suono" + +# c=7 +#: ultralcd.cpp:1768 +msgid "Runouts" +msgstr "Esaurim" + +# +#: Marlin_main.cpp:5280 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." + +# MSG_SOUND_ONCE +#: messages.c:145 +msgid "Once" +msgstr "Singolo" + +# MSG_SPEED +#: ultralcd.cpp:6874 +msgid "Speed" +msgstr "Velocita" + +# MSG_SELFTEST_FAN_YES c=19 +#: messages.c:91 +msgid "Spinning" +msgstr "Gira" + +# MSG_TEMP_CAL_WARNING c=20 r=4 +#: Marlin_main.cpp:4779 +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:6733 +msgid "Statistics " +msgstr "Statistiche" + +# MSG_STOP_PRINT +#: messages.c:108 +msgid "Stop print" +msgstr "Arresta stampa" + +# MSG_STOPPED +#: messages.c:109 +msgid "STOPPED. " +msgstr "ARRESTATO." + +# MSG_SUPPORT +#: ultralcd.cpp:6742 +msgid "Support" +msgstr "Supporto" + +# MSG_SELFTEST_SWAPPED +#: ultralcd.cpp:8080 +msgid "Swapped" +msgstr "Scambiato" + +# +#: ultralcd.cpp:4715 +msgid "Select filament:" +msgstr "Seleziona il filamento:" + +# MSG_TEMP_CALIBRATION c=14 +#: messages.c:110 +msgid "Temp. cal." +msgstr "Calib. temp." + +# +#: ultralcd.cpp:4856 +msgid "Select temperature which matches your material." +msgstr "Seleziona la temperatura appropriata per il tuo materiale." + +# MSG_CALIBRATION_PINDA_MENU c=17 r=1 +#: ultralcd.cpp:5816 +msgid "Temp. calibration" +msgstr "Calib. Temp." + +# MSG_TEMP_CAL_FAILED c=20 r=8 +#: ultralcd.cpp:3845 +msgid "Temperature calibration failed" +msgstr "Calibrazione temperatura fallita" + +# MSG_TEMP_CALIBRATION_DONE c=20 r=12 +#: messages.c:111 +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." + +# c=20 r=3 +#: ultralcd.cpp:7311 +msgid "Sensor verified, remove the filament now." +msgstr "Sensore verificato, rimuovere il filamento." + +# MSG_TEMPERATURE +#: ultralcd.cpp:5679 +msgid "Temperature" +msgstr "" + +# MSG_MENU_TEMPERATURES c=15 r=1 +#: ultralcd.cpp:2160 +msgid "Temperatures" +msgstr "Temperature" + +# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#: messages.c:46 +msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. " + +# +#: ultralcd.cpp:2817 +msgid "Total filament" +msgstr "Filamento totale" + +# +#: ultralcd.cpp:2818 +msgid "Total print time" +msgstr "Tempo stampa totale" + +# MSG_TUNE +#: ultralcd.cpp:6612 +msgid "Tune" +msgstr "Regola" + +# +#: +msgid "Unload" +msgstr "Scarica" + +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 +msgid "Total failures" +msgstr "Totale fallimenti" + +# +#: ultralcd.cpp:2238 +msgid "to load filament" +msgstr "per caricare il filamento" + +# +#: ultralcd.cpp:2242 +msgid "to unload filament" +msgstr "per scaricare il filamento" + +# MSG_UNLOAD_FILAMENT c=17 +#: messages.c:112 +msgid "Unload filament" +msgstr "Scarica filamento" + +# MSG_UNLOADING_FILAMENT c=20 r=1 +#: messages.c:113 +msgid "Unloading filament" +msgstr "Scaricando filamento" + +# MSG_TOTAL c=6 +#: messages.c:98 +msgid "Total" +msgstr "Totale" + +# MSG_USED c=19 r=1 +#: ultralcd.cpp:5932 +msgid "Used during print" +msgstr "Usati nella stampa" + +# MSG_MENU_VOLTAGES c=15 r=1 +#: ultralcd.cpp:2163 +msgid "Voltages" +msgstr "Voltaggi" + +# +#: ultralcd.cpp:2132 +msgid "unknown" +msgstr "sconosciuto" + +# MSG_USERWAIT +#: Marlin_main.cpp:5689 +msgid "Wait for user..." +msgstr "Attendendo utente..." + +# MSG_WAITING_TEMP c=20 r=3 +#: ultralcd.cpp:3357 +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:3318 +msgid "Waiting for PINDA probe cooling" +msgstr "In attesa del raffreddamento della sonda PINDA" + +# +#: +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:1573 +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:1565 +msgid "Warning: motherboard type changed." +msgstr "Avviso: tipo di scheda madre cambiato" + +# MSG_CHANGED_PRINTER c=20 r=4 +#: Marlin_main.cpp:1569 +msgid "Warning: printer type changed." +msgstr "Avviso: tipo di stampante cambiato." + +# MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#: Marlin_main.cpp:3308 +msgid "Was filament unload successful?" +msgstr "Filamento scaricato con successo?" + +# MSG_SELFTEST_WIRINGERROR +#: messages.c:96 +msgid "Wiring error" +msgstr "Errore cablaggio" + +# MSG_WIZARD c=17 r=1 +#: ultralcd.cpp:5775 +msgid "Wizard" +msgstr "" + +# MSG_XYZ_DETAILS c=18 +#: ultralcd.cpp:2152 +msgid "XYZ cal. details" +msgstr "XYZ Cal. dettagli" + +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:18 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Calibrazione XYZ fallita. Si prega di consultare il manuale." + +# MSG_YES +#: messages.c:119 +msgid "Yes" +msgstr "Si" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:118 +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:3817 +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:3814 +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_TIMEOUT c=12 +#: messages.c:157 +msgid "Timeout" +msgstr "" + +# MSG_X_CORRECTION c=13 +#: ultralcd.cpp:5091 +msgid "X-correct:" +msgstr "Correzione-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3811 +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:3795 +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:3798 +msgid "XYZ calibration compromised. Right front calibration point not reachable." +msgstr "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6171 +msgid "Load all" +msgstr "Caricare tutti" + +# +#: ultralcd.cpp:3777 +msgid "XYZ calibration failed. Bed calibration point was not found." +msgstr "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato." + +# +#: ultralcd.cpp:3783 +msgid "XYZ calibration failed. Front calibration points not reachable." +msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." + +# +#: ultralcd.cpp:3786 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." + +# +#: ultralcd.cpp:2917 +msgid "Y distance from min" +msgstr "Distanza Y dal min" + +# +#: ultralcd.cpp:4859 +msgid "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)." +msgstr "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):" + +# c=20 r=5 +#: ultralcd.cpp:7315 +msgid "Verification failed, remove the filament and try again." +msgstr "Verifica fallita, rimuovere il filamento e riprovare." + +# MSG_Y_CORRECTION c=13 +#: ultralcd.cpp:5092 +msgid "Y-correct:" +msgstr "Correzione-Y:" + +# MSG_OFF +#: messages.c:122 +msgid "Off" +msgstr "" + +# MSG_ON +#: messages.c:123 +msgid "On" +msgstr "" + +# +#: messages.c:62 +msgid "Back" +msgstr "Indietro" + +# +#: ultralcd.cpp:5647 +msgid "Checks" +msgstr "Controlli" + +# +#: ultralcd.cpp:8090 +msgid "False triggering" +msgstr "Falso innesco" + +# +#: ultralcd.cpp:3920 +msgid "FINDA:" +msgstr "" + +# MSG_FIRMWARE +#: language.h:24 +msgid "Firmware" +msgstr "" + +# MSG_STRICT +#: messages.c:129 +msgid "Strict" +msgstr "Esatto" + +# MSG_WARN +#: messages.c:128 +msgid "Warn" +msgstr "Avviso" + +# MSG_HW_SETUP c=18 +#: messages.c:100 +msgid "HW Setup" +msgstr "Impostazioni HW" + +# +#: ultralcd.cpp:3924 +msgid "IR:" +msgstr "" + +# MSG_MAGNETS_COMP +#: messages.c:150 +msgid "Magnets comp." +msgstr "Comp. Magneti" + +# MSG_MESH +#: messages.c:147 +msgid "Mesh" +msgstr "Griglia" + +# +#: Marlin_main.cpp:927 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S rilevato su stampante MK3" + +# MSG_MMU_MODE +#: messages.c:136 +msgid "MMU Mode" +msgstr "Mod. MMU" + +# +#: ultralcd.cpp:4395 +msgid "Mode change in progress ..." +msgstr "Cambio modalita in corso ..." + +# MSG_MODEL +#: messages.c:130 +msgid "Model" +msgstr "Modello" + +# MSG_NOZZLE_DIAMETER +#: messages.c:135 +msgid "Nozzle d." +msgstr "Diam.Ugello" + +# +#: util.cpp:514 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-code processato per un livello diverso. Continuare?" + +# +#: util.cpp:520 +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." + +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code processato per una stampante diversa. Continuare?" + +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 +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:481 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code processato per un firmware piu recente. Continuare?" + +# +#: util.cpp:487 +msgid "G-code sliced for a newer firmware. Please update the firmware. Print cancelled." +msgstr "G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata." + +# +#: ultralcd.cpp:3916 +msgid "PINDA:" +msgstr "" + +# c=20 +#: ultralcd.cpp:2402 +msgid "Preheating to cut" +msgstr "Preriscalda. taglio" + +# c=20 +#: ultralcd.cpp:2399 +msgid "Preheating to eject" +msgstr "Preriscalda. espuls." + +# +#: util.cpp:394 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Diametro ugello diverso da G-Code. Continuare?" + +# +#: util.cpp:401 +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." + +# c=20 +#: ultralcd.cpp:8095 +msgid "%s level expected" +msgstr "atteso livello %s" + +# +#: ultralcd.cpp:6574 +msgid "Rename" +msgstr "Rinomina" + +# +#: ultralcd.cpp:6567 +msgid "Select" +msgstr "Seleziona" + +# +#: ultralcd.cpp:2154 +msgid "Sensor info" +msgstr "Info Sensore" + +# MSG_SHEET c=10 +#: messages.c:63 +msgid "Sheet" +msgstr "Piano" + +# MSG_SOUND_BLIND +#: messages.c:146 +msgid "Assist" +msgstr "Assist." + +# MSG_STEEL_SHEET c=18 +#: messages.c:64 +msgid "Steel sheets" +msgstr "Piani d'acciaio" + +# MSG_Z_CORRECTION c=13 +#: ultralcd.cpp:5093 +msgid "Z-correct:" +msgstr "Correzione-Z:" + +# MSG_Z_PROBE_NR +#: messages.c:149 +msgid "Z-probe nr." +msgstr "Nr. Z-test" + diff --git a/lang/po/new/pl.po b/lang/po/new/pl.po index 3de78e7f7..f44e8f2e1 100644 --- a/lang/po/new/pl.po +++ b/lang/po/new/pl.po @@ -1,1857 +1,1852 @@ -# Translation of Prusa-Firmware into Polish. -# -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Project-Id-Version: Prusa-Firmware\n" -"POT-Creation-Date: Fri Sep 18 15:25:45 CEST 2020\n" -"PO-Revision-Date: Fri Sep 18 15:25:45 CEST 2020\n" -"Language-Team: \n" -"X-Generator: Poedit 2.0.7\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Last-Translator: \n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -# -#: -msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" -msgstr "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" - -# MSG_IR_03_OR_OLDER c=18 -#: messages.c:144 -msgid " 0.3 or older" -msgstr " 0.3 lub starszy" - -# c=18 -#: Marlin_main.cpp:9463 -msgid "FS v0.3 or older" -msgstr "FS 0.3 lub starszy" - -# MSG_IR_04_OR_NEWER c=18 -#: messages.c:143 -msgid " 0.4 or newer" -msgstr " 0.4 lub nowszy" - -# c=18 -#: Marlin_main.cpp:9462 -msgid "FS v0.4 or newer" -msgstr "FS 0.4 lub nowszy" - -# MSG_IR_UNKNOWN c=18 -#: messages.c:145 -msgid "unknown state" -msgstr "Stan nieznany" - -# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 -#: messages.c:36 -msgid " of 4" -msgstr " z 4" - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 -#: messages.c:56 -msgid " of 9" -msgstr " z 9" - -# MSG_MEASURED_OFFSET -#: ultralcd.cpp:3062 -msgid "[0;0] point offset" -msgstr "[0;0] przesun.punktu" - -# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: -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 -#: -msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" -msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" - -# -#: ultralcd.cpp:2451 -msgid ">Cancel" -msgstr ">Anuluj" - -# MSG_BABYSTEPPING_Z c=15 -#: ultralcd.cpp:3182 -msgid "Adjusting Z:" -msgstr "Ustawianie Z:" - -# MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ultralcd.cpp:8704 -msgid "All correct " -msgstr "Wszystko OK " - -# MSG_WIZARD_DONE c=20 r=8 -#: messages.c:99 -msgid "All is done. Happy printing!" -msgstr "Gotowe. Udanego drukowania!" - -# -#: ultralcd.cpp:1956 -msgid "Ambient" -msgstr "Otoczenie" - -# MSG_AUTO c=6 -#: messages.c:140 -msgid "Auto" -msgstr "" - -# MSG_PRESS c=20 r=2 -#: ultralcd.cpp:2607 -msgid "and press the knob" -msgstr "i nacisnij pokretlo" - -# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 -#: ultralcd.cpp:3504 -msgid "Are left and right Z~carriages all up?" -msgstr "Obydwa konce osi sa na szczycie?" - -# MSG_AUTO_DEPLETE c=17 r=1 -#: messages.c:108 -msgid "SpoolJoin" -msgstr "" - -# MSG_AUTO_HOME -#: messages.c:11 -msgid "Auto home" -msgstr "Auto zerowanie" - -# MSG_AUTOLOAD_FILAMENT c=18 -#: ultralcd.cpp:6993 -msgid "AutoLoad filament" -msgstr "Autoladowanie fil." - -# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 -#: ultralcd.cpp:4441 -msgid "Autoloading filament available only when filament sensor is turned on..." -msgstr "Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." - -# MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ultralcd.cpp:2802 -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:8371 -msgid "Axis length" -msgstr "Dlugosc osi" - -# MSG_SELFTEST_AXIS -#: ultralcd.cpp:8373 -msgid "Axis" -msgstr "Os" - -# MSG_SELFTEST_BEDHEATER -#: ultralcd.cpp:8315 -msgid "Bed / Heater" -msgstr "Stol / Grzanie" - -# MSG_BED_DONE -#: messages.c:15 -msgid "Bed done" -msgstr "Stol OK" - -# MSG_BED_HEATING -#: messages.c:16 -msgid "Bed Heating" -msgstr "Grzanie stolu.." - -# MSG_BED_CORRECTION_MENU -#: ultralcd.cpp:5889 -msgid "Bed level correct" -msgstr "Korekta stolu" - -# MSG_BELTTEST c=17 -#: ultralcd.cpp:5869 -msgid "Belt test " -msgstr "Test paskow" - -# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 -#: messages.c:17 -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_BRIGHT c=6 -#: messages.c:138 -msgid "Bright" -msgstr "Jasny" - -# MSG_BRIGHTNESS c=18 -#: messages.c:134 -msgid "Brightness" -msgstr "Jasnosc" - -# MSG_BED -#: messages.c:14 -msgid "Bed" -msgstr "Stol" - -# MSG_MENU_BELT_STATUS c=18 -#: ultralcd.cpp:2009 -msgid "Belt status" -msgstr "Stan paskow" - -# MSG_RECOVER_PRINT c=20 r=2 -#: messages.c:67 -msgid "Blackout occurred. Recover print?" -msgstr "Wykryto zanik napiecia. Kontynowac?" - -# -#: ultralcd.cpp:8706 -msgid "Calibrating home" -msgstr "Zerowanie osi" - -# MSG_CALIBRATE_BED -#: ultralcd.cpp:5878 -msgid "Calibrate XYZ" -msgstr "Kalibracja XYZ" - -# MSG_HOMEYZ -#: messages.c:44 -msgid "Calibrate Z" -msgstr "Kalibruj Z" - -# MSG_CALIBRATE_PINDA c=17 r=1 -#: ultralcd.cpp:4633 -msgid "Calibrate" -msgstr "Kalibruj" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ultralcd.cpp:3467 -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." - -# MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: messages.c:19 -msgid "Calibrating Z" -msgstr "Kalibruje Z" - -# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ultralcd.cpp:3467 -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:865 -msgid "Calibration done" -msgstr "Kalibracja OK" - -# MSG_MENU_CALIBRATION -#: messages.c:57 -msgid "Calibration" -msgstr "Kalibracja" - -# -#: ultralcd.cpp:4811 -msgid "Cancel" -msgstr "Anuluj" - -# MSG_SD_REMOVED -#: ultralcd.cpp:9142 -msgid "Card removed" -msgstr "Karta wyjeta" - -# MSG_NOT_COLOR -#: ultralcd.cpp:2707 -msgid "Color not correct" -msgstr "Kolor zanieczysz." - -# MSG_COOLDOWN -#: messages.c:22 -msgid "Cooldown" -msgstr "Chlodzenie" - -# -#: ultralcd.cpp:4566 -msgid "Copy selected language?" -msgstr "Skopiowac wybrany jezyk?" - -# MSG_CRASHDETECT_ON -#: messages.c:24 -msgid "Crash det." -msgstr "Wykr.zderzen" - -# -#: ultralcd.cpp:4946 -msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." -msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." - -# MSG_CRASH_DETECTED c=20 r=1 -#: messages.c:23 -msgid "Crash detected." -msgstr "Zderzenie wykryte" - -# -#: Marlin_main.cpp:605 -msgid "Crash detected. Resume print?" -msgstr "Wykryto zderzenie. Wznowic druk?" - -# -#: ultralcd.cpp:1785 -msgid "Crash" -msgstr "Zderzenie" - -# MSG_CURRENT c=19 r=1 -#: ultralcd.cpp:6033 -msgid "Current" -msgstr "Aktualne" - -# MSG_DATE c=17 r=1 -#: ultralcd.cpp:2164 -msgid "Date:" -msgstr "Data:" - -# MSG_DISABLE_STEPPERS -#: ultralcd.cpp:5769 -msgid "Disable steppers" -msgstr "Wylacz silniki" - -# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: messages.c:13 -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 "Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." - -# MSG_FS_CONTINUE c=5 -#: messages.c:132 -msgid "Cont." -msgstr "Kont." - -# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ultralcd.cpp:5121 -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=13 -#: ultralcd.cpp:5190 -msgid "E-correct:" -msgstr "Korekcja-E:" - -# MSG_EJECT_FILAMENT c=17 r=1 -#: messages.c:49 -msgid "Eject filament" -msgstr "Wysun filament" - -# MSG_EJECTING_FILAMENT c=20 r=1 -#: mmu.cpp:1416 -msgid "Ejecting filament" -msgstr "Wysuwanie filamentu" - -# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ultralcd.cpp:8339 -msgid "Endstop not hit" -msgstr "Krancowka nie aktyw." - -# MSG_SELFTEST_ENDSTOP -#: ultralcd.cpp:8333 -msgid "Endstop" -msgstr "Krancowka" - -# MSG_SELFTEST_ENDSTOPS -#: ultralcd.cpp:8321 -msgid "Endstops" -msgstr "Krancowki" - -# MSG_STACK_ERROR c=20 r=4 -#: ultralcd.cpp:7030 -msgid "Error - static memory has been overwritten" -msgstr "Blad - pamiec statyczna zostala nadpisana" - -# MSG_CUT_FILAMENT c=16 -#: messages.c:50 -msgid "Cut filament" -msgstr "Ciecie filamentu" - -# MSG_CUTTER c=9 -#: messages.c:109 -msgid "Cutter" -msgstr "Nozyk" - -# c=18 -#: mmu.cpp:1388 -msgid "Cutting filament" -msgstr "Obcinanie fil." - -# MSG_FSENS_NOT_RESPONDING c=20 r=4 -#: ultralcd.cpp:4454 -msgid "ERROR: Filament sensor is not responding, please check connection." -msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." - -# MSG_DIM c=6 -#: messages.c:139 -msgid "Dim" -msgstr "Sciemn" - -# MSG_ERROR -#: messages.c:25 -msgid "ERROR:" -msgstr "BLAD:" - -# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 -#: ultralcd.cpp:8713 -msgid "Extruder fan:" -msgstr "WentHotend:" - -# MSG_INFO_EXTRUDER c=18 -#: ultralcd.cpp:2201 -msgid "Extruder info" -msgstr "Ekstruder - info" - -# MSG_MOVE_E -#: messages.c:26 -msgid "Extruder" -msgstr "Ekstruder" - -# -#: ultralcd.cpp:7017 -msgid "Fail stats MMU" -msgstr "Bledy MMU" - -# MSG_FSENSOR_AUTOLOAD c=13 -#: messages.c:40 -msgid "F. autoload" -msgstr "Autolad. fil." - -# -#: ultralcd.cpp:7014 -msgid "Fail stats" -msgstr "Statystyki bledow" - -# MSG_FAN_SPEED c=14 -#: messages.c:28 -msgid "Fan speed" -msgstr "Predkosc went." - -# MSG_SELFTEST_FAN c=20 -#: messages.c:74 -msgid "Fan test" -msgstr "Test wentylatora" - -# MSG_FANS_CHECK -#: ultralcd.cpp:5777 -msgid "Fans check" -msgstr "Sprawd.went." - -# MSG_FSENSOR -#: messages.c:41 -msgid "Fil. sensor" -msgstr "Czuj. filam." - -# c=14 -#: ultralcd.cpp:1784 -msgid "Filam. runouts" -msgstr "Konc.filamentu" - -# MSG_FILAMENT_CLEAN c=20 r=2 -#: messages.c:29 -msgid "Filament extruding & with correct color?" -msgstr "Filament wychodzi z dyszy,kolor jest ok?" - -# MSG_NOT_LOADED c=19 -#: ultralcd.cpp:2703 -msgid "Filament not loaded" -msgstr "Fil. nie zaladowany" - -# MSG_FILAMENT_SENSOR c=20 -#: messages.c:80 -msgid "Filament sensor" -msgstr "Czujnik filamentu" - -# MSG_FILAMENT_USED c=19 -#: ultralcd.cpp:2867 -msgid "Filament used" -msgstr "Uzyty filament" - -# MSG_PRINT_TIME c=19 r=1 -#: ultralcd.cpp:2868 -msgid "Print time" -msgstr "Czas druku" - -# MSG_FS_ACTION c=10 -#: messages.c:131 -msgid "FS Action" -msgstr "Akcja FS" - -# MSG_FILE_INCOMPLETE c=20 r=3 -#: ultralcd.cpp:8841 -msgid "File incomplete. Continue anyway?" -msgstr "Plik niekompletny. Kontynowac?" - -# MSG_FINISHING_MOVEMENTS c=20 -#: messages.c:37 -msgid "Finishing movements" -msgstr "Konczenie druku" - -# MSG_V2_CALIBRATION c=18 -#: messages.c:103 -msgid "First layer cal." -msgstr "Kal. 1. warstwy" - -# MSG_WIZARD_SELFTEST c=20 r=8 -#: ultralcd.cpp:5042 -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:727 -msgid "Fix the issue and then press button on MMU unit." -msgstr "Rozwiaz problem i wcisnij przycisk na MMU." - -# MSG_FLOW -#: ultralcd.cpp:7157 -msgid "Flow" -msgstr "Przeplyw" - -# MSG_PRUSA3D_FORUM -#: ultralcd.cpp:2157 -msgid "forum.prusa3d.com" -msgstr "" - -# MSG_SELFTEST_COOLING_FAN c=20 -#: messages.c:71 -msgid "Front print fan?" -msgstr "Przedni went. druku?" - -# MSG_BED_CORRECTION_FRONT c=14 r=1 -#: ultralcd.cpp:3264 -msgid "Front side[um]" -msgstr "Przod [um]" - -# MSG_SELFTEST_FANS -#: ultralcd.cpp:8379 -msgid "Front/left fans" -msgstr "Przedni/lewy wentylator" - -# MSG_SELFTEST_HEATERTHERMISTOR -#: ultralcd.cpp:8309 -msgid "Heater/Thermistor" -msgstr "Grzalka/Termistor" - -# MSG_BED_HEATING_SAFETY_DISABLED -#: Marlin_main.cpp:9453 -msgid "Heating disabled by safety timer." -msgstr "Grzanie wylaczone przez wyl. czasowy" - -# MSG_HEATING_COMPLETE c=20 -#: messages.c:43 -msgid "Heating done." -msgstr "Grzanie zakonczone" - -# MSG_HEATING -#: messages.c:42 -msgid "Heating" -msgstr "Grzanie..." - -# MSG_WIZARD_WELCOME c=20 r=7 -#: ultralcd.cpp:5021 -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:2158 -msgid "howto.prusa3d.com" -msgstr "" - -# MSG_FILAMENTCHANGE -#: messages.c:34 -msgid "Change filament" -msgstr "Wymiana filamentu" - -# MSG_CHANGE_SUCCESS -#: ultralcd.cpp:2618 -msgid "Change success!" -msgstr "Wymiana ok!" - -# MSG_CORRECTLY c=20 -#: ultralcd.cpp:2695 -msgid "Changed correctly?" -msgstr "Wymiana ok?" - -# MSG_SELFTEST_CHECK_BED c=20 -#: messages.c:77 -msgid "Checking bed " -msgstr "Kontrola stolu" - -# MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ultralcd.cpp:8695 -msgid "Checking endstops" -msgstr "Kontrola krancowek" - -# MSG_SELFTEST_CHECK_HOTEND c=20 -#: ultralcd.cpp:8701 -msgid "Checking hotend " -msgstr "Kontrola hotendu" - -# MSG_SELFTEST_CHECK_FSENSOR c=20 -#: messages.c:78 -msgid "Checking sensors " -msgstr "Kontrola czujnikow" - -# MSG_SELFTEST_CHECK_X c=20 -#: ultralcd.cpp:7514 -msgid "Checking X axis " -msgstr "Kontrola osi X" - -# MSG_SELFTEST_CHECK_Y c=20 -#: ultralcd.cpp:7523 -msgid "Checking Y axis " -msgstr "Kontrola osi Y" - -# MSG_SELFTEST_CHECK_Z c=20 -#: ultralcd.cpp:8698 -msgid "Checking Z axis " -msgstr "Kontrola osi Z" - -# MSG_CHOOSE_EXTRUDER c=20 r=1 -#: messages.c:45 -msgid "Choose extruder:" -msgstr "Wybierz ekstruder:" - -# MSG_CHOOSE_FILAMENT c=20 r=1 -#: messages.c:46 -msgid "Choose filament:" -msgstr "Wybierz filament:" - -# MSG_FILAMENT c=17 r=1 -#: messages.c:27 -msgid "Filament" -msgstr "" - -# MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ultralcd.cpp:5051 -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:5059 -msgid "I will run z calibration now." -msgstr "Przeprowadze kalibracje Z." - -# MSG_WATCH -#: messages.c:97 -msgid "Info screen" -msgstr "Ekran informacyjny" - -# MSG_INSERT_FILAMENT c=20 -#: ultralcd.cpp:2603 -msgid "Insert filament" -msgstr "Wprowadz filament" - -# MSG_WIZARD_FILAMENT_LOADED c=20 r=2 -#: ultralcd.cpp:4831 -msgid "Is filament loaded?" -msgstr "Filament jest zaladowany?" - -# MSG_STEEL_SHEET_CHECK c=20 r=2 -#: messages.c:90 -msgid "Is steel sheet on heatbed?" -msgstr "Czy plyta stal. jest na podgrzew. stole?" - -# -#: ultralcd.cpp:1727 -msgid "Last print failures" -msgstr "Ostatnie bledy druku" - -# -#: ultralcd.cpp:5129 -msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." -msgstr "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." - -# -#: ultralcd.cpp:1704 -msgid "Last print" -msgstr "Ost. wydruk" - -# MSG_SELFTEST_EXTRUDER_FAN c=20 -#: messages.c:72 -msgid "Left hotend fan?" -msgstr "Lewy went hotendu?" - -# -#: ultralcd.cpp:2991 -msgid "Left" -msgstr "Lewa" - -# MSG_BED_CORRECTION_LEFT c=14 r=1 -#: ultralcd.cpp:3262 -msgid "Left side [um]" -msgstr "Lewo [um]" - -# -#: ultralcd.cpp:5792 -msgid "Lin. correction" -msgstr "Korekcja liniowa" - -# MSG_BABYSTEP_Z -#: messages.c:12 -msgid "Live adjust Z" -msgstr "Ustaw. Live Z" - -# c=20 r=6 -#: ultralcd.cpp:7559 -msgid "Insert the filament (do not load it) into the extruder and then press the knob." -msgstr "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." - -# MSG_LOAD_FILAMENT c=17 -#: messages.c:47 -msgid "Load filament" -msgstr "Ladowanie fil." - -# MSG_LOADING_COLOR -#: ultralcd.cpp:2643 -msgid "Loading color" -msgstr "Czyszcz. koloru" - -# MSG_LOADING_FILAMENT c=20 -#: messages.c:48 -msgid "Loading filament" -msgstr "Laduje filament" - -# MSG_LOOSE_PULLEY c=20 r=1 -#: ultralcd.cpp:8363 -msgid "Loose pulley" -msgstr "Luzne kolo pasowe" - -# -#: ultralcd.cpp:6976 -msgid "Load to nozzle" -msgstr "Zaladuj do dyszy" - -# MSG_M117_V2_CALIBRATION c=25 -#: messages.c:51 -msgid "M117 First layer cal." -msgstr "M117 Kal. 1. warstwy" - -# MSG_MAIN -#: messages.c:52 -msgid "Main" -msgstr "Menu glowne" - -# MSG_BL_HIGH c=12 -#: messages.c:135 -msgid "Level Bright" -msgstr "Poziom jasn." - -# MSG_BL_LOW c=12 -#: messages.c:136 -msgid "Level Dimmed" -msgstr "Poziom ciem." - -# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 -#: messages.c:55 -msgid "Measuring reference height of calibration point" -msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" - -# MSG_MESH_BED_LEVELING -#: ultralcd.cpp:5884 -msgid "Mesh Bed Leveling" -msgstr "Poziomowanie stolu wg siatki" - -# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 -#: mmu.cpp:765 -msgid "MMU OK. Resuming position..." -msgstr "MMU OK. Wznawianie pozycji." - -# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 -#: mmu.cpp:758 -msgid "MMU OK. Resuming temperature..." -msgstr "MMU OK. Wznawiam nagrzewanie..." - -# -#: ultralcd.cpp:3032 -msgid "Measured skew" -msgstr "Zmierzony skos" - -# -#: ultralcd.cpp:1728 -msgid "MMU fails" -msgstr "Bledy MMU" - -# -#: mmu.cpp:1588 -msgid "MMU load failed " -msgstr "Blad ladowania MMU" - -# -#: ultralcd.cpp:1729 -msgid "MMU load fails" -msgstr "Bledy ladow. MMU" - -# MSG_MMU_OK_RESUMING c=20 r=4 -#: mmu.cpp:776 -msgid "MMU OK. Resuming..." -msgstr "MMU OK. Wznawianie..." - -# MSG_MODE -#: messages.c:84 -msgid "Mode" -msgstr "Tryb" - -# c=20 r=3 -#: Marlin_main.cpp:884 -msgid "MK3 firmware detected on MK3S printer" -msgstr "Wykryto firmware MK3 w drukarce MK3S" - -# MSG_NORMAL -#: messages.c:88 -msgid "Normal" -msgstr "Normalni" - -# MSG_SILENT -#: messages.c:87 -msgid "Silent" -msgstr "Cichy" - -# -#: mmu.cpp:722 -msgid "MMU needs user attention." -msgstr "MMU wymaga uwagi uzytkownika." - -# -#: ultralcd.cpp:1755 -msgid "MMU power fails" -msgstr "Zaniki zasil. MMU" - -# MSG_STEALTH -#: messages.c:89 -msgid "Stealth" -msgstr "Cichy" - -# MSG_AUTO_POWER -#: messages.c:86 -msgid "Auto power" -msgstr "Automatycz" - -# MSG_HIGH_POWER -#: messages.c:85 -msgid "High power" -msgstr "Wysoka wyd." - -# -#: ultralcd.cpp:2176 -msgid "MMU2 connected" -msgstr "MMU podlaczone" - -# MSG_SELFTEST_MOTOR -#: messages.c:79 -msgid "Motor" -msgstr "Silnik" - -# MSG_MOVE_AXIS -#: ultralcd.cpp:5767 -msgid "Move axis" -msgstr "Ruch osi" - -# MSG_MOVE_X -#: ultralcd.cpp:4357 -msgid "Move X" -msgstr "Ruch osi X" - -# MSG_MOVE_Y -#: ultralcd.cpp:4358 -msgid "Move Y" -msgstr "Ruch osi Y" - -# MSG_MOVE_Z -#: ultralcd.cpp:4359 -msgid "Move Z" -msgstr "Ruch osi Z" - -# MSG_NO_MOVE -#: Marlin_main.cpp:5555 -msgid "No move." -msgstr "Brak ruchu." - -# MSG_NO_CARD -#: ultralcd.cpp:6943 -msgid "No SD card" -msgstr "Brak karty SD" - -# MSG_NA -#: messages.c:107 -msgid "N/A" -msgstr "N/D" - -# MSG_NO -#: messages.c:58 -msgid "No" -msgstr "Nie" - -# MSG_SELFTEST_NOTCONNECTED -#: ultralcd.cpp:8311 -msgid "Not connected" -msgstr "Nie podlaczono " - -# -#: util.cpp:293 -msgid "New firmware version available:" -msgstr "Dostepna nowa wersja firmware:" - -# MSG_SELFTEST_FAN_NO c=19 -#: messages.c:75 -msgid "Not spinning" -msgstr "Nie kreci sie" - -# MSG_WIZARD_V2_CAL c=20 r=8 -#: ultralcd.cpp:4942 -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:5067 -msgid "Now I will preheat nozzle for PLA." -msgstr "Nagrzewam dysze dla PLA." - -# MSG_NOZZLE -#: messages.c:59 -msgid "Nozzle" -msgstr "Dysza" - -# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 -#: Marlin_main.cpp:1533 -msgid "Old settings found. Default PID, Esteps etc. will be set." -msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." - -# -#: ultralcd.cpp:5058 -msgid "Now remove the test print from steel sheet." -msgstr "Teraz zdejmij wydruk testowy ze stolu." - -# -#: ultralcd.cpp:1654 -msgid "Nozzle FAN" -msgstr "WentHotend" - -# MSG_PAUSE_PRINT -#: ultralcd.cpp:6907 -msgid "Pause print" -msgstr "Wstrzymanie wydruku" - -# MSG_PID_RUNNING c=20 r=1 -#: ultralcd.cpp:1539 -msgid "PID cal. " -msgstr "Kalibracja PID" - -# MSG_PID_FINISHED c=20 r=1 -#: ultralcd.cpp:1545 -msgid "PID cal. finished" -msgstr "Kal. PID zakonczona" - -# MSG_PID_EXTRUDER c=17 r=1 -#: ultralcd.cpp:5890 -msgid "PID calibration" -msgstr "Kalibracja PID" - -# MSG_PINDA_PREHEAT c=20 r=1 -#: ultralcd.cpp:896 -msgid "PINDA Heating" -msgstr "Grzanie sondy PINDA" - -# MSG_PAPER c=20 r=10 -#: messages.c:60 -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:5124 -msgid "Please clean heatbed and then press the knob." -msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." - -# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: messages.c:21 -msgid "Please clean the nozzle for calibration. Click when done." -msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." - -# MSG_SELFTEST_PLEASECHECK -#: ultralcd.cpp:8303 -msgid "Please check :" -msgstr "Sprawdz :" - -# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: messages.c:98 -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_CHECK_IDLER c=20 r=4 -#: Marlin_main.cpp:3152 -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 -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 -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 -msgid "Please pull out filament immediately" -msgstr "Wyciagnij filament teraz" - -# MSG_EJECT_REMOVE c=20 r=4 -#: mmu.cpp:1422 -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 -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:4601 -msgid "Please run XYZ calibration first." -msgstr "Prosze najpierw uruchomic kalibracje XYZ" - -# MSG_UPDATE_MMU2_FW c=20 r=4 -#: mmu.cpp:1341 -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 -msgid "Please wait" -msgstr "Prosze czekac" - -# -#: ultralcd.cpp:5057 -msgid "Please remove shipping helpers first." -msgstr "Najpierw usun zabezpieczenia transportowe" - -# MSG_PREHEAT_NOZZLE c=20 -#: messages.c:63 -msgid "Preheat the nozzle!" -msgstr "Nagrzej dysze!" - -# MSG_PREHEAT -#: ultralcd.cpp:6885 -msgid "Preheat" -msgstr "Grzanie" - -# MSG_WIZARD_HEATING c=20 r=3 -#: messages.c:100 -msgid "Preheating nozzle. Please wait." -msgstr "Nagrzewanie dyszy. Prosze czekac." - -# c=14 -#: ultralcd.cpp:1959 -msgid "PINDA" -msgstr "" - -# -#: util.cpp:297 -msgid "Please upgrade." -msgstr "Prosze zaktualizowac." - -# MSG_PRESS_TO_PREHEAT c=20 r=4 -#: Marlin_main.cpp:11556 -msgid "Press knob to preheat nozzle and continue." -msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." - -# MSG_FS_PAUSE c=5 -#: fsensor.cpp:730 -msgid "Pause" -msgstr "Pauza" - -# -#: ultralcd.cpp:1783 -msgid "Power failures" -msgstr "Zaniki zasilania" - -# MSG_PRINT_ABORTED c=20 -#: messages.c:65 -msgid "Print aborted" -msgstr "Druk przerwany" - -# c=20 -#: ultralcd.cpp:2433 -msgid "Preheating to load" -msgstr "Nagrzew.do ladowania" - -# c=20 -#: ultralcd.cpp:2437 -msgid "Preheating to unload" -msgstr "Nagrzew. do rozlad." - -# MSG_SELFTEST_PRINT_FAN_SPEED c=18 -#: ultralcd.cpp:8716 -msgid "Print fan:" -msgstr "WentWydruk:" - -# MSG_CARD_MENU -#: messages.c:20 -msgid "Print from SD" -msgstr "Druk z karty SD" - -# -#: ultralcd.cpp:2280 -msgid "Press the knob" -msgstr "Wcisnij pokretlo" - -# MSG_PRINT_PAUSED c=20 r=1 -#: ultralcd.cpp:1118 -msgid "Print paused" -msgstr "Druk wstrzymany" - -# -#: mmu.cpp:726 -msgid "Press the knob to resume nozzle temperature." -msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." - -# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: messages.c:38 -msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." - -# -#: ultralcd.cpp:1655 -msgid "Print FAN" -msgstr "WentWydruk" - -# -#: ultralcd.cpp:4922 -msgid "Please insert filament into the extruder, then press the knob to load it." -msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." - -# -#: ultralcd.cpp:4917 -msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." -msgstr "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." - -# -#: ultralcd.cpp:4839 -msgid "Please load filament first." -msgstr "Najpierw zaladuj filament." - -# MSG_PRUSA3D -#: ultralcd.cpp:2156 -msgid "prusa3d.com" -msgstr "" - -# MSG_BED_CORRECTION_REAR c=14 r=1 -#: ultralcd.cpp:3265 -msgid "Rear side [um]" -msgstr "Tyl [um]" - -# c=20 r=4 -#: ultralcd.cpp:7583 -msgid "Please unload the filament first, then repeat this action." -msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." - -# c=20 r=4 -#: ultralcd.cpp:7586 -msgid "Please check the IR sensor connection, unload filament if present." -msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." - -# MSG_RECOVERING_PRINT c=20 -#: Marlin_main.cpp:10913 -msgid "Recovering print " -msgstr "Wznawianie wydruku " - -# MSG_REMOVE_OLD_FILAMENT c=20 r=5 -#: mmu.cpp:833 -msgid "Remove old filament and press the knob to start loading new filament." -msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." - -# c=20 -#: -msgid "Prusa i3 MK3S OK." -msgstr "" - -# MSG_CALIBRATE_BED_RESET -#: ultralcd.cpp:5895 -msgid "Reset XYZ calibr." -msgstr "Reset kalibr. XYZ" - -# MSG_BED_CORRECTION_RESET -#: ultralcd.cpp:3266 -msgid "Reset" -msgstr "" - -# MSG_RESUME_PRINT -#: ultralcd.cpp:6893 -msgid "Resume print" -msgstr "Wznowic wydruk" - -# MSG_RESUMING_PRINT c=20 -#: messages.c:69 -msgid "Resuming print" -msgstr "Wznawianie druku" - -# MSG_BED_CORRECTION_RIGHT c=14 r=1 -#: ultralcd.cpp:3263 -msgid "Right side[um]" -msgstr "Prawo [um]" - -# MSG_RPI_PORT -#: messages.c:123 -msgid "RPi port" -msgstr "Port RPi" - -# MSG_WIZARD_RERUN c=20 r=7 -#: ultralcd.cpp:4860 -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_SD_CARD -#: messages.c:118 -msgid "SD card" -msgstr "Karta SD" - -# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY -#: messages.c:119 -msgid "FlashAir" -msgstr "" - -# -#: ultralcd.cpp:2992 -msgid "Right" -msgstr "Prawa" - -# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 -#: messages.c:35 -msgid "Searching bed calibration point" -msgstr "Szukam punktu kalibracyjnego na stole" - -# MSG_LANGUAGE_SELECT -#: ultralcd.cpp:5807 -msgid "Select language" -msgstr "Wybor jezyka" - -# MSG_SELFTEST_OK -#: ultralcd.cpp:7858 -msgid "Self test OK" -msgstr "Selftest OK" - -# MSG_SELFTEST_START c=20 -#: ultralcd.cpp:7626 -msgid "Self test start " -msgstr "Selftest startuje" - -# MSG_SELFTEST -#: ultralcd.cpp:5871 -msgid "Selftest " -msgstr "Selftest " - -# MSG_SELFTEST_ERROR -#: ultralcd.cpp:8301 -msgid "Selftest error !" -msgstr "Blad selftest!" - -# MSG_SELFTEST_FAILED c=20 -#: messages.c:73 -msgid "Selftest failed " -msgstr "Selftest nieudany" - -# MSG_FORCE_SELFTEST c=20 r=8 -#: Marlin_main.cpp:1565 -msgid "Selftest will be run to calibrate accurate sensorless rehoming." -msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" - -# -#: ultralcd.cpp:5098 -msgid "Select nozzle preheat temperature which matches your material." -msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." - -# MSG_SET_TEMPERATURE c=19 r=1 -#: ultralcd.cpp:3284 -msgid "Set temperature:" -msgstr "Ustaw temperature:" - -# c=20 -#: -msgid "Prusa i3 MK2.5 OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK2.5S OK." -msgstr "" - -# c=20 -#: -msgid "Prusa i3 MK3 OK." -msgstr "" - -# MSG_SETTINGS -#: messages.c:82 -msgid "Settings" -msgstr "Ustawienia" - -# MSG_SHOW_END_STOPS c=18 -#: ultralcd.cpp:5892 -msgid "Show end stops" -msgstr "Pokaz krancowki" - -# -#: ultralcd.cpp:4004 -msgid "Sensor state" -msgstr "Stan czujnikow" - -# MSG_FILE_CNT c=20 r=6 -#: cardreader.cpp:736 -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 -#: messages.c:120 -msgid "Sort" -msgstr "Sortowanie" - -# MSG_NONE -#: messages.c:110 -msgid "None" -msgstr "Brak" - -# MSG_SORT_TIME -#: messages.c:121 -msgid "Time" -msgstr "Czas" - -# -#: ultralcd.cpp:3035 -msgid "Severe skew:" -msgstr "Znaczny skos:" - -# MSG_SORT_ALPHA -#: messages.c:122 -msgid "Alphabet" -msgstr "Alfab" - -# MSG_SORTING c=20 r=1 -#: cardreader.cpp:743 -msgid "Sorting files" -msgstr "Sortowanie plikow" - -# MSG_SOUND_LOUD -#: messages.c:125 -msgid "Loud" -msgstr "Glosny" - -# -#: ultralcd.cpp:3034 -msgid "Slight skew:" -msgstr "Lekki skos:" - -# MSG_SOUND -#: messages.c:124 -msgid "Sound" -msgstr "Dzwiek" - -# c=7 -#: ultralcd.cpp:1822 -msgid "Runouts" -msgstr "Konce f" - -# -#: Marlin_main.cpp:5115 -msgid "Some problem encountered, Z-leveling enforced ..." -msgstr "Wykryto problem, wymuszono poziomowanie osi Z." - -# MSG_SOUND_ONCE -#: messages.c:126 -msgid "Once" -msgstr "1-raz" - -# MSG_SPEED -#: ultralcd.cpp:7151 -msgid "Speed" -msgstr "Predkosc" - -# MSG_SELFTEST_FAN_YES c=19 -#: messages.c:76 -msgid "Spinning" -msgstr "Kreci sie" - -# MSG_TEMP_CAL_WARNING c=20 r=4 -#: Marlin_main.cpp:4614 -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:7010 -msgid "Statistics " -msgstr "Statystyki" - -# MSG_STOP_PRINT -#: messages.c:91 -msgid "Stop print" -msgstr "Przerwanie druku" - -# MSG_STOPPED -#: messages.c:92 -msgid "STOPPED. " -msgstr "ZATRZYMANO." - -# MSG_SUPPORT -#: ultralcd.cpp:7019 -msgid "Support" -msgstr "Wsparcie" - -# MSG_SELFTEST_SWAPPED -#: ultralcd.cpp:8381 -msgid "Swapped" -msgstr "Zamieniono" - -# -#: ultralcd.cpp:4810 -msgid "Select filament:" -msgstr "Wybierz filament:" - -# MSG_TEMP_CALIBRATION c=14 -#: messages.c:93 -msgid "Temp. cal." -msgstr "Kalib. temp." - -# -#: ultralcd.cpp:4951 -msgid "Select temperature which matches your material." -msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." - -# MSG_CALIBRATION_PINDA_MENU c=17 r=1 -#: ultralcd.cpp:5903 -msgid "Temp. calibration" -msgstr "Kalibracja temp." - -# MSG_TEMP_CAL_FAILED c=20 r=8 -#: ultralcd.cpp:3930 -msgid "Temperature calibration failed" -msgstr "Kalibracja temperaturowa nieudana" - -# MSG_TEMP_CALIBRATION_DONE c=20 r=12 -#: messages.c:94 -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." - -# c=20 r=3 -#: ultralcd.cpp:7590 -msgid "Sensor verified, remove the filament now." -msgstr "Czujnik sprawdzony, wyciagnij filament." - -# MSG_TEMPERATURE -#: ultralcd.cpp:5765 -msgid "Temperature" -msgstr "Temperatura" - -# MSG_MENU_TEMPERATURES c=15 r=1 -#: ultralcd.cpp:2208 -msgid "Temperatures" -msgstr "Temperatury" - -# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 -#: messages.c:39 -msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." -msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." - -# -#: ultralcd.cpp:2889 -msgid "Total filament" -msgstr "Zuzycie filamentu" - -# -#: ultralcd.cpp:2890 -msgid "Total print time" -msgstr "Laczny czas druku" - -# MSG_TUNE -#: ultralcd.cpp:6882 -msgid "Tune" -msgstr "Strojenie" - -# -#: -msgid "Unload" -msgstr "Rozladuj" - -# -#: ultralcd.cpp:1752 -msgid "Total failures" -msgstr "Suma bledow" - -# -#: ultralcd.cpp:2287 -msgid "to load filament" -msgstr "aby zaladow. fil." - -# -#: ultralcd.cpp:2291 -msgid "to unload filament" -msgstr "aby rozlad. filament" - -# MSG_UNLOAD_FILAMENT c=17 -#: messages.c:95 -msgid "Unload filament" -msgstr "Rozladowanie fil." - -# MSG_UNLOADING_FILAMENT c=20 r=1 -#: messages.c:96 -msgid "Unloading filament" -msgstr "Rozladowuje filament" - -# -#: ultralcd.cpp:1705 -msgid "Total" -msgstr "Suma" - -# MSG_USED c=19 r=1 -#: ultralcd.cpp:6032 -msgid "Used during print" -msgstr "Uzyte podczas druku" - -# MSG_MENU_VOLTAGES c=15 r=1 -#: ultralcd.cpp:2211 -msgid "Voltages" -msgstr "Napiecia" - -# -#: ultralcd.cpp:2184 -msgid "unknown" -msgstr "nieznane" - -# MSG_USERWAIT -#: Marlin_main.cpp:5525 -msgid "Wait for user..." -msgstr "Czekam na uzytkownika..." - -# MSG_WAITING_TEMP c=20 r=3 -#: ultralcd.cpp:3432 -msgid "Waiting for nozzle and bed cooling" -msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" - -# MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ultralcd.cpp:3393 -msgid "Waiting for PINDA probe cooling" -msgstr "Czekam az spadnie temp. sondy PINDA" - -# -#: -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:1525 -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:1517 -msgid "Warning: motherboard type changed." -msgstr "Ostrzezenie: plyta glowna ulegla zmianie." - -# MSG_CHANGED_PRINTER c=20 r=4 -#: Marlin_main.cpp:1521 -msgid "Warning: printer type changed." -msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" - -# MSG_UNLOAD_SUCCESSFUL c=20 r=2 -#: Marlin_main.cpp:3142 -msgid "Was filament unload successful?" -msgstr "Rozladowanie fil. ok?" - -# MSG_SELFTEST_WIRINGERROR -#: messages.c:81 -msgid "Wiring error" -msgstr "Blad polaczenia" - -# MSG_WIZARD c=17 r=1 -#: ultralcd.cpp:5862 -msgid "Wizard" -msgstr "Asystent" - -# MSG_XYZ_DETAILS c=18 -#: ultralcd.cpp:2200 -msgid "XYZ cal. details" -msgstr "Szczegoly kal. XYZ" - -# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: messages.c:18 -msgid "XYZ calibration failed. Please consult the manual." -msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." - -# MSG_YES -#: messages.c:102 -msgid "Yes" -msgstr "Tak" - -# MSG_WIZARD_QUIT c=20 r=8 -#: messages.c:101 -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:3902 -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:3899 -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_TIMEOUT c=12 -#: messages.c:137 -msgid "Timeout" -msgstr "Wyl. czas." - -# MSG_X_CORRECTION c=13 -#: ultralcd.cpp:5186 -msgid "X-correct:" -msgstr "Korekcja-X:" - -# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ultralcd.cpp:3896 -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:3880 -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:3883 -msgid "XYZ calibration compromised. Right front calibration point not reachable." -msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." - -# MSG_LOAD_ALL c=17 -#: ultralcd.cpp:6292 -msgid "Load all" -msgstr "Zalad. wszystkie" - -# -#: ultralcd.cpp:3862 -msgid "XYZ calibration failed. Bed calibration point was not found." -msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." - -# -#: ultralcd.cpp:3868 -msgid "XYZ calibration failed. Front calibration points not reachable." -msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." - -# -#: ultralcd.cpp:3871 -msgid "XYZ calibration failed. Right front calibration point not reachable." -msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." - -# -#: ultralcd.cpp:2989 -msgid "Y distance from min" -msgstr "Dystans od 0 w osi Y" - -# -#: ultralcd.cpp:4954 -msgid "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)." -msgstr "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." - -# c=20 r=5 -#: ultralcd.cpp:7594 -msgid "Verification failed, remove the filament and try again." -msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." - -# MSG_Y_CORRECTION c=13 -#: ultralcd.cpp:5187 -msgid "Y-correct:" -msgstr "Korekcja-Y:" - -# MSG_OFF -#: messages.c:105 -msgid "Off" -msgstr "Wyl" - -# MSG_ON -#: messages.c:106 -msgid "On" -msgstr "Wl" - -# -#: messages.c:53 -msgid "Back" -msgstr "Wstecz" - -# -#: ultralcd.cpp:5742 -msgid "Checks" -msgstr "Testy" - -# -#: ultralcd.cpp:8395 -msgid "False triggering" -msgstr "Falszywy alarm" - -# -#: ultralcd.cpp:4009 -msgid "FINDA:" -msgstr "" - -# MSG_FIRMWARE -#: language.h:23 -msgid "Firmware" -msgstr "" - -# MSG_STRICT -#: messages.c:112 -msgid "Strict" -msgstr "Restr." - -# MSG_WARN -#: messages.c:111 -msgid "Warn" -msgstr "Ostrzez" - -# -#: messages.c:83 -msgid "HW Setup" -msgstr "Ustawienia HW" - -# -#: ultralcd.cpp:4013 -msgid "IR:" -msgstr "" - -# MSG_MAGNETS_COMP -#: messages.c:130 -msgid "Magnets comp." -msgstr "Kor. magnesow" - -# MSG_MESH -#: messages.c:128 -msgid "Mesh" -msgstr "Siatka" - -# -#: ultralcd.cpp:5789 -msgid "Mesh bed leveling" -msgstr "Poziomowanie stolu" - -# -#: Marlin_main.cpp:877 -msgid "MK3S firmware detected on MK3 printer" -msgstr "Wykryto firmware MK3S w drukarce MK3" - -# MSG_MMU_MODE -#: messages.c:117 -msgid "MMU Mode" -msgstr "Tryb MMU" - -# -#: ultralcd.cpp:4490 -msgid "Mode change in progress ..." -msgstr "Trwa zmiana trybu..." - -# MSG_MODEL -#: messages.c:113 -msgid "Model" -msgstr "" - -# MSG_NOZZLE_DIAMETER -#: messages.c:116 -msgid "Nozzle d." -msgstr "Sr. dyszy" - -# -#: util.cpp:514 -msgid "G-code sliced for a different level. Continue?" -msgstr "G-code pociety dla innej wersji. Kontynuowac?" - -# -#: util.cpp:520 -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:431 -msgid "G-code sliced for a different printer type. Continue?" -msgstr "G-code pociety dla innej drukarki. Kontynuowac?" - -# -#: util.cpp:437 -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:481 -msgid "G-code sliced for a newer firmware. Continue?" -msgstr "G-code pociety dla nowszego firmware. Kontynuowac?" - -# -#: util.cpp:487 -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." - -# -#: ultralcd.cpp:4005 -msgid "PINDA:" -msgstr "" - -# c=20 -#: ultralcd.cpp:2443 -msgid "Preheating to cut" -msgstr "Nagrzew. obciecia" - -# c=20 -#: ultralcd.cpp:2440 -msgid "Preheating to eject" -msgstr "Nagrzew. wysuniecia" - -# -#: util.cpp:394 -msgid "Printer nozzle diameter differs from the G-code. Continue?" -msgstr "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" - -# -#: util.cpp:401 -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." - -# c=20 -#: ultralcd.cpp:8401 -msgid "%s level expected" -msgstr "Oczekiwano wersji %s" - -# -#: ultralcd.cpp:6846 -msgid "Rename" -msgstr "Zmien nazwe" - -# -#: ultralcd.cpp:6839 -msgid "Select" -msgstr "Wybierz" - -# -#: ultralcd.cpp:2202 -msgid "Sensor info" -msgstr "Info o sensorach" - -# MSG_SHEET c=10 -#: messages.c:54 -msgid "Sheet" -msgstr "Plyta" - -# MSG_SOUND_BLIND -#: messages.c:127 -msgid "Assist" -msgstr "Asyst." - -# c=18 -#: ultralcd.cpp:5740 -msgid "Steel sheets" -msgstr "Plyty stalowe" - -# MSG_Z_CORRECTION c=13 -#: ultralcd.cpp:5188 -msgid "Z-correct:" -msgstr "Korekcja-Z:" - -# MSG_Z_PROBE_NR -#: messages.c:129 -msgid "Z-probe nr." -msgstr "Ilosc Pomiarow" - +# Translation of Prusa-Firmware into Polish. +# +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pl\n" +"Project-Id-Version: Prusa-Firmware\n" +"POT-Creation-Date: Di 26. Jan 11:04:15 CET 2021\n" +"PO-Revision-Date: Di 26. Jan 11:04:15 CET 2021\n" +"Language-Team: \n" +"X-Generator: Poedit 2.0.7\n" +"X-Poedit-SourceCharset: UTF-8\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +# +#: +msgid "[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset" +msgstr "[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset" + +# MSG_IR_03_OR_OLDER c=18 +#: messages.c:164 +msgid " 0.3 or older" +msgstr " 0.3 lub starszy" + +# c=18 +#: Marlin_main.cpp:9626 +msgid "FS v0.3 or older" +msgstr "FS 0.3 lub starszy" + +# MSG_IR_04_OR_NEWER c=18 +#: messages.c:163 +msgid " 0.4 or newer" +msgstr " 0.4 lub nowszy" + +# c=18 +#: Marlin_main.cpp:9625 +msgid "FS v0.4 or newer" +msgstr "FS 0.4 lub nowszy" + +# MSG_IR_UNKNOWN c=18 +#: messages.c:165 +msgid "unknown state" +msgstr "Stan nieznany" + +# MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 +#: messages.c:43 +msgid " of 4" +msgstr " z 4" + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 +#: messages.c:66 +msgid " of 9" +msgstr " z 9" + +# MSG_MEASURED_OFFSET +#: ultralcd.cpp:2988 +msgid "[0;0] point offset" +msgstr "[0;0] przesun.punktu" + +# MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 +#: +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 +#: +msgid "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" +msgstr "UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth" + +# +#: ultralcd.cpp:2410 +msgid ">Cancel" +msgstr ">Anuluj" + +# MSG_BABYSTEPPING_Z c=15 +#: ultralcd.cpp:3108 +msgid "Adjusting Z:" +msgstr "Ustawianie Z:" + +# MSG_SELFTEST_CHECK_ALLCORRECT c=20 +#: ultralcd.cpp:8390 +msgid "All correct " +msgstr "Wszystko OK " + +# MSG_WIZARD_DONE c=20 r=8 +#: messages.c:116 +msgid "All is done. Happy printing!" +msgstr "Gotowe. Udanego drukowania!" + +# +#: ultralcd.cpp:1902 +msgid "Ambient" +msgstr "Otoczenie" + +# MSG_AUTO c=6 +#: messages.c:160 +msgid "Auto" +msgstr "" + +# MSG_PRESS c=20 r=2 +#: ultralcd.cpp:2567 +msgid "and press the knob" +msgstr "i nacisnij pokretlo" + +# MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 +#: ultralcd.cpp:3429 +msgid "Are left and right Z~carriages all up?" +msgstr "Obydwa konce osi sa na szczycie?" + +# MSG_AUTO_DEPLETE c=17 r=1 +#: messages.c:125 +msgid "SpoolJoin" +msgstr "" + +# MSG_AUTO_HOME +#: messages.c:11 +msgid "Auto home" +msgstr "Auto zerowanie" + +# MSG_AUTOLOAD_FILAMENT c=18 +#: ultralcd.cpp:6716 +msgid "AutoLoad filament" +msgstr "Autoladowanie fil." + +# MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 +#: ultralcd.cpp:4346 +msgid "Autoloading filament available only when filament sensor is turned on..." +msgstr "Autoladowanie fil. dostepne tylko gdy czujnik filamentu jest wlaczony..." + +# MSG_AUTOLOADING_ENABLED c=20 r=4 +#: ultralcd.cpp:2730 +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:8073 +msgid "Axis length" +msgstr "Dlugosc osi" + +# MSG_SELFTEST_AXIS +#: ultralcd.cpp:8074 +msgid "Axis" +msgstr "Os" + +# MSG_SELFTEST_BEDHEATER +#: ultralcd.cpp:8031 +msgid "Bed / Heater" +msgstr "Stol / Grzanie" + +# MSG_BED_DONE +#: messages.c:15 +msgid "Bed done" +msgstr "Stol OK" + +# MSG_BED_HEATING +#: messages.c:16 +msgid "Bed Heating" +msgstr "Grzanie stolu.." + +# MSG_BED_CORRECTION_MENU +#: ultralcd.cpp:5802 +msgid "Bed level correct" +msgstr "Korekta stolu" + +# MSG_BELTTEST c=17 +#: ultralcd.cpp:5782 +msgid "Belt test " +msgstr "Test paskow" + +# MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5 +#: messages.c:17 +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_BRIGHT c=6 +#: messages.c:158 +msgid "Bright" +msgstr "Jasny" + +# MSG_BRIGHTNESS c=18 +#: messages.c:154 +msgid "Brightness" +msgstr "Jasnosc" + +# MSG_BED +#: messages.c:14 +msgid "Bed" +msgstr "Stol" + +# MSG_BELT_STATUS c=18 +#: +msgid "Belt status" +msgstr "Stan paskow" + +# MSG_RECOVER_PRINT c=20 r=2 +#: messages.c:80 +msgid "Blackout occurred. Recover print?" +msgstr "Wykryto zanik napiecia. Kontynowac?" + +# +#: ultralcd.cpp:8392 +msgid "Calibrating home" +msgstr "Zerowanie osi" + +# MSG_CALIBRATE_BED +#: ultralcd.cpp:5791 +msgid "Calibrate XYZ" +msgstr "Kalibracja XYZ" + +# MSG_HOMEYZ +#: messages.c:51 +msgid "Calibrate Z" +msgstr "Kalibruj Z" + +# MSG_CALIBRATE_PINDA c=17 r=1 +#: ultralcd.cpp:4538 +msgid "Calibrate" +msgstr "Kalibruj" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 +#: ultralcd.cpp:3392 +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." + +# MSG_CALIBRATE_Z_AUTO c=20 r=2 +#: messages.c:20 +msgid "Calibrating Z" +msgstr "Kalibruje Z" + +# MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 +#: ultralcd.cpp:3392 +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:813 +msgid "Calibration done" +msgstr "Kalibracja OK" + +# MSG_MENU_CALIBRATION +#: messages.c:67 +msgid "Calibration" +msgstr "Kalibracja" + +# +#: ultralcd.cpp:4716 +msgid "Cancel" +msgstr "Anuluj" + +# MSG_SD_REMOVED +#: ultralcd.cpp:8842 +msgid "Card removed" +msgstr "Karta wyjeta" + +# MSG_NOT_COLOR +#: ultralcd.cpp:2647 +msgid "Color not correct" +msgstr "Kolor zanieczysz." + +# MSG_COOLDOWN +#: messages.c:25 +msgid "Cooldown" +msgstr "Chlodzenie" + +# +#: ultralcd.cpp:4471 +msgid "Copy selected language?" +msgstr "Skopiowac wybrany jezyk?" + +# MSG_CRASHDETECT_ON +#: messages.c:28 +msgid "Crash det." +msgstr "Wykr.zderzen" + +# +#: ultralcd.cpp:4851 +msgid "Choose a filament for the First Layer Calibration and select it in the on-screen menu." +msgstr "Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym." + +# MSG_CRASH_DETECTED c=20 r=1 +#: messages.c:27 +msgid "Crash detected." +msgstr "Zderzenie wykryte" + +# +#: Marlin_main.cpp:657 +msgid "Crash detected. Resume print?" +msgstr "Wykryto zderzenie. Wznowic druk?" + +# MSG_CRASH c=7 +#: messages.c:26 +msgid "Crash" +msgstr "Zderzen" + +# MSG_CURRENT c=19 r=1 +#: ultralcd.cpp:5933 +msgid "Current" +msgstr "Aktualne" + +# MSG_DATE c=17 r=1 +#: ultralcd.cpp:2112 +msgid "Date:" +msgstr "Data:" + +# MSG_DISABLE_STEPPERS +#: ultralcd.cpp:5683 +msgid "Disable steppers" +msgstr "Wylacz silniki" + +# MSG_BABYSTEP_Z_NOT_SET c=20 r=12 +#: messages.c:13 +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 "Odleglosc dyszy od powierzchni druku nie jest skalibrowana. Postepuj zgodnie z instrukcja: rozdzial Wprowadzenie - Kalibracja pierwszej warstwy." + +# MSG_FS_CONTINUE c=5 +#: messages.c:152 +msgid "Cont." +msgstr "Kont." + +# MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 +#: ultralcd.cpp:5026 +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=13 +#: ultralcd.cpp:5095 +msgid "E-correct:" +msgstr "Korekcja-E:" + +# MSG_EJECT_FILAMENT c=16 +#: messages.c:58 +msgid "Eject filament" +msgstr "Wysun filament" + +# MSG_EJECTING_FILAMENT c=20 r=1 +#: mmu.cpp:1414 +msgid "Ejecting filament" +msgstr "Wysuwanie filamentu" + +# MSG_SELFTEST_ENDSTOP_NOTHIT c=20 +#: ultralcd.cpp:8049 +msgid "Endstop not hit" +msgstr "Krancowka nie aktyw." + +# MSG_SELFTEST_ENDSTOP +#: ultralcd.cpp:8044 +msgid "Endstop" +msgstr "Krancowka" + +# MSG_SELFTEST_ENDSTOPS +#: ultralcd.cpp:8035 +msgid "Endstops" +msgstr "Krancowki" + +# MSG_STACK_ERROR c=20 r=4 +#: ultralcd.cpp:6753 +msgid "Error - static memory has been overwritten" +msgstr "Blad - pamiec statyczna zostala nadpisana" + +# MSG_CUT_FILAMENT c=16 +#: messages.c:59 +msgid "Cut filament" +msgstr "Ciecie filamentu" + +# MSG_CUTTER c=9 +#: messages.c:126 +msgid "Cutter" +msgstr "Nozyk" + +# c=18 +#: mmu.cpp:1386 +msgid "Cutting filament" +msgstr "Obcinanie fil." + +# MSG_FSENS_NOT_RESPONDING c=20 r=4 +#: ultralcd.cpp:4359 +msgid "ERROR: Filament sensor is not responding, please check connection." +msgstr "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." + +# MSG_DIM c=6 +#: messages.c:159 +msgid "Dim" +msgstr "Sciemn" + +# MSG_ERROR +#: messages.c:29 +msgid "ERROR:" +msgstr "BLAD:" + +# MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 +#: ultralcd.cpp:8398 +msgid "Extruder fan:" +msgstr "WentHotend:" + +# MSG_INFO_EXTRUDER c=18 +#: ultralcd.cpp:2153 +msgid "Extruder info" +msgstr "Ekstruder - info" + +# MSG_EXTRUDER c=17 +#: messages.c:30 +msgid "Extruder" +msgstr "Ekstruder" + +# +#: ultralcd.cpp:6740 +msgid "Fail stats MMU" +msgstr "Bledy MMU" + +# MSG_FSENSOR_AUTOLOAD c=13 +#: messages.c:47 +msgid "F. autoload" +msgstr "Autolad. fil." + +# +#: ultralcd.cpp:6737 +msgid "Fail stats" +msgstr "Statystyki bledow" + +# MSG_FAN_SPEED c=14 +#: messages.c:34 +msgid "Fan speed" +msgstr "Predkosc went." + +# MSG_SELFTEST_FAN c=20 +#: messages.c:89 +msgid "Fan test" +msgstr "Test wentylatora" + +# MSG_FANS_CHECK c=13 +#: messages.c:31 +msgid "Fans check" +msgstr "Sprawd.went." + +# MSG_FSENSOR +#: messages.c:48 +msgid "Fil. sensor" +msgstr "Czuj. filam." + +# MSG_FIL_RUNOUTS c=14 +#: +msgid "Fil. runouts " +msgstr "Konc.filamentu" + +# MSG_FILAMENT_CLEAN c=20 r=2 +#: messages.c:35 +msgid "Filament extruding & with correct color?" +msgstr "Filament wychodzi z dyszy,kolor jest ok?" + +# MSG_NOT_LOADED c=19 +#: ultralcd.cpp:2646 +msgid "Filament not loaded" +msgstr "Fil. nie zaladowany" + +# MSG_FILAMENT_SENSOR c=20 +#: messages.c:95 +msgid "Filament sensor" +msgstr "Czujnik filamentu" + +# MSG_FILAMENT_USED c=19 +#: ultralcd.cpp:2795 +msgid "Filament used" +msgstr "Uzyty filament" + +# MSG_PRINT_TIME c=19 r=1 +#: ultralcd.cpp:2796 +msgid "Print time" +msgstr "Czas druku" + +# MSG_FS_ACTION c=10 +#: messages.c:151 +msgid "FS Action" +msgstr "Akcja FS" + +# MSG_FILE_INCOMPLETE c=20 r=3 +#: ultralcd.cpp:8540 +msgid "File incomplete. Continue anyway?" +msgstr "Plik niekompletny. Kontynowac?" + +# MSG_FINISHING_MOVEMENTS c=20 +#: messages.c:44 +msgid "Finishing movements" +msgstr "Konczenie druku" + +# MSG_V2_CALIBRATION c=18 +#: messages.c:120 +msgid "First layer cal." +msgstr "Kal. 1. warstwy" + +# MSG_WIZARD_SELFTEST c=20 r=8 +#: ultralcd.cpp:4947 +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:726 +msgid "Fix the issue and then press button on MMU unit." +msgstr "Rozwiaz problem i wcisnij przycisk na MMU." + +# MSG_FLOW +#: ultralcd.cpp:6880 +msgid "Flow" +msgstr "Przeplyw" + +# MSG_PRUSA3D_FORUM +#: ultralcd.cpp:2105 +msgid "forum.prusa3d.com" +msgstr "" + +# MSG_SELFTEST_COOLING_FAN c=20 +#: messages.c:86 +msgid "Front print fan?" +msgstr "Przedni went. druku?" + +# MSG_BED_CORRECTION_FRONT c=14 r=1 +#: ultralcd.cpp:3190 +msgid "Front side[um]" +msgstr "Przod [um]" + +# MSG_SELFTEST_FANS +#: ultralcd.cpp:8079 +msgid "Front/left fans" +msgstr "Przedni/lewy wentylator" + +# MSG_SELFTEST_HEATERTHERMISTOR +#: ultralcd.cpp:8027 +msgid "Heater/Thermistor" +msgstr "Grzalka/Termistor" + +# MSG_BED_HEATING_SAFETY_DISABLED +#: Marlin_main.cpp:9616 +msgid "Heating disabled by safety timer." +msgstr "Grzanie wylaczone przez wyl. czasowy" + +# MSG_HEATING_COMPLETE c=20 +#: messages.c:50 +msgid "Heating done." +msgstr "Grzanie zakonczone" + +# MSG_HEATING +#: messages.c:49 +msgid "Heating" +msgstr "Grzanie..." + +# MSG_WIZARD_WELCOME c=20 r=7 +#: ultralcd.cpp:4926 +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:2106 +msgid "howto.prusa3d.com" +msgstr "" + +# MSG_FILAMENTCHANGE +#: messages.c:41 +msgid "Change filament" +msgstr "Wymiana filamentu" + +# MSG_CHANGE_SUCCESS +#: ultralcd.cpp:2576 +msgid "Change success!" +msgstr "Wymiana ok!" + +# MSG_CORRECTLY c=20 +#: ultralcd.cpp:2644 +msgid "Changed correctly?" +msgstr "Wymiana ok?" + +# MSG_SELFTEST_CHECK_BED c=20 +#: messages.c:92 +msgid "Checking bed " +msgstr "Kontrola stolu" + +# MSG_SELFTEST_CHECK_ENDSTOPS c=20 +#: ultralcd.cpp:8381 +msgid "Checking endstops" +msgstr "Kontrola krancowek" + +# MSG_SELFTEST_CHECK_HOTEND c=20 +#: ultralcd.cpp:8387 +msgid "Checking hotend " +msgstr "Kontrola hotendu" + +# MSG_SELFTEST_CHECK_FSENSOR c=20 +#: messages.c:93 +msgid "Checking sensors " +msgstr "Kontrola czujnikow" + +# MSG_CHECKING_X c=20 +#: messages.c:22 +msgid "Checking X axis" +msgstr "Kontrola osi X" + +# MSG_CHECKING_Y c=20 +#: messages.c:23 +msgid "Checking Y axis" +msgstr "Kontrola osi Y" + +# MSG_SELFTEST_CHECK_Z c=20 +#: +msgid "Checking Z axis" +msgstr "Kontrola osi Z" + +# MSG_CHOOSE_EXTRUDER c=20 r=1 +#: messages.c:52 +msgid "Choose extruder:" +msgstr "Wybierz ekstruder:" + +# MSG_CHOOSE_FILAMENT c=20 r=1 +#: messages.c:53 +msgid "Choose filament:" +msgstr "Wybierz filament:" + +# MSG_FILAMENT c=17 r=1 +#: messages.c:33 +msgid "Filament" +msgstr "" + +# MSG_WIZARD_XYZ_CAL c=20 r=8 +#: ultralcd.cpp:4956 +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:4964 +msgid "I will run z calibration now." +msgstr "Przeprowadze kalibracje Z." + +# MSG_WATCH +#: messages.c:114 +msgid "Info screen" +msgstr "Ekran informacyjny" + +# MSG_INSERT_FILAMENT c=20 +#: ultralcd.cpp:2564 +msgid "Insert filament" +msgstr "Wprowadz filament" + +# MSG_FILAMENT_LOADED c=20 r=2 +#: messages.c:36 +msgid "Is filament loaded?" +msgstr "Filament jest zaladowany?" + +# MSG_STEEL_SHEET_CHECK c=20 r=2 +#: messages.c:107 +msgid "Is steel sheet on heatbed?" +msgstr "Czy plyta stal. jest na podgrzew. stole?" + +# MSG_LAST_PRINT_FAILURES c=20 +#: messages.c:55 +msgid "Last print failures" +msgstr "Ostatnie bledy druku" + +# +#: ultralcd.cpp:5034 +msgid "If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets." +msgstr "Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe." + +# MSG_LAST_PRINT c=18 +#: messages.c:54 +msgid "Last print" +msgstr "Ost. wydruk" + +# MSG_SELFTEST_EXTRUDER_FAN c=20 +#: messages.c:87 +msgid "Left hotend fan?" +msgstr "Lewy went hotendu?" + +# +#: ultralcd.cpp:2919 +msgid "Left" +msgstr "Lewa" + +# MSG_BED_CORRECTION_LEFT c=14 r=1 +#: ultralcd.cpp:3188 +msgid "Left side [um]" +msgstr "Lewo [um]" + +# +#: ultralcd.cpp:5706 +msgid "Lin. correction" +msgstr "Korekcja liniowa" + +# MSG_BABYSTEP_Z +#: messages.c:12 +msgid "Live adjust Z" +msgstr "Ustaw. Live Z" + +# c=20 r=6 +#: ultralcd.cpp:7280 +msgid "Insert the filament (do not load it) into the extruder and then press the knob." +msgstr "Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo." + +# MSG_LOAD_FILAMENT c=17 +#: messages.c:56 +msgid "Load filament" +msgstr "Ladowanie fil." + +# MSG_LOADING_COLOR +#: ultralcd.cpp:2598 +msgid "Loading color" +msgstr "Czyszcz. koloru" + +# MSG_LOADING_FILAMENT c=20 +#: messages.c:57 +msgid "Loading filament" +msgstr "Laduje filament" + +# MSG_LOOSE_PULLEY c=20 r=1 +#: ultralcd.cpp:8067 +msgid "Loose pulley" +msgstr "Luzne kolo pasowe" + +# +#: ultralcd.cpp:6699 +msgid "Load to nozzle" +msgstr "Zaladuj do dyszy" + +# MSG_M117_V2_CALIBRATION c=25 +#: messages.c:60 +msgid "M117 First layer cal." +msgstr "M117 Kal. 1. warstwy" + +# MSG_MAIN +#: messages.c:61 +msgid "Main" +msgstr "Menu glowne" + +# MSG_BL_HIGH c=12 +#: messages.c:155 +msgid "Level Bright" +msgstr "Poziom jasn." + +# MSG_BL_LOW c=12 +#: messages.c:156 +msgid "Level Dimmed" +msgstr "Poziom ciem." + +# MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 +#: messages.c:65 +msgid "Measuring reference height of calibration point" +msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" + +# MSG_MESH_BED_LEVELING c=18 +#: messages.c:148 +msgid "Mesh Bed Leveling" +msgstr "Poziomowanie stolu" + +# MSG_MMU_OK_RESUMING_POSITION c=20 r=4 +#: mmu.cpp:764 +msgid "MMU OK. Resuming position..." +msgstr "MMU OK. Wznawianie pozycji." + +# MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4 +#: mmu.cpp:757 +msgid "MMU OK. Resuming temperature..." +msgstr "MMU OK. Wznawiam nagrzewanie..." + +# +#: ultralcd.cpp:2960 +msgid "Measured skew" +msgstr "Zmierzony skos" + +# MSG_MMU_FAILS c=14 +#: messages.c:68 +msgid "MMU fails" +msgstr "Bledy MMU" + +# +#: mmu.cpp:1586 +msgid "MMU load failed " +msgstr "Blad ladowania MMU" + +# MSG_MMU_LOAD_FAILS c=14 +#: messages.c:69 +msgid "MMU load fails" +msgstr "Bledy ladow. MMU" + +# MSG_MMU_OK_RESUMING c=20 r=4 +#: mmu.cpp:775 +msgid "MMU OK. Resuming..." +msgstr "MMU OK. Wznawianie..." + +# MSG_MODE +#: messages.c:101 +msgid "Mode" +msgstr "Tryb" + +# c=20 r=3 +#: Marlin_main.cpp:934 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Wykryto firmware MK3 w drukarce MK3S" + +# MSG_NORMAL +#: messages.c:105 +msgid "Normal" +msgstr "Normalni" + +# MSG_SILENT +#: messages.c:104 +msgid "Silent" +msgstr "Cichy" + +# +#: mmu.cpp:721 +msgid "MMU needs user attention." +msgstr "MMU wymaga uwagi uzytkownika." + +# +#: ultralcd.cpp:1701 +msgid "MMU power fails" +msgstr "Zaniki zasil. MMU" + +# MSG_STEALTH +#: messages.c:106 +msgid "Stealth" +msgstr "Cichy" + +# MSG_AUTO_POWER +#: messages.c:103 +msgid "Auto power" +msgstr "Automatycz" + +# MSG_HIGH_POWER +#: messages.c:102 +msgid "High power" +msgstr "Wysoka wyd." + +# +#: ultralcd.cpp:2124 +msgid "MMU2 connected" +msgstr "MMU podlaczone" + +# MSG_SELFTEST_MOTOR +#: messages.c:94 +msgid "Motor" +msgstr "Silnik" + +# MSG_MOVE_AXIS +#: ultralcd.cpp:5681 +msgid "Move axis" +msgstr "Ruch osi" + +# MSG_MOVE_X +#: ultralcd.cpp:4262 +msgid "Move X" +msgstr "Ruch osi X" + +# MSG_MOVE_Y +#: ultralcd.cpp:4263 +msgid "Move Y" +msgstr "Ruch osi Y" + +# MSG_MOVE_Z +#: ultralcd.cpp:4264 +msgid "Move Z" +msgstr "Ruch osi Z" + +# MSG_NO_MOVE +#: Marlin_main.cpp:5719 +msgid "No move." +msgstr "Brak ruchu." + +# MSG_NO_CARD +#: ultralcd.cpp:6673 +msgid "No SD card" +msgstr "Brak karty SD" + +# MSG_NA +#: messages.c:124 +msgid "N/A" +msgstr "N/D" + +# MSG_NO +#: messages.c:70 +msgid "No" +msgstr "Nie" + +# MSG_SELFTEST_NOTCONNECTED +#: ultralcd.cpp:8028 +msgid "Not connected" +msgstr "Nie podlaczono " + +# +#: util.cpp:293 +msgid "New firmware version available:" +msgstr "Dostepna nowa wersja firmware:" + +# MSG_SELFTEST_FAN_NO c=19 +#: messages.c:90 +msgid "Not spinning" +msgstr "Nie kreci sie" + +# MSG_WIZARD_V2_CAL c=20 r=8 +#: ultralcd.cpp:4847 +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:4972 +msgid "Now I will preheat nozzle for PLA." +msgstr "Nagrzewam dysze dla PLA." + +# MSG_NOZZLE +#: messages.c:71 +msgid "Nozzle" +msgstr "Dysza" + +# MSG_DEFAULT_SETTINGS_LOADED c=20 r=5 +#: Marlin_main.cpp:1581 +msgid "Old settings found. Default PID, Esteps etc. will be set." +msgstr "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp." + +# +#: ultralcd.cpp:4963 +msgid "Now remove the test print from steel sheet." +msgstr "Teraz zdejmij wydruk testowy ze stolu." + +# +#: ultralcd.cpp:1600 +msgid "Nozzle FAN" +msgstr "WentHotend" + +# MSG_PAUSE_PRINT +#: ultralcd.cpp:6637 +msgid "Pause print" +msgstr "Wstrzymanie wydruku" + +# MSG_PID_RUNNING c=20 r=1 +#: ultralcd.cpp:1485 +msgid "PID cal. " +msgstr "Kalibracja PID" + +# MSG_PID_FINISHED c=20 r=1 +#: ultralcd.cpp:1491 +msgid "PID cal. finished" +msgstr "Kal. PID zakonczona" + +# MSG_PID_EXTRUDER c=17 r=1 +#: ultralcd.cpp:5803 +msgid "PID calibration" +msgstr "Kalibracja PID" + +# MSG_PINDA_PREHEAT c=20 r=1 +#: ultralcd.cpp:843 +msgid "PINDA Heating" +msgstr "Grzanie sondy PINDA" + +# MSG_PAPER c=20 r=10 +#: messages.c:72 +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:5029 +msgid "Please clean heatbed and then press the knob." +msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." + +# MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 +#: messages.c:24 +msgid "Please clean the nozzle for calibration. Click when done." +msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." + +# MSG_SELFTEST_PLEASECHECK +#: ultralcd.cpp:8022 +msgid "Please check :" +msgstr "Sprawdz :" + +# MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 +#: messages.c:115 +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_CHECK_IDLER c=20 r=4 +#: Marlin_main.cpp:3317 +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:73 +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:77 +msgid "Please press the knob to unload filament" +msgstr "Nacisnij pokretlo aby rozladowac filament" + +# MSG_PULL_OUT_FILAMENT c=20 r=4 +#: messages.c:79 +msgid "Please pull out filament immediately" +msgstr "Wyciagnij filament teraz" + +# MSG_EJECT_REMOVE c=20 r=4 +#: mmu.cpp:1420 +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:82 +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:4766 +msgid "Please run XYZ calibration first." +msgstr "Prosze najpierw uruchomic kalibracje XYZ" + +# MSG_UPDATE_MMU2_FW c=20 r=4 +#: mmu.cpp:1340 +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:74 +msgid "Please wait" +msgstr "Prosze czekac" + +# +#: ultralcd.cpp:4962 +msgid "Please remove shipping helpers first." +msgstr "Najpierw usun zabezpieczenia transportowe" + +# MSG_PREHEAT_NOZZLE c=20 +#: messages.c:76 +msgid "Preheat the nozzle!" +msgstr "Nagrzej dysze!" + +# MSG_PREHEAT +#: ultralcd.cpp:6615 +msgid "Preheat" +msgstr "Grzanie" + +# MSG_WIZARD_HEATING c=20 r=3 +#: messages.c:117 +msgid "Preheating nozzle. Please wait." +msgstr "Nagrzewanie dyszy. Prosze czekac." + +# c=14 +#: ultralcd.cpp:1905 +msgid "PINDA" +msgstr "" + +# +#: util.cpp:297 +msgid "Please upgrade." +msgstr "Prosze zaktualizowac." + +# MSG_PRESS_TO_PREHEAT c=20 r=4 +#: Marlin_main.cpp:11718 +msgid "Press knob to preheat nozzle and continue." +msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." + +# MSG_FS_PAUSE c=5 +#: fsensor.cpp:728 +msgid "Pause" +msgstr "Pauza" + +# MSG_POWER_FAILURES c=14 +#: messages.c:75 +msgid "Power failures" +msgstr "Zaniki zasilania" + +# MSG_PRINT_ABORTED c=20 +#: messages.c:78 +msgid "Print aborted" +msgstr "Druk przerwany" + +# c=20 +#: ultralcd.cpp:2390 +msgid "Preheating to load" +msgstr "Nagrzew.do ladowania" + +# c=20 +#: ultralcd.cpp:2395 +msgid "Preheating to unload" +msgstr "Nagrzew. do rozlad." + +# MSG_SELFTEST_PRINT_FAN_SPEED c=18 +#: ultralcd.cpp:8401 +msgid "Print fan:" +msgstr "WentWydruk:" + +# MSG_CARD_MENU +#: messages.c:21 +msgid "Print from SD" +msgstr "Druk z karty SD" + +# +#: ultralcd.cpp:2231 +msgid "Press the knob" +msgstr "Wcisnij pokretlo" + +# MSG_PRINT_PAUSED c=20 r=1 +#: ultralcd.cpp:1065 +msgid "Print paused" +msgstr "Druk wstrzymany" + +# +#: mmu.cpp:725 +msgid "Press the knob to resume nozzle temperature." +msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy." + +# MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 +#: messages.c:45 +msgid "Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem." + +# +#: ultralcd.cpp:1601 +msgid "Print FAN" +msgstr "WentWydruk" + +# +#: ultralcd.cpp:4827 +msgid "Please insert filament into the extruder, then press the knob to load it." +msgstr "Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac." + +# +#: ultralcd.cpp:4822 +msgid "Please insert filament into the first tube of the MMU, then press the knob to load it." +msgstr "Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac." + +# +#: ultralcd.cpp:4744 +msgid "Please load filament first." +msgstr "Najpierw zaladuj filament." + +# MSG_PRUSA3D +#: ultralcd.cpp:2104 +msgid "prusa3d.com" +msgstr "" + +# MSG_BED_CORRECTION_REAR c=14 r=1 +#: ultralcd.cpp:3191 +msgid "Rear side [um]" +msgstr "Tyl [um]" + +# c=20 r=4 +#: ultralcd.cpp:7304 +msgid "Please unload the filament first, then repeat this action." +msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." + +# c=20 r=4 +#: ultralcd.cpp:7307 +msgid "Please check the IR sensor connection, unload filament if present." +msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." + +# MSG_RECOVERING_PRINT c=20 +#: Marlin_main.cpp:11076 +msgid "Recovering print " +msgstr "Wznawianie wydruku " + +# MSG_REMOVE_OLD_FILAMENT c=20 r=5 +#: mmu.cpp:832 +msgid "Remove old filament and press the knob to start loading new filament." +msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." + +# c=20 +#: +msgid "Prusa i3 MK3S OK." +msgstr "" + +# MSG_CALIBRATE_BED_RESET +#: ultralcd.cpp:5808 +msgid "Reset XYZ calibr." +msgstr "Reset kalibr. XYZ" + +# MSG_RESET c=14 +#: messages.c:83 +msgid "Reset" +msgstr "" + +# MSG_RESUME_PRINT c=18 +#: messages.c:84 +msgid "Resume print" +msgstr "Wznowic wydruk" + +# MSG_RESUMING_PRINT c=20 +#: messages.c:85 +msgid "Resuming print" +msgstr "Wznawianie druku" + +# MSG_BED_CORRECTION_RIGHT c=14 r=1 +#: ultralcd.cpp:3189 +msgid "Right side[um]" +msgstr "Prawo [um]" + +# MSG_RPI_PORT +#: messages.c:142 +msgid "RPi port" +msgstr "Port RPi" + +# MSG_WIZARD_RERUN c=20 r=7 +#: ultralcd.cpp:4765 +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_SD_CARD +#: messages.c:137 +msgid "SD card" +msgstr "Karta SD" + +# MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY +#: messages.c:138 +msgid "FlashAir" +msgstr "" + +# +#: ultralcd.cpp:2920 +msgid "Right" +msgstr "Prawa" + +# MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 +#: messages.c:42 +msgid "Searching bed calibration point" +msgstr "Szukam punktu kalibracyjnego na stole" + +# MSG_LANGUAGE_SELECT +#: ultralcd.cpp:5721 +msgid "Select language" +msgstr "Wybor jezyka" + +# MSG_SELFTEST_OK +#: ultralcd.cpp:7579 +msgid "Self test OK" +msgstr "Selftest OK" + +# MSG_SELFTEST_START c=20 +#: ultralcd.cpp:7347 +msgid "Self test start " +msgstr "Selftest startuje" + +# MSG_SELFTEST +#: ultralcd.cpp:5784 +msgid "Selftest " +msgstr "Selftest " + +# MSG_SELFTEST_ERROR +#: ultralcd.cpp:8021 +msgid "Selftest error !" +msgstr "Blad selftest!" + +# MSG_SELFTEST_FAILED c=20 +#: messages.c:88 +msgid "Selftest failed " +msgstr "Selftest nieudany" + +# MSG_FORCE_SELFTEST c=20 r=8 +#: Marlin_main.cpp:1613 +msgid "Selftest will be run to calibrate accurate sensorless rehoming." +msgstr "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek" + +# +#: ultralcd.cpp:5003 +msgid "Select nozzle preheat temperature which matches your material." +msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." + +# MSG_SET_TEMPERATURE c=19 r=1 +#: ultralcd.cpp:3209 +msgid "Set temperature:" +msgstr "Ustaw temperature:" + +# c=20 +#: +msgid "Prusa i3 MK2.5 OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK2.5S OK." +msgstr "" + +# c=20 +#: +msgid "Prusa i3 MK3 OK." +msgstr "" + +# MSG_SETTINGS +#: messages.c:97 +msgid "Settings" +msgstr "Ustawienia" + +# MSG_SHOW_END_STOPS c=18 +#: ultralcd.cpp:5805 +msgid "Show end stops" +msgstr "Pokaz krancowki" + +# +#: ultralcd.cpp:3915 +msgid "Sensor state" +msgstr "Stan czujnikow" + +# MSG_FILE_CNT c=20 r=6 +#: 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 +#: messages.c:139 +msgid "Sort" +msgstr "Sortowanie" + +# MSG_NONE +#: messages.c:127 +msgid "None" +msgstr "Brak" + +# MSG_SORT_TIME +#: messages.c:140 +msgid "Time" +msgstr "Czas" + +# +#: ultralcd.cpp:2963 +msgid "Severe skew:" +msgstr "Znaczny skos:" + +# MSG_SORT_ALPHA +#: messages.c:141 +msgid "Alphabet" +msgstr "Alfab" + +# MSG_SORTING c=20 r=1 +#: cardreader.cpp:746 +msgid "Sorting files" +msgstr "Sortowanie plikow" + +# MSG_SOUND_LOUD +#: messages.c:144 +msgid "Loud" +msgstr "Glosny" + +# +#: ultralcd.cpp:2962 +msgid "Slight skew:" +msgstr "Lekki skos:" + +# MSG_SOUND +#: messages.c:143 +msgid "Sound" +msgstr "Dzwiek" + +# c=7 +#: ultralcd.cpp:1768 +msgid "Runouts" +msgstr "Konce f" + +# +#: Marlin_main.cpp:5280 +msgid "Some problem encountered, Z-leveling enforced ..." +msgstr "Wykryto problem, wymuszono poziomowanie osi Z." + +# MSG_SOUND_ONCE +#: messages.c:145 +msgid "Once" +msgstr "1-raz" + +# MSG_SPEED +#: ultralcd.cpp:6874 +msgid "Speed" +msgstr "Predkosc" + +# MSG_SELFTEST_FAN_YES c=19 +#: messages.c:91 +msgid "Spinning" +msgstr "Kreci sie" + +# MSG_TEMP_CAL_WARNING c=20 r=4 +#: Marlin_main.cpp:4779 +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:6733 +msgid "Statistics " +msgstr "Statystyki" + +# MSG_STOP_PRINT +#: messages.c:108 +msgid "Stop print" +msgstr "Przerwanie druku" + +# MSG_STOPPED +#: messages.c:109 +msgid "STOPPED. " +msgstr "ZATRZYMANO." + +# MSG_SUPPORT +#: ultralcd.cpp:6742 +msgid "Support" +msgstr "Wsparcie" + +# MSG_SELFTEST_SWAPPED +#: ultralcd.cpp:8080 +msgid "Swapped" +msgstr "Zamieniono" + +# +#: ultralcd.cpp:4715 +msgid "Select filament:" +msgstr "Wybierz filament:" + +# MSG_TEMP_CALIBRATION c=14 +#: messages.c:110 +msgid "Temp. cal." +msgstr "Kalib. temp." + +# +#: ultralcd.cpp:4856 +msgid "Select temperature which matches your material." +msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." + +# MSG_CALIBRATION_PINDA_MENU c=17 r=1 +#: ultralcd.cpp:5816 +msgid "Temp. calibration" +msgstr "Kalibracja temp." + +# MSG_TEMP_CAL_FAILED c=20 r=8 +#: ultralcd.cpp:3845 +msgid "Temperature calibration failed" +msgstr "Kalibracja temperaturowa nieudana" + +# MSG_TEMP_CALIBRATION_DONE c=20 r=12 +#: messages.c:111 +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." + +# c=20 r=3 +#: ultralcd.cpp:7311 +msgid "Sensor verified, remove the filament now." +msgstr "Czujnik sprawdzony, wyciagnij filament." + +# MSG_TEMPERATURE +#: ultralcd.cpp:5679 +msgid "Temperature" +msgstr "Temperatura" + +# MSG_MENU_TEMPERATURES c=15 r=1 +#: ultralcd.cpp:2160 +msgid "Temperatures" +msgstr "Temperatury" + +# MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9 +#: messages.c:46 +msgid "There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow." +msgstr "Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja." + +# +#: ultralcd.cpp:2817 +msgid "Total filament" +msgstr "Zuzycie filamentu" + +# +#: ultralcd.cpp:2818 +msgid "Total print time" +msgstr "Laczny czas druku" + +# MSG_TUNE +#: ultralcd.cpp:6612 +msgid "Tune" +msgstr "Strojenie" + +# +#: +msgid "Unload" +msgstr "Rozladuj" + +# MSG_TOTAL_FAILURES c=20 +#: messages.c:99 +msgid "Total failures" +msgstr "Suma bledow" + +# +#: ultralcd.cpp:2238 +msgid "to load filament" +msgstr "aby zaladow. fil." + +# +#: ultralcd.cpp:2242 +msgid "to unload filament" +msgstr "aby rozlad. filament" + +# MSG_UNLOAD_FILAMENT c=17 +#: messages.c:112 +msgid "Unload filament" +msgstr "Rozladowanie fil." + +# MSG_UNLOADING_FILAMENT c=20 r=1 +#: messages.c:113 +msgid "Unloading filament" +msgstr "Rozladowuje filament" + +# MSG_TOTAL c=6 +#: messages.c:98 +msgid "Total" +msgstr "Suma" + +# MSG_USED c=19 r=1 +#: ultralcd.cpp:5932 +msgid "Used during print" +msgstr "Uzyte podczas druku" + +# MSG_MENU_VOLTAGES c=15 r=1 +#: ultralcd.cpp:2163 +msgid "Voltages" +msgstr "Napiecia" + +# +#: ultralcd.cpp:2132 +msgid "unknown" +msgstr "nieznane" + +# MSG_USERWAIT +#: Marlin_main.cpp:5689 +msgid "Wait for user..." +msgstr "Czekam na uzytkownika..." + +# MSG_WAITING_TEMP c=20 r=3 +#: ultralcd.cpp:3357 +msgid "Waiting for nozzle and bed cooling" +msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" + +# MSG_WAITING_TEMP_PINDA c=20 r=3 +#: ultralcd.cpp:3318 +msgid "Waiting for PINDA probe cooling" +msgstr "Czekam az spadnie temp. sondy PINDA" + +# +#: +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:1573 +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:1565 +msgid "Warning: motherboard type changed." +msgstr "Ostrzezenie: plyta glowna ulegla zmianie." + +# MSG_CHANGED_PRINTER c=20 r=4 +#: Marlin_main.cpp:1569 +msgid "Warning: printer type changed." +msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" + +# MSG_UNLOAD_SUCCESSFUL c=20 r=2 +#: Marlin_main.cpp:3308 +msgid "Was filament unload successful?" +msgstr "Rozladowanie fil. ok?" + +# MSG_SELFTEST_WIRINGERROR +#: messages.c:96 +msgid "Wiring error" +msgstr "Blad polaczenia" + +# MSG_WIZARD c=17 r=1 +#: ultralcd.cpp:5775 +msgid "Wizard" +msgstr "Asystent" + +# MSG_XYZ_DETAILS c=18 +#: ultralcd.cpp:2152 +msgid "XYZ cal. details" +msgstr "Szczegoly kal. XYZ" + +# MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 +#: messages.c:18 +msgid "XYZ calibration failed. Please consult the manual." +msgstr "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." + +# MSG_YES +#: messages.c:119 +msgid "Yes" +msgstr "Tak" + +# MSG_WIZARD_QUIT c=20 r=8 +#: messages.c:118 +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:3817 +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:3814 +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_TIMEOUT c=12 +#: messages.c:157 +msgid "Timeout" +msgstr "Wyl. czas." + +# MSG_X_CORRECTION c=13 +#: ultralcd.cpp:5091 +msgid "X-correct:" +msgstr "Korekcja-X:" + +# MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 +#: ultralcd.cpp:3811 +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:3795 +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:3798 +msgid "XYZ calibration compromised. Right front calibration point not reachable." +msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." + +# MSG_LOAD_ALL c=17 +#: ultralcd.cpp:6171 +msgid "Load all" +msgstr "Zalad. wszystkie" + +# +#: ultralcd.cpp:3777 +msgid "XYZ calibration failed. Bed calibration point was not found." +msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." + +# +#: ultralcd.cpp:3783 +msgid "XYZ calibration failed. Front calibration points not reachable." +msgstr "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." + +# +#: ultralcd.cpp:3786 +msgid "XYZ calibration failed. Right front calibration point not reachable." +msgstr "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." + +# +#: ultralcd.cpp:2917 +msgid "Y distance from min" +msgstr "Dystans od 0 w osi Y" + +# +#: ultralcd.cpp:4859 +msgid "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)." +msgstr "Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)." + +# c=20 r=5 +#: ultralcd.cpp:7315 +msgid "Verification failed, remove the filament and try again." +msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." + +# MSG_Y_CORRECTION c=13 +#: ultralcd.cpp:5092 +msgid "Y-correct:" +msgstr "Korekcja-Y:" + +# MSG_OFF +#: messages.c:122 +msgid "Off" +msgstr "Wyl" + +# MSG_ON +#: messages.c:123 +msgid "On" +msgstr "Wl" + +# +#: messages.c:62 +msgid "Back" +msgstr "Wstecz" + +# +#: ultralcd.cpp:5647 +msgid "Checks" +msgstr "Testy" + +# +#: ultralcd.cpp:8090 +msgid "False triggering" +msgstr "Falszywy alarm" + +# +#: ultralcd.cpp:3920 +msgid "FINDA:" +msgstr "" + +# MSG_FIRMWARE +#: language.h:24 +msgid "Firmware" +msgstr "" + +# MSG_STRICT +#: messages.c:129 +msgid "Strict" +msgstr "Restr." + +# MSG_WARN +#: messages.c:128 +msgid "Warn" +msgstr "Ostrzez" + +# MSG_HW_SETUP c=18 +#: messages.c:100 +msgid "HW Setup" +msgstr "Ustawienia HW" + +# +#: ultralcd.cpp:3924 +msgid "IR:" +msgstr "" + +# MSG_MAGNETS_COMP +#: messages.c:150 +msgid "Magnets comp." +msgstr "Kor. magnesow" + +# MSG_MESH +#: messages.c:147 +msgid "Mesh" +msgstr "Siatka" + +# +#: Marlin_main.cpp:927 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Wykryto firmware MK3S w drukarce MK3" + +# MSG_MMU_MODE +#: messages.c:136 +msgid "MMU Mode" +msgstr "Tryb MMU" + +# +#: ultralcd.cpp:4395 +msgid "Mode change in progress ..." +msgstr "Trwa zmiana trybu..." + +# MSG_MODEL +#: messages.c:130 +msgid "Model" +msgstr "" + +# MSG_NOZZLE_DIAMETER +#: messages.c:135 +msgid "Nozzle d." +msgstr "Sr. dyszy" + +# +#: util.cpp:514 +msgid "G-code sliced for a different level. Continue?" +msgstr "G-code pociety dla innej wersji. Kontynuowac?" + +# +#: util.cpp:520 +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." + +# MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 +#: messages.c:133 +msgid "G-code sliced for a different printer type. Continue?" +msgstr "G-code pociety dla innej drukarki. Kontynuowac?" + +# MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 +#: messages.c:134 +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:481 +msgid "G-code sliced for a newer firmware. Continue?" +msgstr "G-code pociety dla nowszego firmware. Kontynuowac?" + +# +#: util.cpp:487 +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." + +# +#: ultralcd.cpp:3916 +msgid "PINDA:" +msgstr "" + +# c=20 +#: ultralcd.cpp:2402 +msgid "Preheating to cut" +msgstr "Nagrzew. obciecia" + +# c=20 +#: ultralcd.cpp:2399 +msgid "Preheating to eject" +msgstr "Nagrzew. wysuniecia" + +# +#: util.cpp:394 +msgid "Printer nozzle diameter differs from the G-code. Continue?" +msgstr "Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?" + +# +#: util.cpp:401 +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." + +# c=20 +#: ultralcd.cpp:8095 +msgid "%s level expected" +msgstr "Oczekiwano wersji %s" + +# +#: ultralcd.cpp:6574 +msgid "Rename" +msgstr "Zmien nazwe" + +# +#: ultralcd.cpp:6567 +msgid "Select" +msgstr "Wybierz" + +# +#: ultralcd.cpp:2154 +msgid "Sensor info" +msgstr "Info o sensorach" + +# MSG_SHEET c=10 +#: messages.c:63 +msgid "Sheet" +msgstr "Plyta" + +# MSG_SOUND_BLIND +#: messages.c:146 +msgid "Assist" +msgstr "Asyst." + +# MSG_STEEL_SHEET c=18 +#: messages.c:64 +msgid "Steel sheets" +msgstr "Plyty stalowe" + +# MSG_Z_CORRECTION c=13 +#: ultralcd.cpp:5093 +msgid "Z-correct:" +msgstr "Korekcja-Z:" + +# MSG_Z_PROBE_NR +#: messages.c:149 +msgid "Z-probe nr." +msgstr "Ilosc Pomiarow" + From c28e5a9dbc482d077fdc60ada75456b58230d434 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Tue, 26 Jan 2021 09:08:03 +0100 Subject: [PATCH 199/218] Farmer's request 2 Farmers request having the Change filament menu item always visible in the main menu and located after the Live Adjust Z (which disappears after the first few printed layers). --- Firmware/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d175ad2b5..d7976d277 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6610,11 +6610,11 @@ static void lcd_main_menu() if ( ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU) && !homing_flag && !mesh_bed_leveling_flag) { - if (farm_mode) - MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 } + if (farm_mode) + MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8 if ( moves_planned() || IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal)) { From 4fed728e083306aa4cddc950a9a1624bf7c61faf Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 26 Jan 2021 15:59:21 +0100 Subject: [PATCH 200/218] Elide delayMicroseconds for TMC2130 in non-DEDGE mode Introduce new macros TMC2130_MINIMUM_DELAY/STEPPER_MINIMUM_DELAY for blocking pauses. If MINIMUM_PULSE has defined to be zero, avoid the delay call entirely. --- Firmware/stepper.cpp | 8 +++++--- Firmware/tmc2130.cpp | 8 ++++---- Firmware/tmc2130.h | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index b3cc5a577..e06e0602f 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -75,9 +75,11 @@ uint16_t SP_min = 0x21FF; #ifdef TMC2130 #define STEPPER_MINIMUM_PULSE TMC2130_MINIMUM_PULSE #define STEPPER_SET_DIR_DELAY TMC2130_SET_DIR_DELAY +#define STEPPER_MINIMUM_DELAY TMC2130_MINIMUM_DELAY #else #define STEPPER_MINIMUM_PULSE 2 #define STEPPER_SET_DIR_DELAY 100 +#define STEPPER_MINIMUM_DELAY delayMicroseconds(STEPPER_MINIMUM_PULSE) #endif #ifdef TMC2130_DEDGE_STEPPING @@ -1448,7 +1450,7 @@ void babystep(const uint8_t axis,const bool direction) STEP_NC_HI(X_DUP_AXIS); #endif #ifndef TMC2130_DEDGE_STEPPING - delayMicroseconds(STEPPER_MINIMUM_PULSE); + STEPPER_MINIMUM_DELAY; STEP_NC_LO(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN STEP_NC_LO(X_DUP_AXIS); @@ -1478,7 +1480,7 @@ void babystep(const uint8_t axis,const bool direction) STEP_NC_HI(Y_DUP_AXIS); #endif #ifndef TMC2130_DEDGE_STEPPING - delayMicroseconds(STEPPER_MINIMUM_PULSE); + STEPPER_MINIMUM_DELAY; STEP_NC_LO(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN STEP_NC_LO(Y_DUP_AXIS); @@ -1511,7 +1513,7 @@ void babystep(const uint8_t axis,const bool direction) STEP_NC_HI(Z2_AXIS); #endif #ifndef TMC2130_DEDGE_STEPPING - delayMicroseconds(STEPPER_MINIMUM_PULSE); + STEPPER_MINIMUM_DELAY; STEP_NC_LO(Z_AXIS); #ifdef Z_DUAL_STEPPER_DRIVERS STEP_NC_LO(Z2_AXIS); diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 15646b925..41f7b7c12 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -717,10 +717,10 @@ static uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval) #define _DO_STEP_Z TOGGLE(Z_STEP_PIN) #define _DO_STEP_E TOGGLE(E0_STEP_PIN) #else -#define _DO_STEP_X { WRITE(X_STEP_PIN, !INVERT_X_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(X_STEP_PIN, INVERT_X_STEP_PIN); } -#define _DO_STEP_Y { WRITE(Y_STEP_PIN, !INVERT_Y_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(Y_STEP_PIN, INVERT_Y_STEP_PIN); } -#define _DO_STEP_Z { WRITE(Z_STEP_PIN, !INVERT_Z_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN); } -#define _DO_STEP_E { WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); delayMicroseconds(TMC2130_MINIMUM_PULSE); WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); } +#define _DO_STEP_X { WRITE(X_STEP_PIN, !INVERT_X_STEP_PIN); TMC2130_MINIMUM_DELAY; WRITE(X_STEP_PIN, INVERT_X_STEP_PIN); } +#define _DO_STEP_Y { WRITE(Y_STEP_PIN, !INVERT_Y_STEP_PIN); TMC2130_MINIMUM_DELAY; WRITE(Y_STEP_PIN, INVERT_Y_STEP_PIN); } +#define _DO_STEP_Z { WRITE(Z_STEP_PIN, !INVERT_Z_STEP_PIN); TMC2130_MINIMUM_DELAY; WRITE(Z_STEP_PIN, INVERT_Z_STEP_PIN); } +#define _DO_STEP_E { WRITE(E0_STEP_PIN, !INVERT_E_STEP_PIN); TMC2130_MINIMUM_DELAY; WRITE(E0_STEP_PIN, INVERT_E_STEP_PIN); } #endif diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index 4b5b764ce..36ba55522 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -33,6 +33,12 @@ extern uint8_t tmc2130_sg_homing_axes_mask; #define TMC2130_SET_DIR_DELAY 20 // minimum delay after setting direction in uS #define TMC2130_SET_PWR_DELAY 0 // minimum delay after changing pwr mode in uS +#if TMC2130_MINIMUM_PULSE == 0 +#define TMC2130_MINIMUM_DELAY //NOP +#else +#define TMC2130_MINIMUM_DELAY delayMicroseconds(TMC2130_MINIMUM_PULSE) +#endif + extern uint8_t tmc2130_home_enabled; extern uint8_t tmc2130_home_origin[2]; extern uint8_t tmc2130_home_bsteps[2]; From 2a6989ecd559f70ceb08aa471e0399c52747ddc8 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 26 Jan 2021 16:09:23 +0100 Subject: [PATCH 201/218] Remove TMC2130 special-cases With the new STEPPER_MINIMUM_DELAY being automatically removed for TMC2130 we no longer need to add specialized #ifdefs for DEDGE in babystep. --- Firmware/stepper.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index e06e0602f..e74d7154e 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1449,12 +1449,10 @@ void babystep(const uint8_t axis,const bool direction) #ifdef DEBUG_XSTEP_DUP_PIN STEP_NC_HI(X_DUP_AXIS); #endif -#ifndef TMC2130_DEDGE_STEPPING STEPPER_MINIMUM_DELAY; STEP_NC_LO(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN STEP_NC_LO(X_DUP_AXIS); -#endif #endif //get old pin state back. @@ -1479,12 +1477,10 @@ void babystep(const uint8_t axis,const bool direction) #ifdef DEBUG_YSTEP_DUP_PIN STEP_NC_HI(Y_DUP_AXIS); #endif -#ifndef TMC2130_DEDGE_STEPPING STEPPER_MINIMUM_DELAY; STEP_NC_LO(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN STEP_NC_LO(Y_DUP_AXIS); -#endif #endif //get old pin state back. @@ -1512,12 +1508,10 @@ void babystep(const uint8_t axis,const bool direction) #ifdef Z_DUAL_STEPPER_DRIVERS STEP_NC_HI(Z2_AXIS); #endif -#ifndef TMC2130_DEDGE_STEPPING STEPPER_MINIMUM_DELAY; STEP_NC_LO(Z_AXIS); #ifdef Z_DUAL_STEPPER_DRIVERS STEP_NC_LO(Z2_AXIS); -#endif #endif //get old pin state back. From b17cdcd4d7ebd9e53a4180cf9e6768845d1b1eef Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 26 Jan 2021 16:12:59 +0100 Subject: [PATCH 202/218] Ensure MINIMUM_PULSE is always 0 in DEDGE mode This ensures delays are always properly elided without having to check for DEDGE all over the place. --- Firmware/stepper.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index e74d7154e..8684713b4 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -83,6 +83,7 @@ uint16_t SP_min = 0x21FF; #endif #ifdef TMC2130_DEDGE_STEPPING +static_assert(TMC2130_MINIMUM_PULSE == 0, "DEDGE requires/implies TMC2130_MINIMUM_PULSE == 0"); #define STEP_NC_HI(axis) TOGGLE(_STEP_PIN_##axis) #define STEP_NC_LO(axis) //NOP #else From d3734b02cc1fbb8ba9a446d9ac5ef83b91756178 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 26 Jan 2021 16:18:23 +0100 Subject: [PATCH 203/218] Also fix delay instances inside unused BACKLASH_[XY] --- Firmware/stepper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 8684713b4..d47dd2dc0 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -352,13 +352,13 @@ FORCE_INLINE void stepper_next_block() WRITE_NC(X_DIR_PIN, INVERT_X_DIR); else WRITE_NC(X_DIR_PIN, !INVERT_X_DIR); - _delay_us(100); + delayMicroseconds(STEPPER_SET_DIR_DELAY); for (uint8_t i = 0; i < st_backlash_x; i++) { STEP_NC_HI(X_AXIS); - _delay_us(100); + STEPPER_MINIMUM_DELAY; STEP_NC_LO(X_AXIS); - _delay_us(900); + _delay_us(900); // hard-coded jerk! *bad* } } last_dir_bits &= ~1; @@ -375,13 +375,13 @@ FORCE_INLINE void stepper_next_block() WRITE_NC(Y_DIR_PIN, INVERT_Y_DIR); else WRITE_NC(Y_DIR_PIN, !INVERT_Y_DIR); - _delay_us(100); + delayMicroseconds(STEPPER_SET_DIR_DELAY); for (uint8_t i = 0; i < st_backlash_y; i++) { STEP_NC_HI(Y_AXIS); - _delay_us(100); + STEPPER_MINIMUM_DELAY; STEP_NC_LO(Y_AXIS); - _delay_us(900); + _delay_us(900); // hard-coded jerk! *bad* } } last_dir_bits &= ~2; From a9625747db85f22cb583d4fdc4c4f0dc2706e687 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 26 Jan 2021 19:37:14 +0100 Subject: [PATCH 204/218] Reinstate the nop instruction as delay in non-DEDGE When TMC2130_MINIMUM_PULSE is 0 a minimum delay is implied. In this case, use a single "nop" instruction. --- Firmware/stepper.cpp | 3 ++- Firmware/tmc2130.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index d47dd2dc0..fc8d9f44d 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -83,7 +83,8 @@ uint16_t SP_min = 0x21FF; #endif #ifdef TMC2130_DEDGE_STEPPING -static_assert(TMC2130_MINIMUM_PULSE == 0, "DEDGE requires/implies TMC2130_MINIMUM_PULSE == 0"); +static_assert(TMC2130_MINIMUM_DELAY 1, // this will fail to compile when non-empty + "DEDGE implies/requires an empty TMC2130_MINIMUM_DELAY"); #define STEP_NC_HI(axis) TOGGLE(_STEP_PIN_##axis) #define STEP_NC_LO(axis) //NOP #else diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index 36ba55522..485bf41cc 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -33,8 +33,10 @@ extern uint8_t tmc2130_sg_homing_axes_mask; #define TMC2130_SET_DIR_DELAY 20 // minimum delay after setting direction in uS #define TMC2130_SET_PWR_DELAY 0 // minimum delay after changing pwr mode in uS -#if TMC2130_MINIMUM_PULSE == 0 +#ifdef TMC2130_DEDGE_STEPPING #define TMC2130_MINIMUM_DELAY //NOP +#elif TMC2130_MINIMUM_PULSE == 0 +#define TMC2130_MINIMUM_DELAY asm("nop") #else #define TMC2130_MINIMUM_DELAY delayMicroseconds(TMC2130_MINIMUM_PULSE) #endif From fba83bd3091414bda8d0e1b220ab4f229610e436 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 27 Jan 2021 12:43:41 +0100 Subject: [PATCH 205/218] Add new flags -c -p -n --- PF-build.sh | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index b75395782..5b0979e2a 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_33 +# Version: 1.0.6-Build_36 # 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 @@ -135,6 +135,7 @@ # Update exit numbers 1-13 for prepare build env 21-29 for prepare compiling 30-36 compiling # 08 Jan 2021, 3d-gussner, Comment out 'sudo' auto installation # Add '-?' '-h' help option +# 27 Jan 2021, 3d-gussner, Add `-c`, `-p` and `-n` options #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -451,7 +452,7 @@ if type git > /dev/null; then git_available="1" fi -while getopts v:l:d:b:o:?h flag +while getopts v:l:d:b:o:c:p:n:?h flag do case "${flag}" in v) variant_flag=${OPTARG};; @@ -459,6 +460,9 @@ while getopts v:l:d:b:o:?h flag d) devel_flag=${OPTARG};; b) build_flag=${OPTARG};; o) output_flag=${OPTARG};; + c) clean_flag=${OPTARG};; + p) prusa_flag=${OPTARG};; + n) new_build_flag=${OPTARG};; ?) help_flag=1;; h) help_flag=1;; esac @@ -469,6 +473,9 @@ while getopts v:l:d:b:o:?h flag #echo "build_flag: $build_flag"; #echo "output_flag: $output_flag"; #echo "help_flag: $help_flag" +#echo "clean_flag: $clean_flag" +#echo "prusa_flag: $prusa_flag" +#echo "new_build_flag: $new_build_flag" # # '?' 'h' argument usage and help @@ -482,19 +489,23 @@ echo "$(tput setaf 2)-l$(tput sgr0) Languages '$(tput setaf 2)ALL$(tput sgr0)' f echo "$(tput setaf 2)-d$(tput sgr0) Devel build '$(tput setaf 2)GOLD$(tput sgr0)', '$(tput setaf 2)RC$(tput sgr0)', '$(tput setaf 2)BETA$(tput sgr0)', '$(tput setaf 2)ALPHA$(tput sgr0)', '$(tput setaf 2)DEBUG$(tput sgr0)', '$(tput setaf 2)DEVEL$(tput sgr0)' and '$(tput setaf 2)UNKNOWN$(tput sgr0)'" echo "$(tput setaf 2)-b$(tput sgr0) Build/commit number '$(tput setaf 2)Auto$(tput sgr0)' needs git or a number" echo "$(tput setaf 2)-o$(tput sgr0) Output '$(tput setaf 2)1$(tput sgr0)' force or '$(tput setaf 2)0$(tput sgr0)' block output and delays" +echo "$(tput setaf 2)-c$(tput sgr0) Do not clean up lang build'$(tput setaf 2)0$(tput sgr0)' no '$(tput setaf 2)1$(tput sgr0)' yes" +echo "$(tput setaf 2)-p$(tput sgr0) Keep Configuration_prusa.h '$(tput setaf 2)0$(tput sgr0)' no '$(tput setaf 2)1$(tput sgr0)' yes" +echo "$(tput setaf 2)-n$(tput sgr0) New fresh build '$(tput setaf 2)0$(tput sgr0)' no '$(tput setaf 2)1$(tput sgr0)' yes" echo "$(tput setaf 2)-?$(tput sgr0) Help" echo "$(tput setaf 2)-h$(tput sgr0) Help" echo echo "Brief USAGE:" -echo " $(tput setaf 2)./PF-build.sh$(tput sgr0) [-v] [-l] [-d] [-b] [-o]" +echo " $(tput setaf 2)./PF-build.sh$(tput sgr0) [-v] [-l] [-d] [-b] [-o] [-c] [-p] [-n]" echo echo "Example:" echo " $(tput setaf 2)./PF-build.sh -v All -l ALL -d GOLD$(tput sgr0)" echo " Will build all variants as multi language and final GOLD version" echo -echo " $(tput setaf 2) ./PF-build.sh -v 1_75mm_MK3S-EINSy10a-E3Dv6full.h -b Auto -l ALL -d GOLD -o 1$(tput sgr0)" +echo " $(tput setaf 2) ./PF-build.sh -v 1_75mm_MK3S-EINSy10a-E3Dv6full.h -b Auto -l ALL -d GOLD -o 1 -c 1 -p 1 -n 1$(tput sgr0)" echo " Will build MK3S multi language final GOLD firmware " -echo " with current commit count number and output extra information" +echo " with current commit count number and output extra information," +echo " not delete lang build temporary files, keep Configuration_prusa.h and build with new fresh build folder." echo exit @@ -807,6 +818,12 @@ do if [ $OUTPUT == "1" ] ; then sleep 2 fi + + #New fresh PF-Firmware-build + if [ "$new_build_flag" == "1" ]; then + rm -r -f $BUILD_PATH/* || exit 36 + fi + #$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 30 echo "$(tput sgr 0)" @@ -874,17 +891,21 @@ do fi fi # Cleanup after build - echo "$(tput setaf 3)" - ./fw-clean.sh || exit 34 - ./lang-clean.sh || exit 35 - echo "$(tput sgr 0)" + if [[ -z "$clean_flag" || "$clean_flag" == "0" ]]; then + echo "$(tput setaf 3)" + ./fw-clean.sh || exit 34 + ./lang-clean.sh || exit 35 + echo "$(tput sgr 0)" + fi else echo "$(tput setaf 2)Copying English only firmware to PF-build-hex folder$(tput sgr 0)" cp -f $BUILD_PATH/Firmware.ino.hex $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT-EN_ONLY.hex || exit 34 fi # Cleanup Firmware - rm $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 36 + if [[ -z "$prusa_flag" || "$prusa_flag" == "0" ]]; then + rm $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 36 + fi if find $SCRIPT_PATH/lang/ -name '*RAMBo10a*.txt' -printf 1 -quit | grep -q 1 then rm $SCRIPT_PATH/lang/*RAMBo10a*.txt @@ -901,6 +922,12 @@ do then rm $SCRIPT_PATH/lang/not_used.txt fi + + #New fresh PF-Firmware-build + if [ "$new_build_flag" == "1" ]; then + rm -r -f $BUILD_PATH/* || exit 36 + fi + # Restore files to previous state sed -i -- "s/^#define FW_DEV_VERSION FW_VERSION_$DEV_STATUS/#define FW_DEV_VERSION FW_VERSION_UNKNOWN/g" $SCRIPT_PATH/Firmware/Configuration.h sed -i -- 's/^#define FW_REPOSITORY "Prusa3d"/#define FW_REPOSITORY "Unknown"/g' $SCRIPT_PATH/Firmware/Configuration.h From e9d5c447322e899b0e7cfdc71146e4911e7a0b5a Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 29 Jan 2021 00:13:49 +0100 Subject: [PATCH 206/218] Also toggle pins efficiently in sm4.c Use the same technique used in fastio to toggle pins efficiently in sm4 when DEDGE is used. --- Firmware/sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/sm4.c b/Firmware/sm4.c index b68e02762..c2f128243 100644 --- a/Firmware/sm4.c +++ b/Firmware/sm4.c @@ -130,7 +130,7 @@ void sm4_do_step(uint8_t axes_mask) { #if ((MOTHERBOARD == BOARD_RAMBO_MINI_1_0) || (MOTHERBOARD == BOARD_RAMBO_MINI_1_3) || (MOTHERBOARD == BOARD_EINSY_1_0a)) #ifdef TMC2130_DEDGE_STEPPING - PORTC ^= (axes_mask & 0x0f); //set step signals by mask + PINC = (axes_mask & 0x0f); // toggle step signals by mask #else register uint8_t portC = PORTC & 0xf0; PORTC = portC | (axes_mask & 0x0f); //set step signals by mask From 30262b0a6eeecade45186a5d708f0c94d4cff20f Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 29 Jan 2021 17:30:04 +0100 Subject: [PATCH 207/218] Remove redundant definitions of CRITICAL_SECTION_* Move CRITICAL_SECTION_START/END into fastio.h, where it's needed. --- Firmware/Marlin.h | 5 ----- Firmware/fastio.h | 7 +++++++ Firmware/tone04.c | 9 --------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 697f2f72c..f81abd8f7 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -287,11 +287,6 @@ FORCE_INLINE unsigned long millis_nc() { void setPwmFrequency(uint8_t pin, int val); #endif -#ifndef CRITICAL_SECTION_START - #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); - #define CRITICAL_SECTION_END SREG = _sreg; -#endif //CRITICAL_SECTION_START - extern bool fans_check_enabled; extern float homing_feedrate[]; extern uint8_t axis_relative_modes; diff --git a/Firmware/fastio.h b/Firmware/fastio.h index e4f25ed8b..c4fee1019 100644 --- a/Firmware/fastio.h +++ b/Firmware/fastio.h @@ -17,6 +17,13 @@ #define MASK(PIN) (1 << PIN) #endif +#ifndef CRITICAL_SECTION_START + #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); + #define CRITICAL_SECTION_END SREG = _sreg; + #include +#endif //CRITICAL_SECTION_START + + /* magic I/O routines now you can simply SET_OUTPUT(STEP); WRITE(STEP, 1); WRITE(STEP, 0); diff --git a/Firmware/tone04.c b/Firmware/tone04.c index 41f904a91..5c36a5370 100644 --- a/Firmware/tone04.c +++ b/Firmware/tone04.c @@ -7,16 +7,7 @@ #ifdef SYSTEM_TIMER_2 -#include -#include #include "pins.h" - -#ifndef CRITICAL_SECTION_START - #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); - #define CRITICAL_SECTION_END SREG = _sreg; -#endif //CRITICAL_SECTION_START - - #include "fastio.h" void timer4_init(void) From 1fa7b8cd8d0f04b0332dd242283c57caf600d103 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 29 Jan 2021 17:48:59 +0100 Subject: [PATCH 208/218] Move SDA/SCL pins into pins.h for fastio compatibility fastio relies on macros for pin definitions, so we cannot use the const declaration in Sd2PinMap or the arduino's definition. Declare SDA/SCL_PIN into pins.h based on the current MCU, which is identical in all our variants. Remove the conflicting/unused declaration in Sd2PinMap. --- Firmware/Sd2PinMap.h | 6 +----- Firmware/pins.h | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Firmware/Sd2PinMap.h b/Firmware/Sd2PinMap.h index 8a608731e..da50958f0 100644 --- a/Firmware/Sd2PinMap.h +++ b/Firmware/Sd2PinMap.h @@ -37,10 +37,6 @@ struct pin_map_t { || defined(__AVR_ATmega2560__) // Mega -// Two Wire (aka I2C) ports -uint8_t const SDA_PIN = 20; // D1 -uint8_t const SCL_PIN = 21; // D0 - #undef MOSI_PIN #undef MISO_PIN // SPI port @@ -365,4 +361,4 @@ static inline __attribute__((always_inline)) #endif // Sd2PinMap_h -#endif \ No newline at end of file +#endif diff --git a/Firmware/pins.h b/Firmware/pins.h index 5d3b4f832..1c20a001a 100644 --- a/Firmware/pins.h +++ b/Firmware/pins.h @@ -25,6 +25,11 @@ #error Unknown MOTHERBOARD value in configuration.h #endif +#if !defined(SDA_PIN) && (defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)) +#define SDA_PIN 20 +#define SCL_PIN 21 +#endif + //List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those! #define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, HEATER_0_PIN, #if EXTRUDERS > 1 From 2d71a071f0d4f63c4dbc2bfa56294c497c5988da Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 29 Jan 2021 17:51:38 +0100 Subject: [PATCH 209/218] Switch twi.c to fastio --- Firmware/twi.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Firmware/twi.c b/Firmware/twi.c index 6dd1645c0..e8c9a378e 100644 --- a/Firmware/twi.c +++ b/Firmware/twi.c @@ -19,17 +19,18 @@ Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts */ -#include -#include "Arduino.h" // for digitalWrite +#include +#include "config.h" +#include "fastio.h" #include "twi.h" void twi_init(void) { // activate internal pullups for twi. - digitalWrite(SDA, 1); - digitalWrite(SCL, 1); + WRITE(SDA_PIN, 1); + WRITE(SCL_PIN, 1); // initialize twi prescaler and bit rate TWSR &= ~(_BV(TWPS0) | _BV(TWPS1)); @@ -44,8 +45,8 @@ void twi_init(void) void twi_disable(void) { // deactivate internal pullups for twi. - digitalWrite(SDA, 0); - digitalWrite(SCL, 0); + WRITE(SDA_PIN, 0); + WRITE(SCL_PIN, 0); } From b8b75186fe96a695521402edc1dd015dfc684ffa Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 29 Jan 2021 18:30:16 +0100 Subject: [PATCH 210/218] Remove the extra copy of CRITICAL_SECTION from fastio --- Firmware/fastio.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Firmware/fastio.h b/Firmware/fastio.h index 94a029a62..855c000e2 100644 --- a/Firmware/fastio.h +++ b/Firmware/fastio.h @@ -9,12 +9,6 @@ #include #include "macros.h" -#ifndef CRITICAL_SECTION_START - #define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli(); - #define CRITICAL_SECTION_END SREG = _sreg; - #include -#endif //CRITICAL_SECTION_START - /* magic I/O routines From 6b6205d2f6a0ddf5045886ba89aa53ce55ab635f Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Sun, 31 Jan 2021 15:06:20 +0200 Subject: [PATCH 211/218] M27 refactoring and M27 L initial implementation --- Firmware/Marlin_main.cpp | 2 +- Firmware/cardreader.cpp | 55 ++++++++++++++++++++++------------------ Firmware/cardreader.h | 2 +- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4739dc4a8..a16718486 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5818,7 +5818,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) ### M27 - Get SD status M27: Report SD print status */ case 27: - card.getStatus(); + card.getStatus(code_seen('L')); break; /*! diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index e228c5236..2140a09af 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -502,31 +502,38 @@ uint32_t CardReader::getFileSize() return filesize; } -void CardReader::getStatus() +void CardReader::getStatus(bool arg_L) { - if(sdprinting) - { - if (isPrintPaused) { - SERIAL_PROTOCOLLNPGM("SD print paused"); - } - else if (saved_printing) { - SERIAL_PROTOCOLLNPGM("Print saved"); - } - else { - SERIAL_PROTOCOLLN(LONGEST_FILENAME); - SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE - SERIAL_PROTOCOL(sdpos); - SERIAL_PROTOCOL('/'); - SERIAL_PROTOCOLLN(filesize); - uint16_t time = ( _millis() - starttime ) / 60000U; - SERIAL_PROTOCOL(itostr2(time/60)); - SERIAL_PROTOCOL(':'); - SERIAL_PROTOCOLLN(itostr2(time%60)); - } - } - else { - SERIAL_PROTOCOLLNPGM("Not SD printing"); - } + if (isPrintPaused) + { + if (saved_printing && (saved_printing_type == PRINTING_TYPE_SD)) + SERIAL_PROTOCOLLNPGM("SD print paused"); + else + SERIAL_PROTOCOLLNPGM("Print saved"); + } + else if (sdprinting) + { + if (arg_L) + { + SERIAL_PROTOCOL('/'); + for (uint8_t i = 0; i < getWorkDirDepth(); i++) + printf_P(PSTR("%s/"), dir_names[i]); + puts(filename); + } + else + SERIAL_PROTOCOLLN(LONGEST_FILENAME); + + SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE + SERIAL_PROTOCOL(sdpos); + SERIAL_PROTOCOL('/'); + SERIAL_PROTOCOLLN(filesize); + uint16_t time = ( _millis() - starttime ) / 60000U; + SERIAL_PROTOCOL(itostr2(time/60)); + SERIAL_PROTOCOL(':'); + SERIAL_PROTOCOLLN(itostr2(time%60)); + } + else + SERIAL_PROTOCOLLNPGM("Not SD printing"); } void CardReader::write_command(char *buf) { diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index 25e97882e..40098d3c0 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -26,7 +26,7 @@ public: void release(); void startFileprint(); uint32_t getFileSize(); - void getStatus(); + void getStatus(bool arg_L); void printingHasFinished(); void getfilename(uint16_t nr, const char* const match=NULL); From 698499f00df6bc7797cdf8bca212661cfd79f8da Mon Sep 17 00:00:00 2001 From: Voinea Dragos Date: Sun, 31 Jan 2021 17:18:32 +0200 Subject: [PATCH 212/218] split timer0 and timer2 initialization. Move timer2 init early --- Firmware/Marlin_main.cpp | 2 ++ Firmware/temperature.cpp | 5 ++++- Firmware/timer02.c | 20 ++++++++++++-------- Firmware/timer02.h | 3 +++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d43e05e58..68ecb1c19 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1013,6 +1013,8 @@ static void w25x20cl_err_msg() // are initialized by the main() routine provided by the Arduino framework. void setup() { + timer2_init(); // enables functional millis + mmu_init(); ultralcd_init(); diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 3b38c25cc..a1281b649 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1124,7 +1124,10 @@ void tp_init() adc_init(); - timer0_init(); + timer0_init(); //enables the heatbed timer. + + // timer2 already enabled earlier in the code + // now enable the COMPB temperature interrupt OCR2B = 128; TIMSK2 |= (1< #include +#include "macros.h" void timer0_init(void) { - //save sreg - uint8_t _sreg = SREG; - //disable interrupts for sure - cli(); + CRITICAL_SECTION_START; TCNT0 = 0; // Fast PWM duty (0-255). @@ -25,7 +23,14 @@ void timer0_init(void) TCCR0A = (1 << WGM01) | (1 << WGM00) | (1 << COM0B1) | (1 << COM0B0); TCCR0B = (1 << CS01); // CLK/8 prescaling TIMSK0 |= (1 << TOIE0); // enable timer overflow interrupt - + + CRITICAL_SECTION_END; +} + +void timer2_init(void) +{ + CRITICAL_SECTION_START; + // Everything, that used to be on timer0 was moved to timer2 (delay, beeping, millis etc.) //setup timer2 TCCR2A = 0x00; //COM_A-B=00, WGM_0-1=00 @@ -36,9 +41,8 @@ void timer0_init(void) TIMSK2 &= ~(1< Date: Sun, 31 Jan 2021 16:56:58 +0200 Subject: [PATCH 213/218] Patch broken string PROGMEM transition with setTargetedHotend() error --- Firmware/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4739dc4a8..1feb69446 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10026,16 +10026,16 @@ bool setTargetedHotend(int code, uint8_t &extruder) SERIAL_ECHORPGM(_n("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER break; case 105: - SERIAL_ECHO(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER + SERIAL_ECHORPGM(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER break; case 109: - SERIAL_ECHO(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER + SERIAL_ECHORPGM(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER break; case 218: - SERIAL_ECHO(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER + SERIAL_ECHORPGM(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER break; case 221: - SERIAL_ECHO(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER + SERIAL_ECHORPGM(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER break; } SERIAL_PROTOCOLLN((int)extruder); From ec4c1be0582a3ba3a5109a3328c953d8a1847d67 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Fri, 29 Jan 2021 16:34:09 +0100 Subject: [PATCH 214/218] Silence bUpdateEEPROM unused warning in MK3 variant --- Firmware/fsensor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 7c225bf2a..4eac7bd08 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -233,6 +233,8 @@ void fsensor_init(void) bool fsensor_enable(bool bUpdateEEPROM) { #ifdef PAT9125 + (void)bUpdateEEPROM; // silence unused warning in this variant + if (mmu_enabled == false) { //filament sensor is pat9125, enable only if it is working uint8_t pat9125 = pat9125_init(); printf_P(PSTR("PAT9125_init:%hhu\n"), pat9125); From b6d56bc0f401928e80811c866ec303e198d7eb65 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 1 Feb 2021 14:54:37 +0200 Subject: [PATCH 215/218] Change M27 argument from L to P as that makes more sense (path vs LFN)) --- Firmware/Marlin_main.cpp | 2 +- Firmware/cardreader.cpp | 4 ++-- Firmware/cardreader.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a16718486..62ec6f678 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5818,7 +5818,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) ### M27 - Get SD status M27: Report SD print status */ case 27: - card.getStatus(code_seen('L')); + card.getStatus(code_seen('P')); break; /*! diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 2140a09af..a96268972 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -502,7 +502,7 @@ uint32_t CardReader::getFileSize() return filesize; } -void CardReader::getStatus(bool arg_L) +void CardReader::getStatus(bool arg_P) { if (isPrintPaused) { @@ -513,7 +513,7 @@ void CardReader::getStatus(bool arg_L) } else if (sdprinting) { - if (arg_L) + if (arg_P) { SERIAL_PROTOCOL('/'); for (uint8_t i = 0; i < getWorkDirDepth(); i++) diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index 40098d3c0..524454002 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -26,7 +26,7 @@ public: void release(); void startFileprint(); uint32_t getFileSize(); - void getStatus(bool arg_L); + void getStatus(bool arg_P); void printingHasFinished(); void getfilename(uint16_t nr, const char* const match=NULL); From 7e09df6a340972cc9738699ee2a88977d3439534 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Mon, 1 Feb 2021 14:54:44 +0200 Subject: [PATCH 216/218] Add documentation --- Firmware/Marlin_main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 62ec6f678..652466d73 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -5816,6 +5816,12 @@ if(eSoundMode!=e_SOUND_MODE_SILENT) /*! ### M27 - Get SD status M27: Report SD print status + #### Usage + + M27 [ P ] + + #### Parameters + - `P` - Show full SFN path instead of LFN only. */ case 27: card.getStatus(code_seen('P')); From 2f4119a6d723fc1e0e7b148aed73101cb89c5369 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Tue, 2 Feb 2021 13:21:16 +0200 Subject: [PATCH 217/218] M552 - Printer IP address --- Firmware/Marlin.h | 2 ++ Firmware/Marlin_main.cpp | 19 +++++++++++++++++++ Firmware/ultralcd.cpp | 31 +++++++++++++++++++------------ Firmware/util.cpp | 7 +++++++ Firmware/util.h | 3 +++ 5 files changed, 50 insertions(+), 12 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 307b8c91b..17fce2713 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -501,4 +501,6 @@ void raise_z_above(float target, bool plan=true); extern "C" void softReset(); +extern uint32_t IP_address; + #endif diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9deb51055..61e5a33ce 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -321,6 +321,8 @@ uint16_t print_time_remaining_normal = PRINT_TIME_REMAINING_INIT; //estimated re uint8_t print_percent_done_silent = PRINT_PERCENT_DONE_INIT; uint16_t print_time_remaining_silent = PRINT_TIME_REMAINING_INIT; //estimated remaining print time in minutes +uint32_t IP_address = 0; + //=========================================================================== //=============================Private Variables============================= //=========================================================================== @@ -8003,6 +8005,23 @@ Sigma_Exit: break; } #endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET + case 552: + { + if (code_seen('P')) + { + uint8_t valCnt = 0; + IP_address = 0; + do + { + *strchr_pointer = '*'; + ((uint8_t*)&IP_address)[valCnt] = code_value_short(); + valCnt++; + } while ((valCnt < 4) && code_seen('.')); + + if (valCnt != 4) + IP_address = 0; + } + } break; #ifdef FILAMENTCHANGEENABLE diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d7976d277..0f6bc1fa3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2057,8 +2057,8 @@ static void lcd_support_menu() { // 22bytes total int8_t status; // 1byte bool is_flash_air; // 1byte - uint8_t ip[4]; // 4bytes - char ip_str[3*4+3+1]; // 16bytes + uint32_t ip; // 4bytes + char ip_str[IP4_STR_SIZE]; // 16bytes } _menu_data_t; static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data"); _menu_data_t* _md = (_menu_data_t*)&(menu_data[0]); @@ -2069,17 +2069,10 @@ static void lcd_support_menu() _md->status = 1; _md->is_flash_air = card.ToshibaFlashAir_isEnabled(); if (_md->is_flash_air) { - card.ToshibaFlashAir_GetIP(_md->ip); // ip[4] filled with 0 if it failed - // Prepare IP string from ip[4] - sprintf_P(_md->ip_str, PSTR("%d.%d.%d.%d"), - _md->ip[0], _md->ip[1], - _md->ip[2], _md->ip[3]); + card.ToshibaFlashAir_GetIP((uint8_t*)(&_md->ip)); // ip == 0 if it failed } - } else if (_md->is_flash_air && - _md->ip[0] == 0 && _md->ip[1] == 0 && - _md->ip[2] == 0 && _md->ip[3] == 0 && - ++ _md->status == 16) - { + } else if (_md->is_flash_air && _md->ip == 0 && ++ _md->status == 16) + { // Waiting for the FlashAir card to get an IP address from a router. Force an update. _md->status = 0; } @@ -2143,6 +2136,20 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(PSTR(" ")); if (((menu_item - 1) == menu_line) && lcd_draw_update) { lcd_set_cursor(2, menu_row); + ip4_to_str(_md->ip_str, (uint8_t*)(&_md->ip)); + lcd_printf_P(PSTR("%s"), _md->ip_str); + } + } + + // Show the printer IP address, if it is available. + if (IP_address) { + + MENU_ITEM_BACK_P(STR_SEPARATOR); + MENU_ITEM_BACK_P(PSTR("Printer IP Addr:")); //c=18 r=1 + MENU_ITEM_BACK_P(PSTR(" ")); + if (((menu_item - 1) == menu_line) && lcd_draw_update) { + lcd_set_cursor(2, menu_row); + ip4_to_str(_md->ip_str, (uint8_t*)(&IP_address)); lcd_printf_P(PSTR("%s"), _md->ip_str); } } diff --git a/Firmware/util.cpp b/Firmware/util.cpp index e335793a0..a25efd359 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -4,6 +4,7 @@ #include "sound.h" #include "language.h" #include "util.h" +#include // Allocate the version string in the program memory. Otherwise the string lands either on the stack or in the global RAM. const char FW_VERSION_STR[] PROGMEM = FW_VERSION; @@ -604,3 +605,9 @@ else { sPrinterName=_sPrinterName; } } + + +void ip4_to_str(char* dest, uint8_t* IP) +{ + sprintf_P(dest, PSTR("%u.%u.%u.%u"), IP[0], IP[1], IP[2], IP[3]); +} diff --git a/Firmware/util.h b/Firmware/util.h index f25749de0..6d34aa081 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -110,4 +110,7 @@ void gcode_level_check(uint16_t nGcodeLevel); void fSetMmuMode(bool bMMu); +#define IP4_STR_SIZE 16 +extern void ip4_to_str(char* dest, uint8_t* IP); + #endif /* UTIL_H */ From 647cde0caeb3365e66d65cf1d558168c2ae2dc29 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Tue, 2 Feb 2021 13:38:20 +0200 Subject: [PATCH 218/218] Add documentation --- Firmware/Marlin_main.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 61e5a33ce..777a05ff4 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3734,6 +3734,7 @@ extern uint8_t st_backlash_y; //!@n M503 - print the current settings (from memory not from EEPROM) //!@n M509 - force language selection on next restart //!@n M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) +//!@n M552 - Set IP address //!@n M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] //!@n M605 - Set dual x-carriage movement mode: S [ X R ] //!@n M860 - Wait for PINDA thermistor to reach target temperature. @@ -8005,6 +8006,19 @@ Sigma_Exit: break; } #endif // CUSTOM_M_CODE_SET_Z_PROBE_OFFSET + + /*! + ### M552 - Set IP address M552: Set IP address, enable/disable network interface" + Sets the printer IP address that is shown in the support menu. Designed to be used with the help of host software. + If P is not specified nothing happens. + If the structure of the IP address is invalid, 0.0.0.0 is assumed and nothing is shown on the screen in the Support menu. + #### Usage + + M552 [ P ] + + #### Parameters + - `P` - The IP address in xxx.xxx.xxx.xxx format. Eg: P192.168.1.14 + */ case 552: { if (code_seen('P'))