From 570b360413f9e63663122f27271af3db0d0ea53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 30 Apr 2023 16:07:02 +0000 Subject: [PATCH 001/148] Fix menu_draw_P for negative values The new code did not take into account the minus sign. The template for menu_draw_P is removed since there is no benefit in uint8_t version of this function since the value is converted to two bytes anyway by lcd_printf_P. Change in memory: Flash: -92 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 34 ++++++++++++---------------------- Firmware/menu.h | 3 --- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 283df19b8..3b61379cd 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -411,36 +411,26 @@ void menu_item_gcode_P(const char* str, const char* str_gcode) menu_item++; } -const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; - const char menu_fmt_float31[] PROGMEM = "%-12.12S%+8.1f"; - const char menu_fmt_float13[] PROGMEM = "%c%-13.13S%+5.3f"; - - -template -void menu_draw_P(char chr, const char* str, T val) +/// @brief Draw the label and value for a menu edit item +/// @param chr 1 byte character +/// @param str String residing in program memory (PROGMEM) +/// @param val value to render, ranges from -999 to 9999 +static void menu_draw_P(const char chr, const char* str, const int16_t val) { - // The LCD row position is controlled externally. We may only modify the column here lcd_putc(chr); - uint8_t len = lcd_print_pad_P(str, LCD_WIDTH - 1); - lcd_set_cursor_column((LCD_WIDTH - 1) - len + 1); + lcd_puts_P(str); lcd_putc(':'); - // The value is right adjusted, set the cursor then render the value - if (val < 10) { // 1 digit - lcd_set_cursor_column(LCD_WIDTH - 1); - } else if (val < 100) { // 2 digits - lcd_set_cursor_column(LCD_WIDTH - 2); - } else { // 3 digits - lcd_set_cursor_column(LCD_WIDTH - 3); - } - lcd_print(val, DEC); -} + // Padding to compensate variable string length + const uint8_t len = strlen_P(str); + lcd_space((LCD_WIDTH - 4) - (2 + len)); -template void menu_draw_P(char chr, const char* str, int16_t val); -template void menu_draw_P(char chr, const char* str, uint8_t val); + // Right adjusted value + lcd_printf_P(PSTR("%4d"), val); +} //! @brief Draw up to 10 chars of text and a float number in format from +0.0 to +12345.0. The increased range is necessary //! for displaying large values of extruder positions, which caused text overflow in the previous implementation. diff --git a/Firmware/menu.h b/Firmware/menu.h index ba634a468..d89b11365 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -149,9 +149,6 @@ extern void menu_format_sheet_E(const Sheet &sheet_E, SheetFormatBuffer &buffer) template extern void menu_item_edit_P(const char* str, T pval, int16_t min_val, int16_t max_val); -template -extern void menu_draw_P(char chr, const char* str, T val); - extern void menu_progressbar_init(uint16_t total, const char* title); extern void menu_progressbar_update(uint16_t newVal); extern void menu_progressbar_finish(void); From 1d87789641141fd3da6874d616ce6da0073d630d Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 4 May 2023 12:15:51 +0200 Subject: [PATCH 002/148] Always allow Live Adjust Z in Settings --- Firmware/ultralcd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3ad8d192e..0f0c89f66 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4470,8 +4470,7 @@ static void lcd_settings_menu() MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); #endif //HAS_SECOND_SERIAL - if ( babystep_allowed() ) - MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); + MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); #if (LANG_MODE != 0) MENU_ITEM_SUBMENU_P(_T(MSG_SELECT_LANGUAGE), lcd_language_menu); From 462535ef7fa2611579509b46b560db31bd7f409f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 6 May 2023 12:08:06 +0000 Subject: [PATCH 003/148] Restore 3.12 live Z-adjust menu behavior Code size increases a bit but keep in mind the PR that broke the behavior "saved" 182 bytes: https://github.com/prusa3d/Prusa-Firmware/pull/4063 So I think this code size increase is OK Change in memory: Flash: +84 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 16 +++++++++++----- Firmware/Marlin_main.cpp | 10 +++++++++- Firmware/ultralcd.cpp | 11 +++++++---- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index c05a27261..1c5e55209 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -336,14 +336,20 @@ bool printer_active(); bool check_fsensor(); //! Condition where Babystepping is allowed: -//! 1) Z-axis position is less than 2.0mm (only allowed during the first couple of layers) -//! 2) Not allowed during Homing (printer busy) -//! 3) Not allowed during Mesh Bed Leveling (printer busy) +//! 1) Not allowed during Homing (printer busy) +//! 2) Not allowed during Mesh Bed Leveling (printer busy) +//! 3) Not allowed when a print job is paused //! 4) Allowed if: -//! - First Layer Calibration is running -//! - OR there are queued blocks, printJob is running and it's not paused, and Z-axis position is less than 2.0mm (only allowed during the first couple of layers) +//! - First Layer Calibration is running (the event when heaters are turned off is used to dismiss the menu) +//! - A print job is running +//! - If the printer is idle with not planned moves bool babystep_allowed(); +//! Same as babystep_allowed() but additionally adds a requirement +//! where the Z-axis position must be less than 2.0mm (only allowed +//! during the first couple of layers) +bool babystep_allowed_strict(); + extern void calculate_extruder_multipliers(); // Similar to the default Arduino delay function, diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 48acea582..dc8af8f9f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -542,10 +542,18 @@ bool check_fsensor() { bool __attribute__((noinline)) babystep_allowed() { return ( !homing_flag && !mesh_bed_leveling_flag - && ( lcd_commands_type == LcdCommands::Layer1Cal || ( blocks_queued() && !isPrintPaused && printJobOngoing() && (current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU))) + && !isPrintPaused + && ((lcd_commands_type == LcdCommands::Layer1Cal && CHECK_ALL_HEATERS) + || printJobOngoing() + || lcd_commands_type == LcdCommands::Idle + ) ); } +bool __attribute__((noinline)) babystep_allowed_strict() { + return ( babystep_allowed() && current_position[Z_AXIS] < Z_HEIGHT_HIDE_LIVE_ADJUST_MENU); +} + bool fans_check_enabled = true; #ifdef TMC2130 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0f0c89f66..daaa44b44 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4470,7 +4470,7 @@ static void lcd_settings_menu() MENU_ITEM_TOGGLE_P(_T(MSG_RPI_PORT), (selectedSerialPort == 0) ? _T(MSG_OFF) : _T(MSG_ON), lcd_second_serial_set); #endif //HAS_SECOND_SERIAL - MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); + if (!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); #if (LANG_MODE != 0) MENU_ITEM_SUBMENU_P(_T(MSG_SELECT_LANGUAGE), lcd_language_menu); @@ -5148,7 +5148,8 @@ static void lcd_main_menu() MENU_ITEM_FUNCTION_P(PSTR("power panic"), uvlo_); #endif //TMC2130_DEBUG - if ( babystep_allowed() ) + // Menu is never shown when idle + if (babystep_allowed_strict() && (printJobOngoing() || lcd_commands_type == LcdCommands::Layer1Cal)) MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);//8 if (farm_mode) @@ -7166,11 +7167,13 @@ void menu_lcd_longpress_func(void) // explicitely listed menus which are allowed to rise the move-z or live-adj-z functions // The lists are not the same for both functions, so first decide which function is to be performed - if (babystep_allowed()){ // long press as live-adj-z - if ( menu_menu == lcd_status_screen // and in listed menus... + if (blocks_queued() || printJobOngoing()){ // long press as live-adj-z + if ( babystep_allowed_strict() + && (menu_menu == lcd_status_screen // and in listed menus... || menu_menu == lcd_main_menu || menu_menu == lcd_tune_menu || menu_menu == lcd_support_menu + ) ){ lcd_clear(); menu_submenu(lcd_babystep_z); From dd9df36375b5bb3e9fb08fb33091e36fc7facba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 6 May 2023 13:19:57 +0000 Subject: [PATCH 004/148] Load to nozzle: Fix too short purge distance PFW-1506 Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3ad8d192e..85809e180 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4775,6 +4775,11 @@ static void mmu_load_filament_menu() { static inline void lcd_mmu_load_to_nozzle_wrapper(uint8_t index){ MMU2::mmu2.load_filament_to_nozzle(index); + // Extrude a little bit of filament so the user + // can see the color is correct + load_filament_final_feed(); + st_synchronize(); + // Ask user if the extruded color is correct: lcd_return_to_status(); lcd_load_filament_color_check(); From 85563361858a47d8fdb3e57ae871cf885c7b5351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 6 May 2023 14:33:57 +0000 Subject: [PATCH 005/148] Fix unload sequence for users without MMU Restores 3.12 sequence which was working well before. M600 "L" parameter now works like M702 "U" parameter. Removed a lot of the unused parameters which were copied from Marlin 2. Change in memory: Flash: +96 bytes --- Firmware/Configuration_adv.h | 57 +------------------ Firmware/Marlin_main.cpp | 20 ++----- Firmware/ultralcd.cpp | 38 ++++++------- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 1 - .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 1 - .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 1 - .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 1 - .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 - .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 - .../obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 1 - .../obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 1 - 11 files changed, 26 insertions(+), 97 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index aa663228d..df26f6c23 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -346,62 +346,9 @@ const unsigned int dropsegments=5; //everything with less than this number of st // 2nd and 3rd byte (LSB first) contains a 16bit length of a command including its preceding comments. #define CMDHDRSIZE 3 -/** - * Advanced Pause for Filament Change - * - Adds the G-code M600 Filament Change to initiate a filament change. - * - This feature is required for the default FILAMENT_RUNOUT_SCRIPT. - * - * Requirements: - * - For Filament Change parking enable and configure NOZZLE_PARK_FEATURE. - * - For user interaction enable an LCD display, HOST_PROMPT_SUPPORT, or EMERGENCY_PARSER. - * - * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park. - */ - -#define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. -#define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. - // This short retract is done immediately, before parking the nozzle. #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. -#define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. -#define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload. - // For Bowden, the full length of the tube and nozzle. - // For direct drive, the full length of the nozzle. - // Set to 0 for manual unloading. -#define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load. -#define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material. - // 0 to disable start loading and skip to fast load only -#define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast. -#define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. -#define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle. - // For Bowden, the full length of the tube and nozzle. - // For direct drive, the full length of the nozzle. -//#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted. -#define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate. -#define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading. - // Set to 0 for manual extrusion. - // Filament can be extruded repeatedly from the Filament Change menu - // until extrusion is consistent, and to purge old filament. -#define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park. -//#define ADVANCED_PAUSE_FANS_PAUSE // Turn off print-cooling fans while the machine is paused. - - // Filament Unload does a Retract, Delay, and Purge first: -#define FILAMENT_UNLOAD_PURGE_RETRACT 13 // (mm) Unload initial retract length. -#define FILAMENT_UNLOAD_PURGE_DELAY 5000 // (ms) Delay for the filament to cool after retract. -#define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged. -#define FILAMENT_UNLOAD_PURGE_FEEDRATE 25 // (mm/s) feedrate to purge before unload - -#define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety. -#define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed. -#define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change. -//#define FILAMENT_CHANGE_RESUME_ON_INSERT // Automatically continue / load filament when runout sensor is triggered again. -//#define PAUSE_REHEAT_FAST_RESUME // Reduce number of waits by not prompting again post-timeout before continuing. - -//#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change. -//#define HOME_BEFORE_FILAMENT_CHANGE // If needed, home before parking for filament change - -//#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. -//#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) - +#define FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE 86.67f // (mm/s) Unload fast retract feedrate. +#define FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE 16.67f // (mm/s) Unload slow retract feedrate. // Firmware based and LCD controlled retract // M207 and M208 can be used to define parameters for the retraction. diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 48acea582..0a3a9519b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3456,7 +3456,7 @@ static void mmu_M600_load_filament(bool automatic, float nozzle_temp) { st_synchronize(); } -static void gcode_M600(bool automatic, float x_position, float y_position, float z_shift, float e_shift, float /*e_shift_late*/) { +static void gcode_M600(bool automatic, float x_position, float y_position, float z_shift, float e_shift, float e_shift_late) { st_synchronize(); float lastpos[4]; @@ -3492,7 +3492,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float } else { // Beep, manage nozzle heater and wait for user to start unload filament M600_wait_for_user(HotendTempBckp); - unload_filament(FILAMENTCHANGE_FINALRETRACT); + unload_filament(e_shift_late); } st_synchronize(); // finish moves { @@ -7586,7 +7586,7 @@ Sigma_Exit: - `Y` - Y position, default 0 - `Z` - relative lift Z, default MIN_Z_FOR_SWAP. - `E` - initial retract, default -2 - - `L` - later retract distance for removal, default -80 + - `L` - later retract distance for removal, default 0 - `AUTO` - Automatically (only with MMU) */ case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] @@ -7612,17 +7612,7 @@ Sigma_Exit: #endif } - //currently don't work as we are using the same unload sequence as in M702, needs re-work - if (code_seen('L')) - { - e_shift_late = code_value(); - } - else - { - #ifdef FILAMENTCHANGE_FINALRETRACT - e_shift_late = FILAMENTCHANGE_FINALRETRACT; - #endif - } + if (code_seen('L')) e_shift_late = code_value(); // Z lift. For safety only allow positive values if (code_seen('Z')) z_shift = fabs(code_value()); @@ -8436,7 +8426,7 @@ Sigma_Exit: case 702: { float z_target = 0; - float unloadLength = FILAMENTCHANGE_FINALRETRACT; + float unloadLength = 0; if (code_seen('U')) unloadLength = code_value(); // For safety only allow positive values diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3ad8d192e..e2e4e0591 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3859,10 +3859,8 @@ void lcd_wizard(WizState state) setTargetHotend(PLA_PREHEAT_HOTEND_TEMP); lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); ////MSG_WIZARD_WILL_PREHEAT c=20 r=4 wait_preheat(); - //unload current filament - unload_filament(FILAMENTCHANGE_FINALRETRACT); - //load filament - lcd_wizard_load(); + unload_filament(0); // unload current filament + lcd_wizard_load(); // load filament setTargetHotend(0); //we are finished, cooldown nozzle state = S::Restore; } @@ -4856,29 +4854,32 @@ static void mmu_loading_test_menu() { /// @param unloadLength Retract distance for removal (manual reload) void unload_filament(float unloadLength) { - custom_message_type = CustomMsg::FilamentLoading; - lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT)); + custom_message_type = CustomMsg::FilamentLoading; + lcd_setstatuspgm(_T(MSG_UNLOADING_FILAMENT)); FSensorBlockRunout fsBlockRunout; - // Retract filament - current_position[E_AXIS] += -FILAMENT_UNLOAD_PURGE_RETRACT; - plan_buffer_line_curposXYZE(PAUSE_PARK_RETRACT_FEEDRATE); + current_position[E_AXIS] -= 45; + plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE); st_synchronize(); - // Wait for filament to cool - delay_keep_alive(FILAMENT_UNLOAD_PURGE_DELAY); - - // Quickly purge - current_position[E_AXIS] += (FILAMENT_UNLOAD_PURGE_RETRACT + FILAMENT_UNLOAD_PURGE_LENGTH); - plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_PURGE_FEEDRATE); + current_position[E_AXIS] -= 15; + plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE); st_synchronize(); - // Configurable length - current_position[E_AXIS] += unloadLength; - plan_buffer_line_curposXYZE(FILAMENT_CHANGE_UNLOAD_FEEDRATE); + current_position[E_AXIS] -= 20; + plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE); st_synchronize(); + // Configurable length, by default it's 0. + // only plan the move if the length is set to a non-zero value + if (unloadLength) + { + current_position[E_AXIS] += unloadLength; + plan_buffer_line_curposXYZE(FILAMENT_CHANGE_UNLOAD_FEEDRATE); + st_synchronize(); + } + lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT)); //disable extruder steppers so filament can be removed @@ -4898,7 +4899,6 @@ void unload_filament(float unloadLength) lcd_setstatuspgm(MSG_WELCOME); custom_message_type = CustomMsg::Status; - eFilamentAction = FilamentAction::None; } diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index d227f54af..5d3c63e5c 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -219,7 +219,6 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 33217ad65..31c343107 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -220,7 +220,6 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 6b0d3e8a7..6024ef5b2 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -219,7 +219,6 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 692616786..59531ff5e 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -220,7 +220,6 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index dffc509d3..151636797 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -358,7 +358,6 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 3a2a1359c..3c3634bd0 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -362,7 +362,6 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 31ded6c88..bdb1de69d 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -149,7 +149,6 @@ CHANGE FILAMENT SETTINGS #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 9a8086739..f66a56f88 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -148,7 +148,6 @@ CHANGE FILAMENT SETTINGS #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 -#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) From 71180ac28471ba7d05fcbf8be23956d05644fc08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 6 May 2023 14:53:36 +0000 Subject: [PATCH 006/148] Cleanup M600 init Instead of removing FILAMENTCHANGE_FINALRETRACT just set it to 0 No change in memory --- Firmware/Marlin_main.cpp | 79 ++++++------------- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 1 + .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 1 + .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 1 + .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 1 + .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 + .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 + .../obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 1 + .../obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 1 + 9 files changed, 33 insertions(+), 54 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0a3a9519b..d4d5a6eed 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3456,7 +3456,7 @@ static void mmu_M600_load_filament(bool automatic, float nozzle_temp) { st_synchronize(); } -static void gcode_M600(bool automatic, float x_position, float y_position, float z_shift, float e_shift, float e_shift_late) { +static void gcode_M600(const bool automatic, const float x_position, const float y_position, const float z_shift, const float e_shift, const float e_shift_late) { st_synchronize(); float lastpos[4]; @@ -7582,69 +7582,40 @@ Sigma_Exit: M600 [ X | Y | Z | E | L | AUTO ] - - `X` - X position, default 211 - - `Y` - Y position, default 0 + - `X` - X position, default FILAMENTCHANGE_XPOS + - `Y` - Y position, default FILAMENTCHANGE_YPOS - `Z` - relative lift Z, default MIN_Z_FOR_SWAP. - - `E` - initial retract, default -2 - - `L` - later retract distance for removal, default 0 + - `E` - initial retract, default FILAMENTCHANGE_FIRSTRETRACT + - `L` - later retract distance for removal, default FILAMENTCHANGE_FINALRETRACT - `AUTO` - Automatically (only with MMU) */ case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] - { - st_synchronize(); + { + st_synchronize(); - float x_position = current_position[X_AXIS]; - float y_position = current_position[Y_AXIS]; - float z_shift = MIN_Z_FOR_SWAP; - float e_shift_init = 0; - float e_shift_late = 0; - bool automatic = false; - - //Retract extruder - if(code_seen('E')) - { - e_shift_init = code_value(); - } - else - { - #ifdef FILAMENTCHANGE_FIRSTRETRACT - e_shift_init = FILAMENTCHANGE_FIRSTRETRACT ; - #endif - } + float x_position = FILAMENTCHANGE_XPOS; + float y_position = FILAMENTCHANGE_YPOS; + float z_shift = MIN_Z_FOR_SWAP; + float e_shift_init = FILAMENTCHANGE_FIRSTRETRACT; + float e_shift_late = FILAMENTCHANGE_FINALRETRACT; + bool automatic = false; - if (code_seen('L')) e_shift_late = code_value(); + //Retract extruder + if (code_seen('E')) e_shift_init = code_value(); + if (code_seen('L')) e_shift_late = code_value(); - // Z lift. For safety only allow positive values - if (code_seen('Z')) z_shift = fabs(code_value()); + // Z lift. For safety only allow positive values + if (code_seen('Z')) z_shift = fabs(code_value()); - //Move XY to side - if(code_seen('X')) - { - x_position = code_value(); - } - else - { - #ifdef FILAMENTCHANGE_XPOS - x_position = FILAMENTCHANGE_XPOS; - #endif - } - if(code_seen('Y')) - { - y_position = code_value(); - } - else - { - #ifdef FILAMENTCHANGE_YPOS - y_position = FILAMENTCHANGE_YPOS ; - #endif - } + //Move XY to side + if (code_seen('X')) x_position = code_value(); + if (code_seen('Y')) y_position = code_value(); - if (MMU2::mmu2.Enabled() && code_seen_P(PSTR("AUTO"))) - automatic = true; + if (MMU2::mmu2.Enabled() && code_seen_P(PSTR("AUTO"))) + automatic = true; - gcode_M600(automatic, x_position, y_position, z_shift, e_shift_init, e_shift_late); - - } + gcode_M600(automatic, x_position, y_position, z_shift, e_shift_init, e_shift_late); + } break; #endif //FILAMENTCHANGEENABLE diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 5d3c63e5c..a4721d978 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -219,6 +219,7 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 31c343107..470a02c06 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -220,6 +220,7 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 6024ef5b2..ae7237305 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -219,6 +219,7 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 59531ff5e..6e266cc1f 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -220,6 +220,7 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 151636797..21adab2d1 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -358,6 +358,7 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 3c3634bd0..ee7550acd 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -362,6 +362,7 @@ #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index bdb1de69d..6aace7ed1 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -149,6 +149,7 @@ CHANGE FILAMENT SETTINGS #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index f66a56f88..b69a405ee 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -148,6 +148,7 @@ CHANGE FILAMENT SETTINGS #define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) From d781dae35bc511a554014d050721f5b544677ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 6 May 2023 14:55:44 +0000 Subject: [PATCH 007/148] Combine two moves since they have the same feedrate Change in memory: Flash: -60 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e2e4e0591..2b1f7e8c2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4863,11 +4863,7 @@ void unload_filament(float unloadLength) plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE); st_synchronize(); - current_position[E_AXIS] -= 15; - plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE); - st_synchronize(); - - current_position[E_AXIS] -= 20; + current_position[E_AXIS] -= 35; plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE); st_synchronize(); From e24c2200f12e9ead1143372a8067c77ac52d45ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 8 May 2023 19:33:42 +0000 Subject: [PATCH 008/148] Set FILAMENTCHANGE_FINALRETRACT instead of hardcoded 0 --- Firmware/Marlin_main.cpp | 4 ++-- Firmware/ultralcd.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d4d5a6eed..351e2aec8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8391,13 +8391,13 @@ Sigma_Exit: M702 [ U | Z ] #### Parameters - - `U` - Retract distance for removal (manual reload). Default value is 0. + - `U` - Retract distance for removal (manual reload). Default value is FILAMENTCHANGE_FINALRETRACT. - `Z` - Move the Z axis by this distance. Default value is 0 to maintain backwards compatibility with older gcodes. */ case 702: { float z_target = 0; - float unloadLength = 0; + float unloadLength = FILAMENTCHANGE_FINALRETRACT; if (code_seen('U')) unloadLength = code_value(); // For safety only allow positive values diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2b1f7e8c2..f24338b6b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3859,7 +3859,7 @@ void lcd_wizard(WizState state) setTargetHotend(PLA_PREHEAT_HOTEND_TEMP); lcd_display_message_fullscreen_P(_i("Now I will preheat nozzle for PLA.")); ////MSG_WIZARD_WILL_PREHEAT c=20 r=4 wait_preheat(); - unload_filament(0); // unload current filament + unload_filament(FILAMENTCHANGE_FINALRETRACT); // unload current filament lcd_wizard_load(); // load filament setTargetHotend(0); //we are finished, cooldown nozzle state = S::Restore; From 3c79e77220ed6d1471ac1d06e77835b426061c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Mon, 8 May 2023 19:44:13 +0000 Subject: [PATCH 009/148] Create define for two hardcoded values --- Firmware/Configuration_adv.h | 8 +++++--- Firmware/ultralcd.cpp | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Firmware/Configuration_adv.h b/Firmware/Configuration_adv.h index df26f6c23..94b86c608 100644 --- a/Firmware/Configuration_adv.h +++ b/Firmware/Configuration_adv.h @@ -346,9 +346,11 @@ const unsigned int dropsegments=5; //everything with less than this number of st // 2nd and 3rd byte (LSB first) contains a 16bit length of a command including its preceding comments. #define CMDHDRSIZE 3 -#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. -#define FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE 86.67f // (mm/s) Unload fast retract feedrate. -#define FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE 16.67f // (mm/s) Unload slow retract feedrate. +#define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10.f // (mm/s) Unload filament feedrate. This can be pretty fast. +#define FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE 86.67f // (mm/s) Unload fast retract feedrate. +#define FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE 16.67f // (mm/s) Unload slow retract feedrate. +#define FILAMENT_UNLOAD_FAST_RETRACT_LENGTH 45.f // (mm) Unload fast retract length. +#define FILAMENT_UNLOAD_SLOW_RETRACT_LENGTH 35.f // (mm) Unload slow retract length. // Firmware based and LCD controlled retract // M207 and M208 can be used to define parameters for the retraction. diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f24338b6b..4c0edabdf 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4859,11 +4859,11 @@ void unload_filament(float unloadLength) FSensorBlockRunout fsBlockRunout; - current_position[E_AXIS] -= 45; + current_position[E_AXIS] -= FILAMENT_UNLOAD_FAST_RETRACT_LENGTH; plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_FAST_RETRACT_FEEDRATE); st_synchronize(); - current_position[E_AXIS] -= 35; + current_position[E_AXIS] -= FILAMENT_UNLOAD_SLOW_RETRACT_LENGTH; plan_buffer_line_curposXYZE(FILAMENT_UNLOAD_SLOW_RETRACT_FEEDRATE); st_synchronize(); From 0612a38885b4d73f32a3a5954dec71c4e2407acd Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sat, 13 May 2023 08:18:39 +0200 Subject: [PATCH 010/148] Fix stepper inactivity timeout --- Firmware/Marlin_main.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8816d9453..8d53c114c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9299,18 +9299,14 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s get_command(); } - if(previous_millis_cmd.expired(max_inactive_time)) - if(max_inactive_time) - kill(PSTR("Inactivity Shutdown")); - if(stepper_inactive_time) { - if(previous_millis_cmd.expired(stepper_inactive_time)) - { - if(blocks_queued() == false && ignore_stepper_queue == false) { - disable_x(); - disable_y(); - disable_z(); - disable_e0(); - } + if(max_inactive_time && previous_millis_cmd.expired(max_inactive_time)) + kill(PSTR("Inactivity Shutdown")); + if(stepper_inactive_time && previous_millis_cmd.expired(stepper_inactive_time)) { + if(blocks_queued() == false && ignore_stepper_queue == false) { + disable_x(); + disable_y(); + disable_z(); + disable_e0(); } } From 90322a718159623eee7c120c1cd6b6d483525d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 13 May 2023 18:07:13 +0000 Subject: [PATCH 011/148] optimisation: always inline ReportingRAII Tested on MK3S+ using the LCD. Change in memory: Flash: -80 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index f5082b5ef..c9152f28b 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -194,11 +194,11 @@ void MMU2::CheckFINDARunout() { struct ReportingRAII { CommandInProgress cip; - explicit inline ReportingRAII(CommandInProgress cip) + explicit inline __attribute__((always_inline)) ReportingRAII(CommandInProgress cip) : cip(cip) { BeginReport(cip, (uint16_t)ProgressCode::EngagingIdler); } - inline ~ReportingRAII() { + inline __attribute__((always_inline)) ~ReportingRAII() { EndReport(cip, (uint16_t)ProgressCode::OK); } }; From 91a23e27e1b28c50dc4ab32a3a692c62924efa7f Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 19 May 2023 13:35:28 +0200 Subject: [PATCH 012/148] Fix IRsensor with MMU saves 38bytes --- Firmware/ultralcd.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index eafcb26e7..5c2b7e2eb 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5884,9 +5884,6 @@ bool lcd_selftest() if (!MMU2::mmu2.Enabled()) { lcd_detect_IRsensor(); } - else { - fsensor.setSensorRevision(IR_sensor_analog::SensorRevision::_Old, true); - } } #endif lcd_wait_for_cool_down(); @@ -6669,6 +6666,7 @@ static bool lcd_selftest_fsensor(void) //! @retval false failed static bool selftest_irsensor() { + set_extrude_min_temp(0); class TempBackup { public: @@ -6679,13 +6677,10 @@ static bool selftest_irsensor() float m_temp; }; uint8_t progress; - { - TempBackup tempBackup; - setTargetHotend(ABS_PREHEAT_HOTEND_TEMP); - progress = lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0); - } - progress = lcd_selftest_screen(TestScreen::Fsensor, progress, 1, true, 0); - MMU2::mmu2.unload(); + progress = lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0); + MMU2::mmu2.tool_change(0); //Allow cold extrusion only loads to the gears not nozzle + MMU2::mmu2.unload(); //Unload filament + set_extrude_min_temp(EXTRUDE_MINTEMP); for(uint_least8_t i = 0; i < 200; ++i) { From 2391698419af0972d1464281ecae0f0b09519cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 20 May 2023 19:26:44 +0000 Subject: [PATCH 013/148] errorCode should reflect the state of the MMU If the protocol reports and error and give errorCode a value. When the error is resolved, errorCode is not reset to OK. If the MMU is not in an error state I would expect errorCode to reflect that. This fixes MMUCurrentErrorCode() Change in memory: Flash: +12 bytes SRAM: 0 bytes --- Firmware/mmu2_protocol_logic.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index b7203fa5d..746ef43f9 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -365,6 +365,7 @@ StepStatus ProtocolLogic::ProcessCommandQueryResponse() { // It can also be an X0 F which means MMU just successfully restarted. if (ReqMsg().code == rsp.request.code && ReqMsg().value == rsp.request.value) { progressCode = ProgressCode::OK; + errorCode = ErrorCode::OK; scopeState = ScopeState::Ready; rq = RequestMsg(RequestMsgCodes::unknown, 0); // clear the successfully finished request return Finished; From 9d5453a41e457afa3f062defce798883dab8526a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 20 May 2023 11:54:38 +0000 Subject: [PATCH 014/148] PFW-1520 Rename Load Filament menu to Preload to MMU Change in memory: Flash: +18 bytes SRAM: 0 bytes --- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index f50e03bdb..52c657386 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -52,6 +52,7 @@ const char MSG_ITERATION[] PROGMEM_I1 = ISTR("Iteration"); ////MSG_ITERATION c=1 const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_SELECT_FILAMENT c=20 const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////MSG_LAST_PRINT c=18 const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////MSG_LAST_PRINT_FAILURES c=20 +const char MSG_PRELOAD_TO_MMU[] PROGMEM_I1 = ISTR("Preload to MMU"); ////MSG_PRELOAD_TO_MMU c=17 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=17 const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING_TEST c=18 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index f074351d9..0d770371c 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -58,6 +58,7 @@ extern const char MSG_ITERATION[]; extern const char MSG_SELECT_FILAMENT[]; extern const char MSG_LAST_PRINT[]; extern const char MSG_LAST_PRINT_FAILURES[]; +extern const char MSG_PRELOAD_TO_MMU[]; extern const char MSG_LOAD_FILAMENT[]; extern const char MSG_LOADING_TEST[]; extern const char MSG_LOADING_FILAMENT[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index eafcb26e7..8311b8ef9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4760,12 +4760,12 @@ static inline void load_filament_wrapper(uint8_t i){ MMU2::mmu2.load_filament(i); } -static void mmu_load_filament_menu() { +static void mmu_preload_filament_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), load_all_wrapper); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_PRELOAD_TO_MMU c=16 MENU_END(); } @@ -5224,7 +5224,7 @@ static void lcd_main_menu() if ( ! ( printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { if (MMU2::mmu2.Enabled()) { - MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), mmu_load_filament_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_PRELOAD_TO_MMU), mmu_preload_filament_menu); MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18 MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FROM_MMU), mmu_fil_eject_menu); From 1f9fc4ef3fee5acebc288236c8dcf728daa72172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 21 May 2023 15:37:11 +0000 Subject: [PATCH 015/148] MMU: add UnloadInner and CutFilamentInner Sync with the 32-bit side. The ReportingRAII does not handle recursion. Fixes an issue with the multiple calls to BeginReport() and EndReport() Change in memory: Flash: +14 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 65 ++++++++++++++++++++++++++--------------------- Firmware/mmu2.h | 2 ++ 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index c9152f28b..cee4fb2a4 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -324,7 +324,7 @@ bool MMU2::ToolChangeCommonOnce(uint8_t slot) { // if the extruder has been parked, it will get unparked once the ToolChange command finishes OK // - so no ResumeUnpark() at this spot - unload(); + UnloadInner(); // if we run out of retries, we must do something ... may be raise an error screen and allow the user to do something // but honestly - if the MMU restarts during every toolchange, // something else is seriously broken and stopping a print is probably our best option. @@ -334,9 +334,9 @@ bool MMU2::ToolChangeCommonOnce(uint8_t slot) { if (VerifyFilamentEnteredPTFE()) { return true; // success } else { // Prepare a retry attempt - unload(); + UnloadInner(); if (retries == 2 && cutter_enabled()) { - cut_filament(slot, false); // try cutting filament tip at the last attempt + CutFilamentInner(slot); // try cutting filament tip at the last attempt } } } @@ -444,35 +444,48 @@ bool MMU2::set_filament_type(uint8_t /*slot*/, uint8_t /*type*/) { return true; } +void MMU2::UnloadInner() { + FSensorBlockRunout blockRunout; + filament_ramming(); + + // we assume the printer managed to relieve filament tip from the gears, + // so repeating that part in case of an MMU restart is not necessary + for (;;) { + Disable_E0(); + logic.UnloadFilament(); + if (manage_response(false, true)) + break; + IncrementMMUFails(); + } + MakeSound(Confirm); + + // no active tool + extruder = MMU2_NO_TOOL; + tool_change_extruder = MMU2_NO_TOOL; +} + bool MMU2::unload() { if (!WaitForMMUReady()) return false; WaitForHotendTargetTempBeep(); - { - FSensorBlockRunout blockRunout; - ReportingRAII rep(CommandInProgress::UnloadFilament); - filament_ramming(); + ReportingRAII rep(CommandInProgress::UnloadFilament); + UnloadInner(); - // we assume the printer managed to relieve filament tip from the gears, - // so repeating that part in case of an MMU restart is not necessary - for (;;) { - Disable_E0(); - logic.UnloadFilament(); - if (manage_response(false, true)) - break; - IncrementMMUFails(); - } - MakeSound(Confirm); - - // no active tool - extruder = MMU2_NO_TOOL; - tool_change_extruder = MMU2_NO_TOOL; - } return true; } +void MMU2::CutFilamentInner(uint8_t slot) { + for (;;) { + Disable_E0(); + logic.CutFilament(slot); + if (manage_response(false, true)) + break; + IncrementMMUFails(); + } +} + bool MMU2::cut_filament(uint8_t slot, bool enableFullScreenMsg /*= true*/) { if (!WaitForMMUReady()) return false; @@ -486,13 +499,7 @@ bool MMU2::cut_filament(uint8_t slot, bool enableFullScreenMsg /*= true*/) { } ReportingRAII rep(CommandInProgress::CutFilament); - for (;;) { - Disable_E0(); - logic.CutFilament(slot); - if (manage_response(false, true)) - break; - IncrementMMUFails(); - } + CutFilamentInner(slot); } extruder = MMU2_NO_TOOL; tool_change_extruder = MMU2_NO_TOOL; diff --git a/Firmware/mmu2.h b/Firmware/mmu2.h index e85246524..b34ee2af6 100644 --- a/Firmware/mmu2.h +++ b/Firmware/mmu2.h @@ -286,6 +286,8 @@ private: bool ToolChangeCommonOnce(uint8_t slot); void HelpUnloadToFinda(); + void UnloadInner(); + void CutFilamentInner(uint8_t slot); ProtocolLogic logic; ///< implementation of the protocol logic layer uint8_t extruder; ///< currently active slot in the MMU ... somewhat... not sure where to get it from yet From 02676fc88866fe499f84392ce44659ddfcf62a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 21 May 2023 10:57:09 +0000 Subject: [PATCH 016/148] Limit scope of is_mmu_error_monitor_active Move the variable to mmu2_reporting Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 5 ++--- Firmware/mmu2.h | 3 --- Firmware/mmu2_reporting.cpp | 13 ++++++++++--- Firmware/mmu2_reporting.h | 3 +++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index cee4fb2a4..6be8d4b4e 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -38,8 +38,7 @@ void WaitForHotendTargetTempBeep() { MMU2 mmu2; MMU2::MMU2() - : is_mmu_error_monitor_active(false) - , logic(&mmu2Serial, MMU2_TOOL_CHANGE_LOAD_LENGTH, MMU2_LOAD_TO_NOZZLE_FEED_RATE) + : logic(&mmu2Serial, MMU2_TOOL_CHANGE_LOAD_LENGTH, MMU2_LOAD_TO_NOZZLE_FEED_RATE) , extruder(MMU2_NO_TOOL) , tool_change_extruder(MMU2_NO_TOOL) , resume_position() @@ -171,7 +170,7 @@ void MMU2::mmu_loop() { void __attribute__((noinline)) MMU2::mmu_loop_inner(bool reportErrors) { logicStepLastStatus = LogicStep(reportErrors); // it looks like the mmu_loop doesn't need to be a blocking call - if (is_mmu_error_monitor_active) { + if (isErrorScreenRunning()) { // Call this every iteration to keep the knob rotation responsive // This includes when mmu_loop is called within manage_response ReportErrorHook((CommandInProgress)logic.CommandInProgress(), (uint16_t)lastErrorCode, uint8_t(lastErrorSource)); diff --git a/Firmware/mmu2.h b/Firmware/mmu2.h index b34ee2af6..c5dd5a6df 100644 --- a/Firmware/mmu2.h +++ b/Firmware/mmu2.h @@ -172,9 +172,6 @@ public: } } - // Helper variable to monitor knob in MMU error screen in blocking functions e.g. manage_response - bool is_mmu_error_monitor_active; - /// Method to read-only mmu_print_saved inline bool MMU_PRINT_SAVED() const { return mmu_print_saved != SavedState::None; } diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index ea4bcd01f..09c62f4a8 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -212,6 +212,13 @@ enum class ReportErrorHookStates : uint8_t { enum ReportErrorHookStates ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN; +// Helper variable to monitor knob in MMU error screen in blocking functions e.g. manage_response +static bool is_mmu_error_monitor_active; + +bool isErrorScreenRunning() { + return is_mmu_error_monitor_active; +} + void ReportErrorHook(CommandInProgress /*cip*/, uint16_t ec, uint8_t /*es*/) { if (mmu2.MMUCurrentErrorCode() == ErrorCode::OK && mmu2.MMULastErrorSource() == MMU2::ErrorSourceMMU) { // If the error code suddenly changes to OK, that means @@ -228,7 +235,7 @@ void ReportErrorHook(CommandInProgress /*cip*/, uint16_t ec, uint8_t /*es*/) { ReportErrorHookState = ReportErrorHookStates::MONITOR_SELECTION; [[fallthrough]]; case (uint8_t)ReportErrorHookStates::MONITOR_SELECTION: - mmu2.is_mmu_error_monitor_active = true; + is_mmu_error_monitor_active = true; ReportErrorHookDynamicRender(); // Render dynamic characters sound_wait_for_user(); switch (ReportErrorHookMonitor(ei)) { @@ -246,7 +253,7 @@ void ReportErrorHook(CommandInProgress /*cip*/, uint16_t ec, uint8_t /*es*/) { lcd_return_to_status(); sound_wait_for_user_reset(); // Reset the state in case a new error is reported - mmu2.is_mmu_error_monitor_active = false; + is_mmu_error_monitor_active = false; ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN; break; default: @@ -260,7 +267,7 @@ void ReportErrorHook(CommandInProgress /*cip*/, uint16_t ec, uint8_t /*es*/) { lcd_return_to_status(); sound_wait_for_user_reset(); // Reset the state in case a new error is reported - mmu2.is_mmu_error_monitor_active = false; + is_mmu_error_monitor_active = false; ReportErrorHookState = ReportErrorHookStates::RENDER_ERROR_SCREEN; break; default: diff --git a/Firmware/mmu2_reporting.h b/Firmware/mmu2_reporting.h index 8bfa2c978..e03b15ddd 100644 --- a/Firmware/mmu2_reporting.h +++ b/Firmware/mmu2_reporting.h @@ -22,6 +22,9 @@ void BeginReport(CommandInProgress cip, uint16_t ec); /// Called at the end of every MMU operation void EndReport(CommandInProgress cip, uint16_t ec); +/// Return true if the printer's LCD is drawing the error screen +bool isErrorScreenRunning(); + /// @brief Called when the MMU or MK3S sends operation error (even repeatedly). /// Render MMU error screen on the LCD. This must be non-blocking /// and allow the MMU and printer to communicate with each other. From 467158eb49dbb3905f5506f335deb59bea904fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 14 May 2023 14:10:42 +0000 Subject: [PATCH 017/148] =?UTF-8?q?MMU:=20Fix=200=C2=B0C=20target=20temper?= =?UTF-8?q?ature=20when=20loading=20to=20nozzle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bFilamentAction variable is never reset, even after disabling the heaters. Steps to reproduce: 1. Boot-up printer 2. Select Load to Nozzle. 3. Select PLA (215°C) target 4. Select Filament 1 5. Wait for load to be successful 6. Go to Preheat submenu and select Cooldown (last menu item) 7. Observe target temperature on the status screen is now 0°C 8. Select Load to Nozzle again. 9. Select Filament 2. * Expected behavior target temperature IS NOT 0°C * Actual behavior target temperature IS 0°C Change in memory: Flash: -26 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 122 ++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8311b8ef9..90ad87796 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -56,9 +56,9 @@ static void lcd_backlight_menu(); #endif FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as 'non-autoLoad' -static bool bFilamentPreheatState; -static bool bFilamentAction = false; -static bool bFilamentWaitingFlag = false; +static bool bFilamentPreheatState; // True if target temperature is above min_temp +static bool bFilamentWaitingFlag; // True if the preheat menu is waiting for the user +static bool bFilamentSkipPreheat; // True if waiting for preheat is not required (e.g. MMU Cut and Eject) int8_t ReInitLCD = 0; uint8_t scrollstuff = 0; @@ -114,13 +114,17 @@ static void lcd_menu_fails_stats_mmu(); static void lcd_menu_fails_stats_mmu_print(); static void lcd_menu_fails_stats_mmu_total(); static void lcd_menu_toolchange_stats_mmu_total(); -static void mmu_unload_filament(); static void lcd_v2_calibration(); //static void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") static void mmu_fil_eject_menu(); static void mmu_load_to_nozzle_menu(); static void mmu_loading_test_menu(); +static void lcd_mmuLoadingTest(); +static void lcd_mmuCutFilament(); +static void lcd_mmuLoadFilament(); +static void lcd_mmuUnloadFilament(); +static void lcd_mmuEjectFilament(); static void preheat_or_continue(FilamentAction action); #ifdef MMU_HAS_CUTTER @@ -1848,7 +1852,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) // the current temperature is within +-TEMP_HYSTERESIS of the target // then continue with the filament action if any is set - if (abs((int)current_temperature[0] - nTemp) < TEMP_HYSTERESIS) + if (bFilamentSkipPreheat || abs((int)current_temperature[0] - nTemp) < TEMP_HYSTERESIS) { switch (eFilamentAction) { @@ -1872,32 +1876,27 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) break; case FilamentAction::MmuLoad: nLevel = bFilamentPreheatState ? 1 : 2; - bFilamentAction = true; menu_back(nLevel); menu_submenu(mmu_load_to_nozzle_menu, true); break; case FilamentAction::MmuLoadingTest: nLevel = bFilamentPreheatState ? 1 : 2; - bFilamentAction = true; menu_back(nLevel); menu_submenu(mmu_loading_test_menu, true); break; case FilamentAction::MmuUnLoad: nLevel = bFilamentPreheatState ? 1 : 2; - bFilamentAction = true; menu_back(nLevel); MMU2::mmu2.unload(); break; case FilamentAction::MmuEject: nLevel = bFilamentPreheatState ? 1 : 2; - bFilamentAction = true; menu_back(nLevel); menu_submenu(mmu_fil_eject_menu, true); break; case FilamentAction::MmuCut: #ifdef MMU_HAS_CUTTER nLevel=bFilamentPreheatState?1:2; - bFilamentAction=true; menu_back(nLevel); menu_submenu(mmu_cut_filament_menu, true); #endif //MMU_HAS_CUTTER @@ -2097,12 +2096,6 @@ static void lcd_unLoadFilament() preheat_or_continue(FilamentAction::UnLoad); } -static void mmu_unload_filament() -{ - preheat_or_continue(FilamentAction::MmuUnLoad); -} - - void lcd_wait_interact() { lcd_clear(); @@ -2245,9 +2238,16 @@ static void lcd_menu_AutoLoadFilament() static void preheat_or_continue(FilamentAction action) { eFilamentAction = action; - if (target_temperature[0] >= extrude_min_temp) { + + // For MMU: If FINDA doesn't detect filament on Cut or Eject action, + // then preheating is unnecessary + bFilamentSkipPreheat = ( MMU2::mmu2.Enabled() && !MMU2::mmu2.FindaDetectsFilament() + && (action == FilamentAction::MmuCut || action == FilamentAction::MmuEject) ); + + if (bFilamentSkipPreheat || target_temperature[0] >= extrude_min_temp) { bFilamentPreheatState = true; mFilamentItem(target_temperature[0], target_temperature_bed); + bFilamentSkipPreheat = false; // Reset flag } else { lcd_generic_preheat_menu(); } @@ -4443,7 +4443,7 @@ static void lcd_settings_menu() if (MMU2::mmu2.Enabled()) { // Only show menus when communicating with MMU menuitems_MMU_settings_common(); - MENU_ITEM_SUBMENU_P(_T(MSG_LOADING_TEST), mmu_loading_test_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_LOADING_TEST), lcd_mmuLoadingTest); } SETTINGS_FANS_CHECK(); @@ -4785,15 +4785,11 @@ static inline void lcd_mmu_load_to_nozzle_wrapper(uint8_t index){ } static void mmu_load_to_nozzle_menu() { - if (bFilamentAction) { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16 - MENU_END(); - } else { - preheat_or_continue(FilamentAction::MmuLoad); - } + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_END(); } static void mmu_eject_filament(uint8_t filament) { @@ -4802,15 +4798,11 @@ static void mmu_eject_filament(uint8_t filament) { } static void mmu_fil_eject_menu() { - if (bFilamentAction || (!MMU2::mmu2.FindaDetectsFilament())) { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FROM_MMU c=16 - MENU_END(); - } else { - preheat_or_continue(FilamentAction::MmuEject); - } + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FROM_MMU c=16 + MENU_END(); } #ifdef MMU_HAS_CUTTER @@ -4819,15 +4811,11 @@ static inline void mmu_cut_filament_wrapper(uint8_t index){ } static void mmu_cut_filament_menu() { - if (bFilamentAction || (!MMU2::mmu2.FindaDetectsFilament())) { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 - MENU_END(); - } else { - preheat_or_continue(FilamentAction::MmuCut); - } + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 + MENU_END(); } #endif //MMU_HAS_CUTTER @@ -4842,16 +4830,32 @@ static inline void loading_test_wrapper(uint8_t i){ } static void mmu_loading_test_menu() { - if (bFilamentAction) { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), loading_test_all_wrapper); - for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16 - MENU_END(); - } else { - preheat_or_continue(FilamentAction::MmuLoadingTest); - } + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), loading_test_all_wrapper); + for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_END(); +} + +static void lcd_mmuLoadingTest() { + preheat_or_continue(FilamentAction::MmuLoadingTest); +} + +static void lcd_mmuCutFilament() { + preheat_or_continue(FilamentAction::MmuCut); +} + +static void lcd_mmuLoadFilament() { + preheat_or_continue(FilamentAction::MmuLoad); +} + +static void lcd_mmuUnloadFilament() { + preheat_or_continue(FilamentAction::MmuUnLoad); +} + +static void lcd_mmuEjectFilament() { + preheat_or_continue(FilamentAction::MmuEject); } /// @brief unload filament for single material printer (used in M600 and M702) @@ -5225,12 +5229,12 @@ static void lcd_main_menu() if ( ! ( printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { if (MMU2::mmu2.Enabled()) { MENU_ITEM_SUBMENU_P(_T(MSG_PRELOAD_TO_MMU), mmu_preload_filament_menu); - MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18 - MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); - MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FROM_MMU), mmu_fil_eject_menu); + MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), lcd_mmuLoadFilament);////MSG_LOAD_TO_NOZZLE c=18 + MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_mmuUnloadFilament); + MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FROM_MMU), lcd_mmuEjectFilament); #ifdef MMU_HAS_CUTTER if (eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED) != 0) { - MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), lcd_mmuCutFilament); } #endif //MMU_HAS_CUTTER } else { From 963bd508a433b9fe051d69ac7e97033053b3d457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 14 May 2023 15:15:14 +0000 Subject: [PATCH 018/148] Fix MK25 compiler warning warning: 't_fan_rising_edge' defined but not used [-Wunused-variable] --- Firmware/Marlin_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8d53c114c..86c39edf8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -172,7 +172,9 @@ int extrudemultiply=100; //100->1 200->2 bool homing_flag = false; +#if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) static uint32_t t_fan_rising_edge; +#endif // #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) LongTimer safetyTimer; static LongTimer crashDetTimer; From 7dc370a7e1a4c264b40f072cb3bb85bb49a02106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 14 May 2023 15:24:55 +0000 Subject: [PATCH 019/148] Move ISR7 code to fancheck.cpp --- Firmware/Marlin.h | 4 ---- Firmware/Marlin_main.cpp | 48 +--------------------------------------- Firmware/fancheck.cpp | 43 +++++++++++++++++++++++++++++++++++ Firmware/fancheck.h | 4 ++++ 4 files changed, 48 insertions(+), 51 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 1c5e55209..a51d568a2 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -385,10 +385,6 @@ void uvlo_tiny(); void recover_print(uint8_t automatic); void setup_uvlo_interrupt(); -#if defined(TACH_1) && TACH_1 >-1 -void setup_fan_interrupt(); -#endif - extern bool recover_machine_state_after_power_panic(); extern void restore_print_from_eeprom(bool mbl_was_active); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 86c39edf8..b009d2b3c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -128,9 +128,6 @@ #include "cmdqueue.h" -//Macro for print fan speed -#define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms - //filament types #define FILAMENT_DEFAULT 0 #define FILAMENT_FLEX 1 @@ -172,9 +169,6 @@ int extrudemultiply=100; //100->1 200->2 bool homing_flag = false; -#if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) -static uint32_t t_fan_rising_edge; -#endif // #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) LongTimer safetyTimer; static LongTimer crashDetTimer; @@ -1476,7 +1470,7 @@ void setup() mbl_settings_init(); eeprom_init_default_byte((uint8_t*)EEPROM_MMU_STEALTH, 1); -#if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 +#if (!defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) setup_fan_interrupt(); #endif //DEBUG_DISABLE_FANCHECK @@ -10570,47 +10564,7 @@ void uvlo_tiny() printf_P(_N("UVLO_TINY - end %d\n"), _millis() - time_start); uvlo_drain_reset(); } -#endif //UVLO_SUPPORT -#if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) - -void setup_fan_interrupt() { -//INT7 - DDRE &= ~(1 << 7); //input pin - PORTE &= ~(1 << 7); //no internal pull-up - - //start with sensing rising edge - EICRB &= ~(1 << 6); - EICRB |= (1 << 7); - - //enable INT7 interrupt - EIMSK |= (1 << 7); -} - -// The fan interrupt is triggered at maximum 325Hz (may be a bit more due to component tollerances), -// and it takes 4.24 us to process (the interrupt invocation overhead not taken into account). -ISR(INT7_vect) { - //measuring speed now works for fanSpeed > 18 (approximately), which is sufficient because MIN_PRINT_FAN_SPEED is higher -#ifdef FAN_SOFT_PWM - if (!fan_measuring || (fanSpeedSoftPwm < MIN_PRINT_FAN_SPEED)) return; -#else //FAN_SOFT_PWM - if (fanSpeed < MIN_PRINT_FAN_SPEED) return; -#endif //FAN_SOFT_PWM - - if ((1 << 6) & EICRB) { //interrupt was triggered by rising edge - t_fan_rising_edge = millis_nc(); - } - else { //interrupt was triggered by falling edge - if ((millis_nc() - t_fan_rising_edge) >= FAN_PULSE_WIDTH_LIMIT) {//this pulse was from sensor and not from pwm - fan_edge_counter[1] += 2; //we are currently counting all edges so lets count two edges for one pulse - } - } - EICRB ^= (1 << 6); //change edge -} - -#endif - -#ifdef UVLO_SUPPORT void setup_uvlo_interrupt() { DDRE &= ~(1 << 4); //input pin PORTE &= ~(1 << 4); //no internal pull-up diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp index 236db6c53..eedc5fe3d 100755 --- a/Firmware/fancheck.cpp +++ b/Firmware/fancheck.cpp @@ -9,10 +9,17 @@ #define FAN_CHECK_PERIOD 5000 //5s #define FAN_CHECK_DURATION 100 //100ms +//Macro for print fan speed +#define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms + #ifdef FANCHECK volatile uint8_t fan_check_error = EFCE_OK; #endif +#if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) +static uint32_t t_fan_rising_edge; +#endif // #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) + #if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) #ifdef EXTRUDER_ALTFAN_DETECT static struct @@ -154,6 +161,42 @@ void checkFanSpeed() } #endif //(defined(TACH_0) && TACH_0 >-1) || (defined(TACH_1) && TACH_1 > -1) +#if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) +void setup_fan_interrupt() { +//INT7 + DDRE &= ~(1 << 7); //input pin + PORTE &= ~(1 << 7); //no internal pull-up + + //start with sensing rising edge + EICRB &= ~(1 << 6); + EICRB |= (1 << 7); + + //enable INT7 interrupt + EIMSK |= (1 << 7); +} + +// The fan interrupt is triggered at maximum 325Hz (may be a bit more due to component tollerances), +// and it takes 4.24 us to process (the interrupt invocation overhead not taken into account). +ISR(INT7_vect) { + //measuring speed now works for fanSpeed > 18 (approximately), which is sufficient because MIN_PRINT_FAN_SPEED is higher +#ifdef FAN_SOFT_PWM + if (!fan_measuring || (fanSpeedSoftPwm < MIN_PRINT_FAN_SPEED)) return; +#else //FAN_SOFT_PWM + if (fanSpeed < MIN_PRINT_FAN_SPEED) return; +#endif //FAN_SOFT_PWM + + if ((1 << 6) & EICRB) { //interrupt was triggered by rising edge + t_fan_rising_edge = millis_nc(); + } + else { //interrupt was triggered by falling edge + if ((millis_nc() - t_fan_rising_edge) >= FAN_PULSE_WIDTH_LIMIT) {//this pulse was from sensor and not from pwm + fan_edge_counter[1] += 2; //we are currently counting all edges so lets count two edges for one pulse + } + } + EICRB ^= (1 << 6); //change edge +} +#endif //(defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) + #ifdef EXTRUDER_ALTFAN_DETECT ISR(INT6_vect) { fan_edge_counter[0]++; diff --git a/Firmware/fancheck.h b/Firmware/fancheck.h index c94834bb6..af5a55486 100755 --- a/Firmware/fancheck.h +++ b/Firmware/fancheck.h @@ -15,6 +15,10 @@ extern volatile uint8_t fan_check_error; void readFanTach(); #endif //(defined(TACH_0)) +#if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) +void setup_fan_interrupt(); +#endif // (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) + #ifdef EXTRUDER_ALTFAN_DETECT extern bool extruder_altfan_detect(); extern void altfanOverride_toggle(); From c7e382f6ba118e27b71a15e1aa356ac9c7162a13 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 09:36:47 +0200 Subject: [PATCH 020/148] Add new message `Preload to MMU` to po files Inital translation --- lang/po/Firmware.pot | 5 +++++ lang/po/Firmware_cs.po | 5 +++++ lang/po/Firmware_de.po | 5 +++++ lang/po/Firmware_es.po | 5 +++++ lang/po/Firmware_fr.po | 5 +++++ lang/po/Firmware_hr.po | 5 +++++ lang/po/Firmware_hu.po | 5 +++++ lang/po/Firmware_it.po | 5 +++++ lang/po/Firmware_nl.po | 5 +++++ lang/po/Firmware_no.po | 5 +++++ lang/po/Firmware_pl.po | 5 +++++ lang/po/Firmware_ro.po | 5 +++++ lang/po/Firmware_sk.po | 5 +++++ lang/po/Firmware_sv.po | 5 +++++ 14 files changed, 70 insertions(+) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index b76992fbc..66950b382 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1636,6 +1636,11 @@ msgstr "" msgid "Preheating to unload" msgstr "" +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "" + #. MSG_PROGRESS_PREPARE_BLADE c=20 #: ../../Firmware/mmu2_progress_converter.cpp:22 #: ../../Firmware/mmu2_progress_converter.cpp:53 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 057eba849..5347db3c4 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2530,6 +2530,11 @@ msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Předzásobení MMU" + #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index b876a46f6..4bffa15f0 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2558,6 +2558,11 @@ msgstr "" "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " "Update auf Version 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Vorladen in MMU" + #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 5401d8b6d..a18597ee7 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2554,6 +2554,11 @@ msgstr "" "La versión de firmware de la MMU es incompatible con el FW de la impresora. " "Actualizar a la versión 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Precarga a MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 470a80aad..4165e3821 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2568,6 +2568,11 @@ msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Précharge à MMU" + #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index ea0d7c593..ed1ca1860 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2547,6 +2547,11 @@ msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Predpunjenje MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 63e3970e8..66ff20f29 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2551,6 +2551,11 @@ msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissíts a " "2.1.9-es verzióra." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Előtöltés az MMU" + #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index ef615e540..b241e6d62 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2552,6 +2552,11 @@ msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " "stampante. Aggiornamento alla versione 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Precarico a MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 423118134..048387690 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2556,6 +2556,11 @@ msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " "printer. Update naar versie 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Preload naar MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 791faf8df..4405649d2 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2529,6 +2529,11 @@ msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "versjon 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Forlast til MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 318593691..247588d20 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2548,6 +2548,11 @@ msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Zaladuj do MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 775d92fc0..3e614b0a3 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2552,6 +2552,11 @@ msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Actualizați la versiunea 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Preîncărcare MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index f95abaf83..fe96f1ba4 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2535,6 +2535,11 @@ msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Předzásobení MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index f0d8e1d21..b514a2cdd 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2542,6 +2542,11 @@ msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "version 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Förladdning MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 96614297e7c2164626797e0d1dc999ee4229dd99 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 10:26:49 +0200 Subject: [PATCH 021/148] Thanks to @arekam --- lang/po/Firmware_pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 247588d20..b052c07ff 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2551,7 +2551,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Zaladuj do MMU" +msgstr "Załaduj do MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 1ccc05d321704d9f9985db9ec1c36c263065ba02 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 10:31:51 +0200 Subject: [PATCH 022/148] Thanks to @shatter136 --- lang/po/Firmware_sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index fe96f1ba4..9042d975d 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2538,7 +2538,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Předzásobení MMU" +msgstr "Predzásobenie MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 212abfba9ed478ad4eae2c290f37bf0a2f1cdb8e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 10:41:28 +0200 Subject: [PATCH 023/148] Thanks to @AttilaSVK --- lang/po/Firmware_hu.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 66ff20f29..6a77db2af 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2554,7 +2554,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Előtöltés az MMU" +msgstr "Betöltés az MMUba" #~ msgid "Reset MMU" #~ msgstr "MMUreszet" From 53e1dad772ef6b9a7cd759bed56fbf1072e2456e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 16:25:12 +0200 Subject: [PATCH 024/148] Thanks to @stelgenhof --- lang/po/Firmware_nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 048387690..258dd3499 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2559,7 +2559,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Preload naar MMU" +msgstr "Voorladen in MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From a36b6755afbc1ee259203dde033d5e877fa3bb14 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 08:34:29 +0200 Subject: [PATCH 025/148] Thanks to @trfunk --- lang/po/Firmware_de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 4bffa15f0..5b07cd629 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2561,7 +2561,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Vorladen in MMU" +msgstr "In MMU laden" #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" From 5553e45ad3635855ecb0ef0bfa0add10d7ffcc08 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 08:41:45 +0200 Subject: [PATCH 026/148] Thanks to @wavexx and @SNDR0 --- lang/po/Firmware_it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index b241e6d62..db396df8a 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2555,7 +2555,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Precarico a MMU" +msgstr "Precarica MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From a37bcbfd8cc4597b8b0a598d9be90d595448e3e9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 09:31:37 +0200 Subject: [PATCH 027/148] Fix `Load filament` to c=16 --- Firmware/messages.cpp | 2 +- Firmware/ultralcd.cpp | 6 +++--- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 4 ++-- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 4 ++-- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 4 ++-- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 52c657386..fc795021d 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -53,7 +53,7 @@ const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_ const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////MSG_LAST_PRINT c=18 const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////MSG_LAST_PRINT_FAILURES c=20 const char MSG_PRELOAD_TO_MMU[] PROGMEM_I1 = ISTR("Preload to MMU"); ////MSG_PRELOAD_TO_MMU c=17 -const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=17 +const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=16 const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING_TEST c=18 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20 const char MSG_TESTING_FILAMENT[] PROGMEM_I1 = ISTR("Testing filament"); ////MSG_TESTING_FILAMENT c=20 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 90ad87796..dbe27f27e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4765,7 +4765,7 @@ static void mmu_preload_filament_menu() { MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), load_all_wrapper); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_PRELOAD_TO_MMU c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); MENU_END(); } @@ -4788,7 +4788,7 @@ static void mmu_load_to_nozzle_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); MENU_END(); } @@ -4834,7 +4834,7 @@ static void mmu_loading_test_menu() { MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), loading_test_all_wrapper); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); MENU_END(); } diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 66950b382..e49dc17f0 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1033,7 +1033,7 @@ msgstr "" msgid "Load All" msgstr "" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 5347db3c4..bdafdedfe 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -1056,7 +1056,7 @@ msgstr "Doladeni osy Z" msgid "Load All" msgstr "Nacist vse" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 5b07cd629..faa693194 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -1068,7 +1068,7 @@ msgstr "Z einstellen" msgid "Load All" msgstr "Alle laden" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index a18597ee7..8835238d5 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -1069,12 +1069,12 @@ msgstr "Micropaso Eje Z" msgid "Load All" msgstr "Intr. todos fil." -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 msgid "Load filament" -msgstr "Introducir filam." +msgstr "Introducir fil." #. MSG_LOAD_TO_NOZZLE c=18 #: ../../Firmware/ultralcd.cpp:5426 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 4165e3821..5334eeb5a 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -1076,7 +1076,7 @@ msgstr "Ajuster Z en dir." msgid "Load All" msgstr "Tout Charger" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index ed1ca1860..bcff560fd 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -1068,12 +1068,12 @@ msgstr "Live podesavanje Z" msgid "Load All" msgstr "Puni sve" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 msgid "Load filament" -msgstr "Napunite filament" +msgstr "Napunite fil." #. MSG_LOAD_TO_NOZZLE c=18 #: ../../Firmware/ultralcd.cpp:5426 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 6a77db2af..9d56c1834 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -1069,7 +1069,7 @@ msgstr "Z magassag beall." msgid "Load All" msgstr "Ossz.bet" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index db396df8a..0d9e35ae2 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -1071,7 +1071,7 @@ msgstr "Compensazione Z" msgid "Load All" msgstr "Carica tutti" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 258dd3499..a0e6d4e5f 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -1072,7 +1072,7 @@ msgstr "Live Z aanpassen" msgid "Load All" msgstr "Laad alle" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 4405649d2..76f1e1ab5 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -1062,12 +1062,12 @@ msgstr "Juster Live-Z" msgid "Load All" msgstr "Last Alle" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 msgid "Load filament" -msgstr "Last inn filament" +msgstr "Last inn filam." #. MSG_LOAD_TO_NOZZLE c=18 #: ../../Firmware/ultralcd.cpp:5426 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index b052c07ff..7c58bae11 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -1068,7 +1068,7 @@ msgstr "Ustaw. Live Z" msgid "Load All" msgstr "Zalad. wszystkie" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 3e614b0a3..0325d6d8f 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -1070,7 +1070,7 @@ msgstr "Reglare Z live" msgid "Load All" msgstr "Incarca toate" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 9042d975d..ed1a36653 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -1064,7 +1064,7 @@ msgstr "Doladenie osi Z" msgid "Load All" msgstr "Zaviest vsetko" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index b514a2cdd..45c1478aa 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -1069,7 +1069,7 @@ msgstr "Live justera Z" msgid "Load All" msgstr "Ladda alla" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 From f43451f80b83d9cc9651845f274d5b34b029b447 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 09:50:27 +0200 Subject: [PATCH 028/148] Update `MSG_EJECT_FILAMENT` and `MSG_CUT_FILAMENT` to `c=16` Had to shorten SK translation --- Firmware/messages.cpp | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 2 +- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 4 ++-- lang/po/Firmware_sv.po | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index fc795021d..a1647d329 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -58,7 +58,7 @@ const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20 const char MSG_TESTING_FILAMENT[] PROGMEM_I1 = ISTR("Testing filament"); ////MSG_TESTING_FILAMENT c=20 const char MSG_EJECT_FROM_MMU[] PROGMEM_I1 = ISTR("Eject from MMU"); ////MSG_EJECT_FROM_MMU c=16 -const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); ////MSG_CUT_FILAMENT c=17 +const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); ////MSG_CUT_FILAMENT c=16 const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////MSG_MAIN c=18 const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////MSG_BACK c=18 const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////MSG_SHEET c=10 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dbe27f27e..c70ce9af9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4801,7 +4801,7 @@ static void mmu_fil_eject_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FROM_MMU c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); MENU_END(); } @@ -4814,7 +4814,7 @@ static void mmu_cut_filament_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); MENU_END(); } #endif //MMU_HAS_CUTTER diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index e49dc17f0..011591d47 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -383,7 +383,7 @@ msgid "" "Normal mode" msgstr "" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index bdafdedfe..554642e13 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -402,7 +402,7 @@ msgstr "" "funguje pouze v\n" "Normal modu" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index faa693194..7e960fddd 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -405,7 +405,7 @@ msgstr "" "nur im Modus Normal\n" "genutzt werden" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 8835238d5..13edf460a 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -402,7 +402,7 @@ msgstr "" "ser activada solo en\n" "Modo normal" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 5334eeb5a..5375ef7e0 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -405,7 +405,7 @@ msgstr "" "active seulement en\n" "mode Normal" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index bcff560fd..e6406ee05 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -399,7 +399,7 @@ msgid "" "Normal mode" msgstr "Detekcija udarca moze biti ukljuceno samo u Normalnom nacinu rada" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 9d56c1834..43756b906 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -402,7 +402,7 @@ msgstr "" "normal modban\n" "kapcsolhato be" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 0d9e35ae2..f95d64b53 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -404,7 +404,7 @@ msgstr "" "attivabile solo\n" "in Modalita normale" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index a0e6d4e5f..c52b95d68 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -404,7 +404,7 @@ msgstr "" "alleen in normaal\n" "gebruikt worden" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 76f1e1ab5..63c539a69 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -403,7 +403,7 @@ msgstr "" "bare skrus på i\n" "Normal modus" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 7c58bae11..dfbae3322 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -404,7 +404,7 @@ msgstr "" "tylko w\n" "trybie Normalnym" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 0325d6d8f..95ada7ee6 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -405,7 +405,7 @@ msgstr "" "poate fi pornita\n" "doar in modul normal" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index ed1a36653..2ff9248a3 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -402,11 +402,11 @@ msgstr "" "byt zapnuta len v\n" "Normalnom rezime" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" -msgstr "Odstrihnut filam." +msgstr "Odstrihnut fil." #. MSG_CUTTER c=9 #: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 45c1478aa..781d6d903 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -403,7 +403,7 @@ msgstr "" "endast aktiveras i\n" "normalt läge" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" From 9b4c8e9c9d5a8f12afa5563c2a53f933da92db31 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 10:39:05 +0200 Subject: [PATCH 029/148] Thanks to @gudnimg --- Firmware/ultralcd.cpp | 47 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5c2b7e2eb..ba2ba7115 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6666,48 +6666,17 @@ static bool lcd_selftest_fsensor(void) //! @retval false failed static bool selftest_irsensor() { + // Ask user which slot to load filament from + uint8_t slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)); + + // Render self-test screen + lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0); + + // Run self-test set_extrude_min_temp(0); - class TempBackup - { - public: - TempBackup(): - m_temp(degTargetHotend(active_extruder)){} - ~TempBackup(){setTargetHotend(m_temp);} - private: - float m_temp; - }; - uint8_t progress; - progress = lcd_selftest_screen(TestScreen::Fsensor, 0, 1, true, 0); - MMU2::mmu2.tool_change(0); //Allow cold extrusion only loads to the gears not nozzle + MMU2::mmu2.tool_change(slot); MMU2::mmu2.unload(); //Unload filament set_extrude_min_temp(EXTRUDE_MINTEMP); - - for(uint_least8_t i = 0; i < 200; ++i) - { - if (0 == (i % 32)) progress = lcd_selftest_screen(TestScreen::Fsensor, progress, 1, true, 0); - -//@@TODO mmu_load_step(false); - while (blocks_queued()) - { - if (fsensor.getFilamentPresent()) - { - lcd_selftest_error(TestError::TriggeringFsensor, "", ""); - return false; - } -#ifdef TMC2130 - manage_heater(); - // Vojtech: Don't disable motors inside the planner! - if (!tmc2130_update_sg()) - { - manage_inactivity(true); - } -#else //TMC2130 - manage_heater(); - // Vojtech: Don't disable motors inside the planner! - manage_inactivity(true); -#endif //TMC2130 - } - } return true; } #endif //(FILAMENT_SENSOR_TYPE == FSENSOR_IR) || (FILAMENT_SENSOR_TYPE == FSENSOR_IR_ANALOG) From d9eadd39b06d4f17c82aba083797c712635784a3 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 17:18:34 +0200 Subject: [PATCH 030/148] Thanks to @Janys --- lang/po/Firmware_cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 554642e13..cf10b606b 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2533,7 +2533,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Předzásobení MMU" +msgstr "Zavést do MMU" #~ msgid "Eject filament" #~ msgstr "Vysunout fil." From 38d801a4c58551a104fc5b788f8357a4b8f782fc Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 25 May 2023 09:46:16 +0200 Subject: [PATCH 031/148] Add E3D REVO variant Thanks to E3D and the community providing data --- Firmware/temp_model/e3d_REVO.h | 19 + .../variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 684 +++++++++++++++++ .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 19 +- .../variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 696 ++++++++++++++++++ .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 19 +- 5 files changed, 1431 insertions(+), 6 deletions(-) create mode 100644 Firmware/temp_model/e3d_REVO.h create mode 100644 Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h create mode 100644 Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h diff --git a/Firmware/temp_model/e3d_REVO.h b/Firmware/temp_model/e3d_REVO.h new file mode 100644 index 000000000..fe67aa21f --- /dev/null +++ b/Firmware/temp_model/e3d_REVO.h @@ -0,0 +1,19 @@ +#pragma once + +#define TEMP_MODEL_E3D_REVO_VER 1 // model parameters version + +#define TEMP_MODEL_E3D_REVO_P 40. // heater power (W) +#define TEMP_MODEL_E3D_REVO_U -0.0014 // linear temperature coefficient (W/K/power) +#define TEMP_MODEL_E3D_REVO_V 1.05 // linear temperature intercept (W/power) + +#define TEMP_MODEL_E3D_REVO_C 8.77 // initial guess for heatblock capacitance (J/K) +#define TEMP_MODEL_E3D_REVO_R 25.3 // initial guess for heatblock resistance (K/W) + +#define TEMP_MODEL_E3D_REVO_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) +#define TEMP_MODEL_E3D_REVO_LAG 270 // sim. response lag (ms, 0-2160) + +#define TEMP_MODEL_E3D_REVO_W 1.2 // Default warning threshold (K/s) +#define TEMP_MODEL_E3D_REVO_E 1.74 // Default error threshold (K/s) + +// fall-back resistance vector (R0-15) +#define TEMP_MODEL_E3D_REVO_Rv {TEMP_MODEL_E3D_REVO_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h new file mode 100644 index 000000000..ff171105a --- /dev/null +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -0,0 +1,684 @@ +#ifndef CONFIGURATION_PRUSA_H +#define CONFIGURATION_PRUSA_H + +#include + +#include "printers.h" +/*------------------------------------ + GENERAL SETTINGS + *------------------------------------*/ + +// Printer revision +#define PRINTER_TYPE PRINTER_MK3 +#define PRINTER_NAME PRINTER_MK3_NAME +#define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define FILAMENT_SIZE "1_75mm_MK3" +#define HOTEND 2 //1= E3Dv6 2= E3D REVO +#if HOTEND == 1 +#define NOZZLE_TYPE "E3Dv6full" +#elif HOTEND ==2 +#define NOZZLE_TYPE "E3DREVO" +#endif + +// Printer name +#define CUSTOM_MENDEL_NAME "Prusa i3 MK3-R" + +// Electronics +#define MOTHERBOARD BOARD_EINSY_1_0a +#define STEEL_SHEET +#define HAS_SECOND_SERIAL_PORT + + +// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) +//#define E3D_PT100_EXTRUDER_WITH_AMP +//#define E3D_PT100_EXTRUDER_NO_AMP +//#define E3D_PT100_BED_WITH_AMP +//#define E3D_PT100_BED_NO_AMP + + +/*------------------------------------ + AXIS SETTINGS + *------------------------------------*/ + +// Steps per unit {X,Y,Z,E} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} + +// Endstop inverting +#define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. + +// Direction inverting +#define INVERT_X_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 +#define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 + +// Home position +#define MANUAL_X_HOME_POS 0 +#define MANUAL_Y_HOME_POS -2.2 +#define MANUAL_Z_HOME_POS 0.2 + +// Travel limits after homing +#define X_MAX_POS 255 +#define X_MIN_POS 0 +#define Y_MAX_POS 212.5 +#define Y_MIN_POS -4 //orig -4 +#define Z_MAX_POS 210 +#define Z_MIN_POS 0.15 + +// Canceled home position +#define X_CANCEL_POS 50 +#define Y_CANCEL_POS 190 +#define Z_CANCEL_LIFT 50 + +//Pause print position +#define X_PAUSE_POS 50 +#define Y_PAUSE_POS 190 +#define Z_PAUSE_LIFT 20 + +#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E +#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) // 3000 is also valid for stallGuard homing. Valid range: 2200 - 3000 + +//#define DEFAULT_Y_OFFSET 4.f // Default distance of Y_MIN_POS point from endstop, when the printer is not calibrated. +/** + * [0,0] steel sheet print area point X coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_X 0.f +/** + * [0,0] steel sheet print area point Y coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_Y -2.f + +#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) +#define DEFAULT_MAX_FEEDRATE_SILENT {100, 100, 12, 120} // (mm/sec) max feedrate (M203), silent mode + +#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_ACCELERATION_SILENT {960, 960, 200, 5000} // (mm/sec^2) max acceleration (M201), silent mode + + +#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204P) +#define DEFAULT_RETRACT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for retracts (M204R) +#define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for travels (M204T) + +#define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) + +//Silent mode limits +#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_FEEDRATE_XY 100 // max feedrate in mm/s + +//Normal mode limits +#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2 +#define NORMAL_MAX_FEEDRATE_XY 200 // max feedrate in mm/s + +//number of bytes from end of the file to start check +#define END_FILE_SECTION 20000 + +#define Z_AXIS_ALWAYS_ON 1 + +//Crash detection +#define CRASHDET_TIMER 45 //seconds +#define CRASHDET_COUNTER_MAX 3 + +// New XYZ calibration +#define NEW_XYZCAL + +// Watchdog support +#define WATCHDOG + +// Power panic +#define UVLO_SUPPORT + +// Fan check +#define FANCHECK + +// Safety timer +#define SAFETYTIMER +#define DEFAULT_SAFETYTIMER_TIME_MINS 30 + +// Offline crash dumper +#define XFLASH_DUMP // enable dump functionality (including D20/D21/D22) +#define MENU_DUMP // enable "Memory dump" in Settings menu +#define EMERGENCY_DUMP // trigger crash on stack corruption and WDR + +// Online crash dumper +//#define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR +//#define MENU_SERIAL_DUMP // Enable "Memory dump" in Settings menu + +// Filament sensor +#define FILAMENT_SENSOR +#define FILAMENT_SENSOR_TYPE FSENSOR_PAT9125 +#define FSENSOR_PROBING + +// Backlash - +//#define BACKLASH_X +//#define BACKLASH_Y + + +// Minimum ambient temperature limit to start triggering MINTEMP errors [C] +// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it, +// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle +// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater) +#define MINTEMP_MINAMBIENT 10 +#define MINTEMP_MINAMBIENT_RAW 1002 + +#define DEBUG_DCODE2 +#define DEBUG_DCODE3 +#define DEBUG_DCODE6 + +//#define DEBUG_PULLUP_CRASH //Test Pullup crash + +//#define DEBUG_BUILD +//#define DEBUG_SEC_LANG //secondary language debug output at startup +//#define DEBUG_XFLASH //debug external spi flash +#ifdef DEBUG_BUILD +//#define _NO_ASM +#define DEBUG_DCODES //D codes +#define DEBUG_STACK_MONITOR //Stack monitor in stepper ISR +//#define DEBUG_CRASHDET_COUNTERS //Display crash-detection counters on LCD +//#define DEBUG_RESUME_PRINT //Resume/save print debug enable +//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output +//#define DEBUG_DISABLE_XMINLIMIT //x min limit ignored +//#define DEBUG_DISABLE_XMAXLIMIT //x max limit ignored +//#define DEBUG_DISABLE_YMINLIMIT //y min limit ignored +//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored +//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored +//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored +#define DEBUG_DISABLE_STARTMSGS //no startup messages +//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored +//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored +//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line +//#define DEBUG_DISABLE_PREVENT_EXTRUDER //cold extrusion and long extrusion allowed +//#define DEBUG_DISABLE_FORCE_SELFTEST //disable force selftest +//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3) +//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3) +//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) +//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) +#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line +#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. +#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. +#define CMD_DIAGNOSTICS //Show cmd queue length on printer display +#endif /* DEBUG_BUILD */ + + +#define LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION_XYZ +#define TMC2130_VARIABLE_RESOLUTION + + + +/*------------------------------------ + TMC2130 default settings + *------------------------------------*/ + +#define TMC2130_FCLK 12000000 // fclk = 12MHz + +#define TMC2130_USTEPS_XY 16 // microstep resolution for XY axes +#define TMC2130_USTEPS_Z 16 // microstep resolution for Z axis +#define TMC2130_USTEPS_E 32 // microstep resolution for E axis +#define TMC2130_INTPOL_XY 1 // extrapolate 256 for XY axes +#define TMC2130_INTPOL_Z 1 // extrapolate 256 for Z axis +#define TMC2130_INTPOL_E 1 // extrapolate 256 for E axis +// #define ALLOW_ALL_MRES + +#define TMC2130_PWM_GRAD_X 2 // PWMCONF +#define TMC2130_PWM_AMPL_X 230 // PWMCONF +#define TMC2130_PWM_AUTO_X 1 // PWMCONF +#define TMC2130_PWM_FREQ_X 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Y 2 // PWMCONF +#define TMC2130_PWM_AMPL_Y 235 // PWMCONF +#define TMC2130_PWM_AUTO_Y 1 // PWMCONF +#define TMC2130_PWM_FREQ_Y 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Z 4 // PWMCONF +#define TMC2130_PWM_AMPL_Z 200 // PWMCONF +#define TMC2130_PWM_AUTO_Z 1 // PWMCONF +#define TMC2130_PWM_FREQ_Z 2 // PWMCONF + +#define TMC2130_PWM_GRAD_E 4 // PWMCONF +#define TMC2130_PWM_AMPL_E 240 // PWMCONF +#define TMC2130_PWM_AUTO_E 1 // PWMCONF +#define TMC2130_PWM_FREQ_E 2 // PWMCONF + +// experimental setting for E-motor cooler operation +#define TMC2130_PWM_GRAD_Ecool 84 // PWMCONF 730mA @ 375mm/min 970mA phase peak at feedrate 900mm/min +#define TMC2130_PWM_AMPL_Ecool 43 // PWMCONF 500mA phase peak at feedrate 10 mm/min +#define TMC2130_PWM_AUTO_Ecool 0 // PWMCONF + +#define TMC2130_TOFF_XYZ 3 // CHOPCONF // fchop = 27.778kHz +#define TMC2130_TOFF_E 3 // CHOPCONF // fchop = 27.778kHz +//#define TMC2130_TOFF_E 4 // CHOPCONF // fchop = 21.429kHz +//#define TMC2130_TOFF_E 5 // CHOPCONF // fchop = 17.442kHz + +//#define TMC2130_STEALTH_E // Extruder stealthChop mode +//#define TMC2130_CNSTOFF_E // Extruder constant-off-time mode (similar to MK2) + +//#define TMC2130_PWM_DIV 683 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_DIV 512 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_CLK (2 * TMC2130_FCLK / TMC2130_PWM_DIV) // PWM frequency (23.4kHz, 35.1kHz, 46.9kHz, 58.5kHz for 12MHz fclk) + +#define TMC2130_TPWMTHRS 0 // TPWMTHRS - Sets the switching speed threshold based on TSTEP from stealthChop to spreadCycle mode +#define TMC2130_TPWMTHRS_E 403 // Switch extruder from StealthChop to SpreadCycle at around 900mm/min +#define TMC2130_THIGH 0 // THIGH - unused + +//#define TMC2130_TCOOLTHRS_X 450 // TCOOLTHRS - coolstep treshold +//#define TMC2130_TCOOLTHRS_Y 450 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_X 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Y 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Z 500 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_E 500 // TCOOLTHRS - coolstep treshold + +#define TMC2130_SG_HOMING 1 // stallguard homing +#define TMC2130_SG_THRS_X 3 // stallguard sensitivity for X axis +#define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis +#define TMC2130_SG_THRS_Z 4 // stallguard sensitivity for Z axis +#define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis +#define TMC2130_SG_THRS_HOME {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E} + +//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) +#define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes +#define TMC2130_CURRENTS_FARM 36 // E 805 mA peak for ECool/farm mode +#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_STEALTH_Z +#define TMC2130_DEDGE_STEPPING + +//#define TMC2130_SERVICE_CODES_M910_M918 + +//#define TMC2130_DEBUG +//#define TMC2130_DEBUG_WR +//#define TMC2130_DEBUG_RD + + +/*------------------------------------ + EXTRUDER SETTINGS + *------------------------------------*/ + +// Mintemps +#define HEATER_0_MINTEMP 10 +#define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if HEATER_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" +#endif +#define BED_MINTEMP 10 +#define BED_MINTEMP_DELAY 50000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if BED_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" +#endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP 10 +//#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) +#define HEATER_0_MAXTEMP 410 +#else +#define HEATER_0_MAXTEMP 305 +#endif +#define BED_MAXTEMP 125 +#define AMBIENT_MAXTEMP 100 + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_Kp 21.70 +#define DEFAULT_Ki 1.60 +#define DEFAULT_Kd 73.76 +#elif HOTEND == 2 //E3D REVO PID values +#define DEFAULT_Kp 16.13 +#define DEFAULT_Ki 1.1625 +#define DEFAULT_Kd 56.23 +#else // E3D v6 PID values +// Define PID constants for extruder +//#define DEFAULT_Kp 40.925 +//#define DEFAULT_Ki 4.875 +//#define DEFAULT_Kd 86.085 +#define DEFAULT_Kp 16.13 +#define DEFAULT_Ki 1.1625 +#define DEFAULT_Kd 56.23 +#endif + +// Extrude mintemp +#define EXTRUDE_MINTEMP 175 + +// Extruder cooling fans +#define EXTRUDER_0_AUTO_FAN_PIN 8 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed + +#define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically +#define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan + +/*------------------------------------ + CHANGE FILAMENT SETTINGS + *------------------------------------*/ + +// Filament change configuration +#define FILAMENTCHANGEENABLE +#ifdef FILAMENTCHANGEENABLE +#define FILAMENTCHANGE_XPOS 211 +#define FILAMENTCHANGE_YPOS 0 +#define FILAMENTCHANGE_ZADD 2 +#define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 + +#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) +#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) +#define FILAMENTCHANGE_RECFEED 5 + +#define FILAMENTCHANGE_XYFEED 50 +#define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600) +#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701) +//#define FILAMENTCHANGE_RFEED 400 +#define FILAMENTCHANGE_RFEED 7000 / 60 +#define FILAMENTCHANGE_EXFEED 2 +#define FILAMENTCHANGE_ZFEED 15 + +#endif + +/*------------------------------------ + ADDITIONAL FEATURES SETTINGS + *------------------------------------*/ + +// temperature runaway +#define TEMP_RUNAWAY_BED_HYSTERESIS 5 +#define TEMP_RUNAWAY_BED_TIMEOUT 360 + +#define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 +#define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 + +// model-based temperature check +#define TEMP_MODEL 1 // enable model-based temperature checks +#define TEMP_MODEL_DEBUG 1 // extended runtime logging + +#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit +#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit +#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit + +#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit +#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit +#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit + +#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) + +#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction + +#if HOTEND == 1 +#include "temp_model/e3d_v6.h" +#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters +#elif HOTEND == 2 +#include "temp_model/e3d_REVO.h" +#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +#endif + +/*------------------------------------ + MOTOR CURRENT SETTINGS + *------------------------------------*/ + +// Motor Current settings for Einsy/tmc = 0..63 +#define MOTOR_CURRENT_PWM_RANGE 63 + +/*------------------------------------ + BED SETTINGS + *------------------------------------*/ + +// Define Mesh Bed Leveling system to enable it +#define MESH_BED_LEVELING +#ifdef MESH_BED_LEVELING + +#define MBL_Z_STEP 0.01 + +// Mesh definitions +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 +#define MESH_MIN_Y 6 +#define MESH_MAX_Y 210 + +// Mesh upsample definition +#define MESH_NUM_X_POINTS 7 +#define MESH_NUM_Y_POINTS 7 +// Mesh measure definition +#define MESH_MEAS_NUM_X_POINTS 3 +#define MESH_MEAS_NUM_Y_POINTS 3 + +// Maximum bed level correction value +#define BED_ADJUSTMENT_UM_MAX 100 + +#define MESH_HOME_Z_CALIB 0.2 +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. + +#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right +#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind +#define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) +#endif + +// Bed Temperature Control +// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis +// +// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. +// If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz, +// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. +// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. +// If your configuration is significantly different than this and you don't understand the issues involved, you probably +// shouldn't use bed PID until someone else verifies your hardware works. +// If this is enabled, find your own PID constants below. +#define PIDTEMPBED +// +//#define BED_LIMIT_SWITCHING + +// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. +// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) +// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, +// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +// Bed temperature compensation settings +#define BED_OFFSET 10 +#define BED_OFFSET_START 40 +#define BED_OFFSET_CENTER 50 + + +#ifdef PIDTEMPBED +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) +#if defined(E3D_PT100_BED_WITH_AMP) || defined(E3D_PT100_BED_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_bedKp 21.70 +#define DEFAULT_bedKi 1.60 +#define DEFAULT_bedKd 73.76 +#else +#define DEFAULT_bedKp 126.13 +#define DEFAULT_bedKi 4.30 +#define DEFAULT_bedKd 924.76 +#endif + +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from pidautotune +// #define DEFAULT_bedKp 97.1 +// #define DEFAULT_bedKi 1.41 +// #define DEFAULT_bedKd 1675.16 + +// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + +/*----------------------------------- + PREHEAT SETTINGS + *------------------------------------*/ + +#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 + +#define PC_PREHEAT_HOTEND_TEMP 275 +#define PC_PREHEAT_HPB_TEMP 110 + +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + +#define ABS_PREHEAT_HOTEND_TEMP 255 +#define ABS_PREHEAT_HPB_TEMP 100 + +#define HIPS_PREHEAT_HOTEND_TEMP 220 +#define HIPS_PREHEAT_HPB_TEMP 100 + +#define PP_PREHEAT_HOTEND_TEMP 254 +#define PP_PREHEAT_HPB_TEMP 100 + +#define PET_PREHEAT_HOTEND_TEMP 230 +#define PET_PREHEAT_HPB_TEMP 85 + +#define FLEX_PREHEAT_HOTEND_TEMP 240 +#define FLEX_PREHEAT_HPB_TEMP 50 + +/*------------------------------------ + THERMISTORS SETTINGS + *------------------------------------*/ + +// +//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table +// +//// Temperature sensor settings: +// -2 is thermocouple with MAX6675 (only for sensor 0) +// -1 is thermocouple with AD595 +// 0 is not used +// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) +// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) +// 3 is Mendel-parts thermistor (4.7k pullup) +// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! +// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) +// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) +// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) +// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) +// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) +// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) +// 10 is 100k RS thermistor 198-961 (4.7k pullup) +// 11 is 100k beta 3950 1% thermistor (4.7k pullup) +// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) +// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" +// 20 is the PT100 circuit found in the Ultimainboard V2.x +// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 +// +// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k +// (but gives greater accuracy and more stable PID) +// 51 is 100k thermistor - EPCOS (1k pullup) +// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) +// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) +// +// 1047 is Pt1000 with 4k7 pullup +// 1010 is Pt1000 with 1k pullup (non standard) +// 147 is Pt100 with 4k7 pullup +// 148 is E3D Pt100 with 4k7 pullup and no PT100 Amplifier on a MiniRambo 1.3a +// 247 is Pt100 with 4k7 pullup and PT100 Amplifier +// 110 is Pt100 with 1k pullup (non standard) + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) +#define TEMP_SENSOR_0 247 +#elif defined(E3D_PT100_EXTRUDER_NO_AMP) +#define TEMP_SENSOR_0 148 +#else +#define TEMP_SENSOR_0 5 +#endif +#if defined(E3D_PT100_BED_WITH_AMP) +#define TEMP_SENSOR_BED 247 +#elif defined(E3D_PT100_BED_NO_AMP) +#define TEMP_SENSOR_BED 148 +#else +#define TEMP_SENSOR_BED 1 +#endif +#define TEMP_SENSOR_PINDA 1 +#define TEMP_SENSOR_AMBIENT 2000 + +#define STACK_GUARD_TEST_VALUE 0xA2A2 +#define STACK_GUARD_MARGIN 32 + +#define MAX_BED_TEMP_CALIBRATION 50 +#define MAX_HOTEND_TEMP_CALIBRATION 50 + +#define MAX_E_STEPS_PER_UNIT 250 +#define MIN_E_STEPS_PER_UNIT 100 + +#define Z_BABYSTEP_MIN -3999 +#define Z_BABYSTEP_MAX 0 + +#define PINDA_PREHEAT_X 20 +#define PINDA_PREHEAT_Y 60 +#define PINDA_PREHEAT_Z 0.15 +/* +#define PINDA_PREHEAT_X 70 +#define PINDA_PREHEAT_Y -3 +#define PINDA_PREHEAT_Z 1*/ +#define PINDA_HEAT_T 120 //time in s + +#define PINDA_MIN_T 50 +#define PINDA_STEP_T 10 +#define PINDA_MAX_T 100 + +#define LONG_PRESS_TIME 1000 //time in ms for button long press +#define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release + +#define DEFAULT_PID_TEMP 210 + +#define MIN_PRINT_FAN_SPEED 75 + + +// How much shall the print head be lifted on power panic? +// Ideally the Z axis will reach a zero phase of the stepper driver on power outage. To simplify this, +// UVLO_Z_AXIS_SHIFT shall be an integer multiply of the stepper driver cycle, that is 4x full step. +// For example, the Prusa i3 MK2 with 16 microsteps per full step has Z stepping of 400 microsteps per mm. +// At 400 microsteps per mm, a full step lifts the Z axis by 0.04mm, and a stepper driver cycle is 0.16mm. +// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm. +//#define UVLO_Z_AXIS_SHIFT 1.92 +#define UVLO_Z_AXIS_SHIFT 0.64 +// When powered off during PP recovery, the Z axis position can still be re-adjusted. In this case +// we just need to shift to the nearest fullstep, but we need a move which is at least +// "dropsegments" steps long. All the above rules still need to apply. +#define UVLO_TINY_Z_AXIS_SHIFT 0.16 +// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. +#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5 + +#define HEATBED_V2 + +#define M600_TIMEOUT 600 //seconds + +//#define SUPPORT_VERBOSITY + +#define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" +#define MMU_FILAMENT_COUNT 5 +//#define MMU_FORCE_STEALTH_MODE +#define MMU_HWRESET +#define MMU_DEBUG //print communication between MMU and printer on serial +#define MMU_HAS_CUTTER + +// MMU Error pause position +#define MMU_ERR_X_PAUSE_POS 125 +#define MMU_ERR_Y_PAUSE_POS 0 +#define MMU_ERR_Z_PAUSE_LIFT 20 + +// Default Arc Interpolation Settings (Now configurable via M214) +#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections. +/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the + cost of performance*/ +#define DEFAULT_MM_PER_ARC_SEGMENT 1.0f // REQUIRED - The enforced maximum length of an arc segment +#define DEFAULT_MIN_MM_PER_ARC_SEGMENT 0.5f //the enforced minimum length of an interpolated segment + /* MIN_MM_PER_ARC_SEGMENT Must be smaller than MM_PER_ARC_SEGMENT. Only has an effect if MIN_ARC_SEGMENTS > 0 + or ARC_SEGMENTS_PER_SEC > 0 . If both MIN_ARC_SEGMENTS and ARC_SEGMENTS_PER_SEC is defined, the minimum + calculated segment length is used. */ +#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable +#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable + +#endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 21adab2d1..57d581b33 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -15,7 +15,12 @@ #define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define FILAMENT_SIZE "1_75mm_MK3" +#define HOTEND 1 //1= E3Dv6 2= E3D REVO +#if HOTEND == 1 #define NOZZLE_TYPE "E3Dv6full" +#elif HOTEND ==2 +#define NOZZLE_TYPE "E3DREVO" +#endif // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3" @@ -326,7 +331,11 @@ #define DEFAULT_Kp 21.70 #define DEFAULT_Ki 1.60 #define DEFAULT_Kd 73.76 -#else +#elif HOTEND == 2 //E3D REVO PID values +#define DEFAULT_Kp 16.13 +#define DEFAULT_Ki 1.1625 +#define DEFAULT_Kd 56.23 +#else // E3D v6 PID values // Define PID constants for extruder //#define DEFAULT_Kp 40.925 //#define DEFAULT_Ki 4.875 @@ -404,9 +413,13 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#if HOTEND == 1 #include "temp_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters - +#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters +#elif HOTEND == 2 +#include "temp_model/e3d_REVO.h" +#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +#endif /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h new file mode 100644 index 000000000..9d5d0128e --- /dev/null +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -0,0 +1,696 @@ +#ifndef CONFIGURATION_PRUSA_H +#define CONFIGURATION_PRUSA_H + +#include +#include "printers.h" +/*------------------------------------ + GENERAL SETTINGS + *------------------------------------*/ + +// Printer revision +#define PRINTER_TYPE PRINTER_MK3S +#define PRINTER_NAME PRINTER_MK3S_NAME +#define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define FILAMENT_SIZE "1_75mm_MK3S" +#define HOTEND 2 //1= E3Dv6 2= E3D REVO +#if HOTEND == 1 +#define NOZZLE_TYPE "E3Dv6full" +#elif HOTEND ==2 +#define NOZZLE_TYPE "E3DREVO" +#endif + +// Printer name +#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-R" + +// Electronics +#define MOTHERBOARD BOARD_EINSY_1_0a +#define STEEL_SHEET +#define HAS_SECOND_SERIAL_PORT + +// PSU +// #define PSU_Delta // uncomment if DeltaElectronics PSU installed + + +// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) +//#define E3D_PT100_EXTRUDER_WITH_AMP +//#define E3D_PT100_EXTRUDER_NO_AMP +//#define E3D_PT100_BED_WITH_AMP +//#define E3D_PT100_BED_NO_AMP + + +/*------------------------------------ + AXIS SETTINGS + *------------------------------------*/ + +// Steps per unit {X,Y,Z,E} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} + +// Endstop inverting +#define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. + +// Direction inverting +#define INVERT_X_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 +#define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 + +// Home position +#define MANUAL_X_HOME_POS 0 +#define MANUAL_Y_HOME_POS -2.2 +#define MANUAL_Z_HOME_POS 0.2 + +// Travel limits after homing +#define X_MAX_POS 255 +#define X_MIN_POS 0 +#define Y_MAX_POS 212.5 +#define Y_MIN_POS -4 //orig -4 +#define Z_MAX_POS 210 +#define Z_MIN_POS 0.15 + +// Canceled home position +#define X_CANCEL_POS 50 +#define Y_CANCEL_POS 190 +#define Z_CANCEL_LIFT 50 + +//Pause print position +#define X_PAUSE_POS 50 +#define Y_PAUSE_POS 190 +#define Z_PAUSE_LIFT 20 + +#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E +#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) // 3000 is also valid for stallGuard homing. Valid range: 2200 - 3000 + +//#define DEFAULT_Y_OFFSET 4.f // Default distance of Y_MIN_POS point from endstop, when the printer is not calibrated. +/** + * [0,0] steel sheet print area point X coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_X 0.f +/** + * [0,0] steel sheet print area point Y coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_Y -2.f + +#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) +#define DEFAULT_MAX_FEEDRATE_SILENT {100, 100, 12, 120} // (mm/sec) max feedrate (M203), silent mode + +#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_ACCELERATION_SILENT {960, 960, 200, 5000} // (mm/sec^2) max acceleration (M201), silent mode + + +#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204P) +#define DEFAULT_RETRACT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for retracts (M204R) +#define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for travels (M204T) + +#define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) + +//Silent mode limits +#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_FEEDRATE_XY 100 // max feedrate in mm/s + +//Normal mode limits +#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2 +#define NORMAL_MAX_FEEDRATE_XY 200 // max feedrate in mm/s + +//number of bytes from end of the file to start check +#define END_FILE_SECTION 20000 + +#define Z_AXIS_ALWAYS_ON 1 + +//Crash detection +#define CRASHDET_TIMER 45 //seconds +#define CRASHDET_COUNTER_MAX 3 + +// New XYZ calibration +#define NEW_XYZCAL + +// Watchdog support +#define WATCHDOG + +// Power panic +#define UVLO_SUPPORT + +// Fan check +#define FANCHECK + +// Safety timer +#define SAFETYTIMER +#define DEFAULT_SAFETYTIMER_TIME_MINS 30 + +// Offline crash dumper +#define XFLASH_DUMP // enable dump functionality (including D20/D21/D22) +#define MENU_DUMP // enable "Memory dump" in Settings menu +#define EMERGENCY_DUMP // trigger crash on stack corruption and WDR + +// Online crash dumper +//#define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR +//#define MENU_SERIAL_DUMP // Enable "Memory dump" in Settings menu + +// Filament sensor +#define FILAMENT_SENSOR +#define FILAMENT_SENSOR_TYPE FSENSOR_IR_ANALOG +#define FSENSOR_PROBING + +// Backlash - +//#define BACKLASH_X +//#define BACKLASH_Y + + +// Minimum ambient temperature limit to start triggering MINTEMP errors [C] +// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it, +// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle +// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater) +#define MINTEMP_MINAMBIENT 10 +#define MINTEMP_MINAMBIENT_RAW 1002 + +#define DEBUG_DCODE2 +#define DEBUG_DCODE3 +#define DEBUG_DCODE6 + +//#define DEBUG_PULLUP_CRASH //Test Pullup crash + +//#define DEBUG_BUILD +//#define DEBUG_SEC_LANG //secondary language debug output at startup +//#define DEBUG_XFLASH //debug external spi flash +#ifdef DEBUG_BUILD +//#define _NO_ASM +#define DEBUG_DCODES //D codes +#define DEBUG_STACK_MONITOR //Stack monitor in stepper ISR +//#define DEBUG_CRASHDET_COUNTERS //Display crash-detection counters on LCD +//#define DEBUG_RESUME_PRINT //Resume/save print debug enable +//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output +//#define DEBUG_DISABLE_XMINLIMIT //x min limit ignored +//#define DEBUG_DISABLE_XMAXLIMIT //x max limit ignored +//#define DEBUG_DISABLE_YMINLIMIT //y min limit ignored +//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored +//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored +//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored +#define DEBUG_DISABLE_STARTMSGS //no startup messages +//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored +//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored +//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line +//#define DEBUG_DISABLE_PREVENT_EXTRUDER //cold extrusion and long extrusion allowed +//#define DEBUG_DISABLE_FORCE_SELFTEST //disable force selftest +//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3) +//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3) +//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) +//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) +#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line +#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. +#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. +#define CMD_DIAGNOSTICS //Show cmd queue length on printer display +#endif /* DEBUG_BUILD */ + + +#define LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION_XYZ +#define TMC2130_VARIABLE_RESOLUTION + + + +/*------------------------------------ + TMC2130 default settings + *------------------------------------*/ + +#define TMC2130_FCLK 12000000 // fclk = 12MHz + +#define TMC2130_USTEPS_XY 16 // microstep resolution for XY axes +#define TMC2130_USTEPS_Z 16 // microstep resolution for Z axis +#define TMC2130_USTEPS_E 32 // microstep resolution for E axis +#define TMC2130_INTPOL_XY 1 // extrapolate 256 for XY axes +#define TMC2130_INTPOL_Z 1 // extrapolate 256 for Z axis +#define TMC2130_INTPOL_E 1 // extrapolate 256 for E axis +// #define ALLOW_ALL_MRES + +#define TMC2130_PWM_GRAD_X 2 // PWMCONF +#define TMC2130_PWM_AMPL_X 230 // PWMCONF +#define TMC2130_PWM_AUTO_X 1 // PWMCONF +#define TMC2130_PWM_FREQ_X 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Y 2 // PWMCONF +#define TMC2130_PWM_AMPL_Y 235 // PWMCONF +#define TMC2130_PWM_AUTO_Y 1 // PWMCONF +#define TMC2130_PWM_FREQ_Y 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Z 4 // PWMCONF +#define TMC2130_PWM_AMPL_Z 200 // PWMCONF +#define TMC2130_PWM_AUTO_Z 1 // PWMCONF +#define TMC2130_PWM_FREQ_Z 2 // PWMCONF + +#define TMC2130_PWM_GRAD_E 4 // PWMCONF +#define TMC2130_PWM_AMPL_E 240 // PWMCONF +#define TMC2130_PWM_AUTO_E 1 // PWMCONF +#define TMC2130_PWM_FREQ_E 2 // PWMCONF + +// experimental setting for E-motor cooler operation +#define TMC2130_PWM_GRAD_Ecool 84 // PWMCONF 730mA @ 375mm/min 970mA phase peak at feedrate 900mm/min +#define TMC2130_PWM_AMPL_Ecool 43 // PWMCONF 500mA phase peak at feedrate 10 mm/min +#define TMC2130_PWM_AUTO_Ecool 0 // PWMCONF + +#define TMC2130_TOFF_XYZ 3 // CHOPCONF // fchop = 27.778kHz +#define TMC2130_TOFF_E 3 // CHOPCONF // fchop = 27.778kHz +//#define TMC2130_TOFF_E 4 // CHOPCONF // fchop = 21.429kHz +//#define TMC2130_TOFF_E 5 // CHOPCONF // fchop = 17.442kHz + +//#define TMC2130_STEALTH_E // Extruder stealthChop mode +//#define TMC2130_CNSTOFF_E // Extruder constant-off-time mode (similar to MK2) + +//#define TMC2130_PWM_DIV 683 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_DIV 512 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_CLK (2 * TMC2130_FCLK / TMC2130_PWM_DIV) // PWM frequency (23.4kHz, 35.1kHz, 46.9kHz, 58.5kHz for 12MHz fclk) + +#define TMC2130_TPWMTHRS 0 // TPWMTHRS - Sets the switching speed threshold based on TSTEP from stealthChop to spreadCycle mode +#define TMC2130_TPWMTHRS_E 403 // Switch extruder from StealthChop to SpreadCycle at around 900mm/min +#define TMC2130_THIGH 0 // THIGH - unused + +//#define TMC2130_TCOOLTHRS_X 450 // TCOOLTHRS - coolstep treshold +//#define TMC2130_TCOOLTHRS_Y 450 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_X 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Y 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Z 500 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_E 500 // TCOOLTHRS - coolstep treshold + +#define TMC2130_SG_HOMING 1 // stallguard homing +#define TMC2130_SG_THRS_X 3 // stallguard sensitivity for X axis +#define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis +#define TMC2130_SG_THRS_Z 4 // stallguard sensitivity for Z axis +#define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis +#define TMC2130_SG_THRS_HOME {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E} + +//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) +#define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes +#define TMC2130_CURRENTS_FARM 36 // E 805 mA peak for ECool/farm mode +#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_STEALTH_Z +#define TMC2130_DEDGE_STEPPING + +//#define TMC2130_SERVICE_CODES_M910_M918 + +//#define TMC2130_DEBUG +//#define TMC2130_DEBUG_WR +//#define TMC2130_DEBUG_RD + + +/*------------------------------------ + EXTRUDER SETTINGS + *------------------------------------*/ + +// Mintemps +#define HEATER_0_MINTEMP 10 +#define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if HEATER_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" +#endif +#define BED_MINTEMP 10 +#define BED_MINTEMP_DELAY 50000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if BED_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" +#endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP 10 +//#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) +#define HEATER_0_MAXTEMP 410 +#else +#define HEATER_0_MAXTEMP 305 +#endif +#define BED_MAXTEMP 125 +#define AMBIENT_MAXTEMP 100 + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_Kp 21.70 +#define DEFAULT_Ki 1.60 +#define DEFAULT_Kd 73.76 +#elif HOTEND == 2 //E3D REVO PID values +#define DEFAULT_Kp 16.13 +#define DEFAULT_Ki 1.1625 +#define DEFAULT_Kd 56.23 +#else // E3D v6 PID values +// Define PID constants for extruder +//#define DEFAULT_Kp 40.925 +//#define DEFAULT_Ki 4.875 +//#define DEFAULT_Kd 86.085 +#define DEFAULT_Kp 16.13 +#define DEFAULT_Ki 1.1625 +#define DEFAULT_Kd 56.23 +#endif + +// Extrude mintemp +#define EXTRUDE_MINTEMP 175 + +// Extruder cooling fans +#define EXTRUDER_0_AUTO_FAN_PIN 8 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed +#define EXTRUDER_ALTFAN_DETECT +#define EXTRUDER_ALTFAN_SPEED_SILENT 128 + +#define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically +#define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan + +/*------------------------------------ + CHANGE FILAMENT SETTINGS + *------------------------------------*/ + +// Filament change configuration +#define FILAMENTCHANGEENABLE +#ifdef FILAMENTCHANGEENABLE +#define FILAMENTCHANGE_XPOS 211 +#define FILAMENTCHANGE_YPOS 0 +#define FILAMENTCHANGE_ZADD 2 +#define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 + +#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) +#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) +#define FILAMENTCHANGE_RECFEED 5 + +#define FILAMENTCHANGE_XYFEED 50 +#define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600) +#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701) +//#define FILAMENTCHANGE_RFEED 400 +#define FILAMENTCHANGE_RFEED 7000 / 60 +#define FILAMENTCHANGE_EXFEED 2 +#define FILAMENTCHANGE_ZFEED 15 + +#endif + +/*------------------------------------ + ADDITIONAL FEATURES SETTINGS + *------------------------------------*/ + +// temperature runaway +#define TEMP_RUNAWAY_BED_HYSTERESIS 5 +#define TEMP_RUNAWAY_BED_TIMEOUT 360 + +#define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 +#define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 + +// model-based temperature check +#define TEMP_MODEL 1 // enable model-based temperature checks +#define TEMP_MODEL_DEBUG 1 // extended runtime logging + +#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit +#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit +#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit + +#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit +#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit +#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit + +#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) + +#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction + +#if HOTEND == 1 +#include "temp_model/e3d_v6.h" +#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters +#elif HOTEND == 2 +#include "temp_model/e3d_REVO.h" +#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +#endif + +/*------------------------------------ + MOTOR CURRENT SETTINGS + *------------------------------------*/ + +// Motor Current settings for Einsy/tmc = 0..63 +#define MOTOR_CURRENT_PWM_RANGE 63 + +/*------------------------------------ + BED SETTINGS + *------------------------------------*/ + +// Define Mesh Bed Leveling system to enable it +#define MESH_BED_LEVELING +#ifdef MESH_BED_LEVELING + +#define MBL_Z_STEP 0.01 + +// Mesh definitions +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 +#define MESH_MIN_Y 6 +#define MESH_MAX_Y 210 + +// Mesh upsample definition +#define MESH_NUM_X_POINTS 7 +#define MESH_NUM_Y_POINTS 7 +// Mesh measure definition +#define MESH_MEAS_NUM_X_POINTS 3 +#define MESH_MEAS_NUM_Y_POINTS 3 + +// Maximum bed level correction value +#define BED_ADJUSTMENT_UM_MAX 100 + +#define MESH_HOME_Z_CALIB 0.2 +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. + +#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right +#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind +#define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) +#endif + +// Bed Temperature Control +// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis +// +// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. +// If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz, +// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. +// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. +// If your configuration is significantly different than this and you don't understand the issues involved, you probably +// shouldn't use bed PID until someone else verifies your hardware works. +// If this is enabled, find your own PID constants below. +#define PIDTEMPBED +// +//#define BED_LIMIT_SWITCHING + +// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. +// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) +// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, +// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +// Bed temperature compensation settings +#define BED_OFFSET 10 +#define BED_OFFSET_START 40 +#define BED_OFFSET_CENTER 50 + + +#ifdef PIDTEMPBED +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) +#if defined(E3D_PT100_BED_WITH_AMP) || defined(E3D_PT100_BED_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_bedKp 21.70 +#define DEFAULT_bedKi 1.60 +#define DEFAULT_bedKd 73.76 +#else +#define DEFAULT_bedKp 126.13 +#define DEFAULT_bedKi 4.30 +#define DEFAULT_bedKd 924.76 +#endif + +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from pidautotune +// #define DEFAULT_bedKp 97.1 +// #define DEFAULT_bedKi 1.41 +// #define DEFAULT_bedKd 1675.16 + +// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + +/*----------------------------------- + PREHEAT SETTINGS + *------------------------------------*/ + +#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 + +#define PC_PREHEAT_HOTEND_TEMP 275 +#define PC_PREHEAT_HPB_TEMP 110 + +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + +#define ABS_PREHEAT_HOTEND_TEMP 255 +#define ABS_PREHEAT_HPB_TEMP 100 + +#define HIPS_PREHEAT_HOTEND_TEMP 220 +#define HIPS_PREHEAT_HPB_TEMP 100 + +#define PP_PREHEAT_HOTEND_TEMP 254 +#define PP_PREHEAT_HPB_TEMP 100 + +#define PET_PREHEAT_HOTEND_TEMP 230 +#define PET_PREHEAT_HPB_TEMP 85 + +#define FLEX_PREHEAT_HOTEND_TEMP 240 +#define FLEX_PREHEAT_HPB_TEMP 50 + +/*------------------------------------ + THERMISTORS SETTINGS + *------------------------------------*/ + +// +//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table +// +//// Temperature sensor settings: +// -2 is thermocouple with MAX6675 (only for sensor 0) +// -1 is thermocouple with AD595 +// 0 is not used +// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) +// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) +// 3 is Mendel-parts thermistor (4.7k pullup) +// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! +// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) +// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) +// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) +// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) +// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) +// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) +// 10 is 100k RS thermistor 198-961 (4.7k pullup) +// 11 is 100k beta 3950 1% thermistor (4.7k pullup) +// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) +// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" +// 20 is the PT100 circuit found in the Ultimainboard V2.x +// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 +// +// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k +// (but gives greater accuracy and more stable PID) +// 51 is 100k thermistor - EPCOS (1k pullup) +// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) +// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) +// +// 1047 is Pt1000 with 4k7 pullup +// 1010 is Pt1000 with 1k pullup (non standard) +// 147 is Pt100 with 4k7 pullup +// 148 is E3D Pt100 with 4k7 pullup and no PT100 Amplifier on a MiniRambo 1.3a +// 247 is Pt100 with 4k7 pullup and PT100 Amplifier +// 110 is Pt100 with 1k pullup (non standard) + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) +#define TEMP_SENSOR_0 247 +#elif defined(E3D_PT100_EXTRUDER_NO_AMP) +#define TEMP_SENSOR_0 148 +#else +#define TEMP_SENSOR_0 5 +#endif +#if defined(E3D_PT100_BED_WITH_AMP) +#define TEMP_SENSOR_BED 247 +#elif defined(E3D_PT100_BED_NO_AMP) +#define TEMP_SENSOR_BED 148 +#else +#define TEMP_SENSOR_BED 1 +#endif +#define TEMP_SENSOR_PINDA 1 +#define TEMP_SENSOR_AMBIENT 2000 + +#define STACK_GUARD_TEST_VALUE 0xA2A2 +#define STACK_GUARD_MARGIN 32 + +#define MAX_BED_TEMP_CALIBRATION 50 +#define MAX_HOTEND_TEMP_CALIBRATION 50 + +#define MAX_E_STEPS_PER_UNIT 250 +#define MIN_E_STEPS_PER_UNIT 100 + +#define Z_BABYSTEP_MIN -3999 +#define Z_BABYSTEP_MAX 0 + +#define PINDA_PREHEAT_X 20 +#define PINDA_PREHEAT_Y 60 +#define PINDA_PREHEAT_Z 0.15 +/* +#define PINDA_PREHEAT_X 70 +#define PINDA_PREHEAT_Y -3 +#define PINDA_PREHEAT_Z 1*/ +#define PINDA_HEAT_T 120 //time in s + +#define PINDA_MIN_T 50 +#define PINDA_STEP_T 10 +#define PINDA_MAX_T 100 + +#define LONG_PRESS_TIME 1000 //time in ms for button long press +#define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release + +#define DEFAULT_PID_TEMP 210 + +#define MIN_PRINT_FAN_SPEED 75 + + +// How much shall the print head be lifted on power panic? +// Ideally the Z axis will reach a zero phase of the stepper driver on power outage. To simplify this, +// UVLO_Z_AXIS_SHIFT shall be an integer multiply of the stepper driver cycle, that is 4x full step. +// For example, the Prusa i3 MK2 with 16 microsteps per full step has Z stepping of 400 microsteps per mm. +// At 400 microsteps per mm, a full step lifts the Z axis by 0.04mm, and a stepper driver cycle is 0.16mm. +// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm. +//#define UVLO_Z_AXIS_SHIFT 1.92 +#define UVLO_Z_AXIS_SHIFT 0.64 +// When powered off during PP recovery, the Z axis position can still be re-adjusted. In this case +// we just need to shift to the nearest fullstep, but we need a move which is at least +// "dropsegments" steps long. All the above rules still need to apply. +#define UVLO_TINY_Z_AXIS_SHIFT 0.16 +// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. +#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5 + +#define HEATBED_V2 + +#define M600_TIMEOUT 600 //seconds + +//#define SUPPORT_VERBOSITY + +#define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" +#define MMU_FILAMENT_COUNT 5 +//#define MMU_FORCE_STEALTH_MODE +#define MMU_HWRESET +#define MMU_DEBUG //print communication between MMU and printer on serial +#define MMU_HAS_CUTTER + +// This is experimental feature requested by our test department. +// There is no known use for ordinary user. If enabled by this macro +// and enabled from printer menu (not enabled by default). It cuts filament +// every time when switching filament from gcode. MMU_HAS_CUTTER needs to be +// defined. + +//#define MMU_ALWAYS_CUT + +// MMU Error pause position +#define MMU_ERR_X_PAUSE_POS 125 +#define MMU_ERR_Y_PAUSE_POS 0 +#define MMU_ERR_Z_PAUSE_LIFT 20 + +// Default Arc Interpolation Settings (Now configurable via M214) +#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections. +/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the + cost of performance*/ +#define DEFAULT_MM_PER_ARC_SEGMENT 1.0f // REQUIRED - The enforced maximum length of an arc segment +#define DEFAULT_MIN_MM_PER_ARC_SEGMENT 0.5f //the enforced minimum length of an interpolated segment + /* MIN_MM_PER_ARC_SEGMENT Must be smaller than MM_PER_ARC_SEGMENT. Only has an effect if MIN_ARC_SEGMENTS > 0 + or ARC_SEGMENTS_PER_SEC > 0 . If both MIN_ARC_SEGMENTS and ARC_SEGMENTS_PER_SEC is defined, the minimum + calculated segment length is used. */ +#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable +#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable + +#endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index ee7550acd..3be525327 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -14,7 +14,12 @@ #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define FILAMENT_SIZE "1_75mm_MK3S" +#define HOTEND 1 //1= E3Dv6 2= E3D REVO +#if HOTEND == 1 #define NOZZLE_TYPE "E3Dv6full" +#elif HOTEND ==2 +#define NOZZLE_TYPE "E3DREVO" +#endif // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S" @@ -328,7 +333,11 @@ #define DEFAULT_Kp 21.70 #define DEFAULT_Ki 1.60 #define DEFAULT_Kd 73.76 -#else +#elif HOTEND == 2 //E3D REVO PID values +#define DEFAULT_Kp 16.13 +#define DEFAULT_Ki 1.1625 +#define DEFAULT_Kd 56.23 +#else // E3D v6 PID values // Define PID constants for extruder //#define DEFAULT_Kp 40.925 //#define DEFAULT_Ki 4.875 @@ -408,9 +417,13 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#if HOTEND == 1 #include "temp_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters - +#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters +#elif HOTEND == 2 +#include "temp_model/e3d_REVO.h" +#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +#endif /*------------------------------------ MOTOR CURRENT SETTINGS From 7b0ec5b7590edc6448199c9d6894d3717e674238 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 25 May 2023 09:59:18 +0200 Subject: [PATCH 032/148] Add REVO to lagacy build --- .github/travis/legacy-build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/travis/legacy-build.sh b/.github/travis/legacy-build.sh index 063ef62ec..d25c70b4a 100755 --- a/.github/travis/legacy-build.sh +++ b/.github/travis/legacy-build.sh @@ -19,4 +19,8 @@ bash -x build.sh || { echo "1_75mm_MK25-RAMBo13a-E3Dv6full variant failed" && fa rm Firmware/Configuration_prusa.h cp Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h Firmware/Configuration_prusa.h bash -x build.sh || { echo "1_75mm_MK25-RAMBo10a-E3Dv6full variant failed" && false; } +cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO variant failed" && false; } +cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO variant failed" && false; } rm Firmware/Configuration_prusa.h From 02f7c7efc02a922eed521a8c6192c292bde323d4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 26 May 2023 07:34:06 +0200 Subject: [PATCH 033/148] Add README_variants --- Firmware/variants/README_variants.txt | 110 ++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 Firmware/variants/README_variants.txt diff --git a/Firmware/variants/README_variants.txt b/Firmware/variants/README_variants.txt new file mode 100644 index 000000000..0c7607510 --- /dev/null +++ b/Firmware/variants/README_variants.txt @@ -0,0 +1,110 @@ +With FW 3.12.0 we introduced the Thermal model see [here](https://blog.prusa3d.com/mk3s-3-12-beta-firmware-new-thermal-model-protection-and-blob-detection_71230). +This have been finetuned for the stock Prusa MK3/S and may cause issues with 3rd party hotends. + +This README is a guide for the community and the 3rd party companies to prepare/compile/build their own firmware. + +Thanks to E3D and the some REVO community members see [here](https://github.com/prusa3d/Prusa-Firmware/issues/4105) and [here](https://github.com/prusa3d/Prusa-Firmware/issues/3636) we have been able to provide the source code to build the E3D REVO firmware. + +There are other 3rd party hotends which the community uses. + +Steps to add a new 3rd party hotend: + +1. Make a copy of the `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3Dv6full.h` with a new name `1_75mm_MK3S-EINSy10a-<3rd party hotend:16>.h` + a. Example for the E3D REVO HF 60W: `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h` +2. Open the new variant file. +3. Add the 3rd party hotend with new number and the description in the comment part `#define HOTEND 1 //1= E3Dv6 2= E3D REVO` + a. Example: `#define HOTEND 3 //1= E3Dv6 2= E3D REVO 3= E3DREVO_HF_60W` +4. Add a new `#elif HOTEND == ` and `#define NOZZLE_TYPE "<3rd party hotend:16>"` + a.Example + ``` + ... + #elif HOTEND ==2 + #define NOZZLE_TYPE "E3DREVO" + #elif HOTEND ==3 + #define NOZZLE_TYPE "E3DREVO_HF_60W" + #endif + ... + ``` +5. Change the `#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-` + a. `CUSTOM_MENDEL_NAME` string cannot exceed 17 chars in total! +6. Add new PID values for the new Hotend type. + a. Search for `#else // E3D v6 PID values` + b. Copy, paste (above `#else // E3D v6 PID values`) and update the new hotend PID default values + ``` + #elif HOTEND == 2 //E3D REVO PID values + #define DEFAULT_Kp 16.13 + #define DEFAULT_Ki 1.1625 + #define DEFAULT_Kd 56.23 + ``` +Example: + ``` + ... + #elif HOTEND == 2 //E3D REVO PID values + #define DEFAULT_Kp 16.13 + #define DEFAULT_Ki 1.1625 + #define DEFAULT_Kd 56.23 + #elif HOTEND == 3 //E3D REVO HF 60W PID values + #define DEFAULT_Kp 23.23 + #define DEFAULT_Ki 1.1 + #define DEFAULT_Kd 55.25 + #else // E3D v6 PID values + ... + ``` +7. Prepare for new 3rd party hotend TM value file + a. Search for `#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters` or the last entry + b. Copy the lines starting with `#elif HOTEND == 2` till the search, paste (above next `#endif`) and update this + ``` + ... + #if HOTEND == 1 + #include "temp_model/e3d_v6.h" + #define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters + #elif HOTEND == 2 + #include "temp_model/e3d_REVO.h" + #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters + #endif + ... + ``` + Example: + + ``` + ... + #if HOTEND == 1 + #include "temp_model/e3d_v6.h" + #define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters + #elif HOTEND == 2 + #include "temp_model/e3d_REVO.h" + #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters + #elif HOTEND == 3 + #include "temp_model/e3d_REVO_HF_60W.h" + #define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters + #endif + ... + ``` +8. Save and close the new variant file +9. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h` + a. Example: `Firmware/temp_model/e3d_REVO_HF_60W.h` +10. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h` +11. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT` + a. Example + ``` + #pragma once + + #define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version + + #define TEMP_MODEL_E3D_REVO_HF_60W_P 40. // heater power (W) + #define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) + #define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) + + #define TEMP_MODEL_E3D_REVO_HF_60W_C 8.77 // initial guess for heatblock capacitance (J/K) + #define TEMP_MODEL_E3D_REVO_HF_60W_R 25.3 // initial guess for heatblock resistance (K/W) + + #define TEMP_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) + #define TEMP_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) + + #define TEMP_MODEL_E3D_REVO_HF_60W_W 1.2 // Default warning threshold (K/s) + #define TEMP_MODEL_E3D_REVO_HF_60W_E 1.74 // Default error threshold (K/s) + + // fall-back resistance vector (R0-15) + #define TEMP_MODEL_E3D_REVO_HF_60W_Rv {TEMP_MODEL_E3D_REVO_HF_60W_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} + +``` From 6ce2026ab7f0abfa8ce69009ae5c37a1b6282998 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 26 May 2023 07:36:39 +0200 Subject: [PATCH 034/148] Rename README in variants folder --- Firmware/variants/{README_variants.txt => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Firmware/variants/{README_variants.txt => README.md} (100%) diff --git a/Firmware/variants/README_variants.txt b/Firmware/variants/README.md similarity index 100% rename from Firmware/variants/README_variants.txt rename to Firmware/variants/README.md From 56dd8f09e77f5a2cddd57acf7e7fd2f0897d54f8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 09:57:22 +0200 Subject: [PATCH 035/148] Fix too long message `MSG_BABYSTEPPING_Z`from c=15 to c=13 Had to remove `:` and update NL translation to fit --- Firmware/ultralcd.cpp | 2 +- lang/po/Firmware.pot | 4 ++-- lang/po/Firmware_cs.po | 6 +++--- lang/po/Firmware_de.po | 6 +++--- lang/po/Firmware_es.po | 6 +++--- lang/po/Firmware_fr.po | 6 +++--- lang/po/Firmware_hr.po | 6 +++--- lang/po/Firmware_hu.po | 6 +++--- lang/po/Firmware_it.po | 6 +++--- lang/po/Firmware_nl.po | 6 +++--- lang/po/Firmware_no.po | 6 +++--- lang/po/Firmware_pl.po | 6 +++--- lang/po/Firmware_ro.po | 6 +++--- lang/po/Firmware_sk.po | 6 +++--- lang/po/Firmware_sv.po | 6 +++--- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 04b232c21..e08c40681 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2592,7 +2592,7 @@ static void lcd_babystep_z() lcd_set_cursor(0, 0); lcd_print(buffer.c); lcd_set_cursor(0, 1); - menu_draw_float13(_i("Adjusting Z:"), _md->babystepMemMMZ); ////MSG_BABYSTEPPING_Z c=15 // Beware: must include the ':' as its last character + menu_draw_float13(_i("Adjusting Z"), _md->babystepMemMMZ); ////MSG_BABYSTEPPING_Z c=13 } if (LCD_CLICKED || menu_leaving) { diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 011591d47..191614af2 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -29,10 +29,10 @@ msgstr "" msgid ">Cancel" msgstr "" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" +msgid "Adjusting Z" msgstr "" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index cf10b606b..e8bee3e7f 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -38,11 +38,11 @@ msgstr "%s ocekavana verze" msgid ">Cancel" msgstr ">Zrusit" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Doladeni Z:" +msgid "Adjusting Z" +msgstr "Doladeni Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 7e960fddd..95d8049be 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -38,11 +38,11 @@ msgstr "%s Level erwartet" msgid ">Cancel" msgstr ">Abbruch" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Z Anpassen:" +msgid "Adjusting Z" +msgstr "Z Anpassen" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 13edf460a..e1f4e078e 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -38,11 +38,11 @@ msgstr "%s nivel esperado" msgid ">Cancel" msgstr ">Cancelar" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Ajustar-Z:" +msgid "Adjusting Z" +msgstr "Ajustar-Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 5375ef7e0..c846fb752 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -38,11 +38,11 @@ msgstr "niveau %s attendu" msgid ">Cancel" msgstr ">Annuler" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Ajuster Z:" +msgid "Adjusting Z" +msgstr "Ajuster Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index e6406ee05..09b5393e0 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -38,11 +38,11 @@ msgstr "%s level ocekivan" msgid ">Cancel" msgstr ">Otkazati" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Podesavanje Z:" +msgid "Adjusting Z" +msgstr "Podesavanje Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 43756b906..3d4dd8471 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -38,11 +38,11 @@ msgstr "Vart szint: %s" msgid ">Cancel" msgstr ">Megsem" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Z allitasa:" +msgid "Adjusting Z" +msgstr "Z allitasa" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index f95d64b53..e40fb89b6 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -38,11 +38,11 @@ msgstr "atteso livello %s" msgid ">Cancel" msgstr ">Annulla" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Compensaz. Z:" +msgid "Adjusting Z" +msgstr "Compensaz. Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index c52b95d68..762494658 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -38,11 +38,11 @@ msgstr "%s niveau verwacht" msgid ">Cancel" msgstr ">Annuleren" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Z is ingesteld:" +msgid "Adjusting Z" +msgstr "Z aanpassen" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 63c539a69..268070f83 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -38,11 +38,11 @@ msgstr "%s nivå ventet" msgid ">Cancel" msgstr ">Avbryt" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Justerer Z:" +msgid "Adjusting Z" +msgstr "Justerer Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index dfbae3322..37937874a 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -38,11 +38,11 @@ msgstr "Oczekiwano wersji %s" msgid ">Cancel" msgstr ">Anuluj" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Ustawianie Z:" +msgid "Adjusting Z" +msgstr "Ustawianie Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 95ada7ee6..f5489e4bd 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -38,11 +38,11 @@ msgstr "nivel %s asteptat" msgid ">Cancel" msgstr ">Anuleaza" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Ajustare Z:" +msgid "Adjusting Z" +msgstr "Ajustare Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 2ff9248a3..97cf978d5 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -38,11 +38,11 @@ msgstr "Ocakavana verzia %s" msgid ">Cancel" msgstr ">Zrusit" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Doladenie Z:" +msgid "Adjusting Z" +msgstr "Doladenie Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 781d6d903..550330f91 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -38,11 +38,11 @@ msgstr "%s nivå förväntad" msgid ">Cancel" msgstr ">Avbryt" -#. MSG_BABYSTEPPING_Z c=15 +#. MSG_BABYSTEPPING_Z c=13 #. Beware: must include the ':' as its last character #: ../../Firmware/ultralcd.cpp:2656 -msgid "Adjusting Z:" -msgstr "Justerar Z:" +msgid "Adjusting Z" +msgstr "Justerar Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 #: ../../Firmware/ultralcd.cpp:7155 From 2c741103fd46d6afb0ac0187f5fdbb298759e062 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 10:03:42 +0200 Subject: [PATCH 036/148] Update po files --- lang/po/Firmware.pot | 997 +++++++++++++++++++-------------------- lang/po/Firmware_cs.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_de.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_es.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_fr.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_hr.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_hu.po | 1004 ++++++++++++++++++++-------------------- lang/po/Firmware_it.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_nl.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_no.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_pl.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_ro.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_sk.po | 1000 ++++++++++++++++++++------------------- lang/po/Firmware_sv.po | 1000 ++++++++++++++++++++------------------- 14 files changed, 6859 insertions(+), 7142 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 191614af2..3ff03a9a9 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -7,93 +7,91 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr "" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr "" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr "" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -105,49 +103,48 @@ msgid "Avoiding grind" msgstr "" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -158,35 +155,34 @@ msgid "" msgstr "" #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "" @@ -196,47 +192,47 @@ msgid "COMMUNICATION ERROR" msgstr "" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 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 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." msgstr "" #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "" @@ -253,130 +249,128 @@ msgid "" msgstr "" #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "" #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "" #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -384,24 +378,24 @@ msgid "" msgstr "" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "" @@ -411,7 +405,7 @@ msgid "Disable" msgstr "" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "" @@ -423,7 +417,7 @@ msgid "Disengaging idler" msgstr "" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -432,7 +426,7 @@ msgid "" msgstr "" #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -444,7 +438,7 @@ msgid "Done" msgstr "" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "" @@ -473,13 +467,13 @@ msgid "ERR Wait for User" msgstr "" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "" @@ -491,17 +485,17 @@ msgid "Ejecting filament" msgstr "" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "" @@ -513,30 +507,30 @@ msgid "Engaging idler" msgstr "" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "" @@ -575,8 +569,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "" @@ -601,36 +595,34 @@ msgid "FW RUNTIME ERROR" msgstr "" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "" @@ -659,23 +651,23 @@ msgid "Feeding to nozzle" msgstr "" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "" @@ -687,20 +679,20 @@ msgid "" msgstr "" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "" @@ -726,129 +718,129 @@ msgid "" msgstr "" #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 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=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." msgstr "" #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "" #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -856,16 +848,15 @@ msgid "" msgstr "" #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" msgstr "" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "" @@ -876,23 +867,23 @@ msgid "Homing" msgstr "" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "" @@ -917,7 +908,7 @@ msgid "INVALID TOOL" msgstr "" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -929,22 +920,22 @@ msgid "Improving bed calibration point" msgstr "" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -957,14 +948,14 @@ msgid "" msgstr "" #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "" @@ -979,87 +970,87 @@ msgid "LOAD TO EXTR. FAILED" msgstr "" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "" @@ -1071,13 +1062,13 @@ msgid "" msgstr "" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "" @@ -1097,8 +1088,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "" @@ -1108,7 +1098,7 @@ msgid "MMU NOT RESPONDING" msgstr "" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "" @@ -1119,19 +1109,19 @@ msgid "MMU SELFTEST FAILED" msgstr "" #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "" @@ -1146,74 +1136,71 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "" #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "" @@ -1234,28 +1221,28 @@ msgid "More details online." msgstr "" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "" @@ -1266,11 +1253,11 @@ msgid "Moving selector" msgstr "" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "" @@ -1280,92 +1267,90 @@ msgid "New firmware version available:" msgstr "" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "" #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "" #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "" #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "" #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1378,82 +1363,80 @@ msgid "OK" msgstr "" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1471,13 +1454,13 @@ msgid "Parking selector" msgstr "" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "" @@ -1488,97 +1471,97 @@ msgid "Performing cut" msgstr "" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." msgstr "" #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "" #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." msgstr "" #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "" #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "" #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "" #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "" @@ -1588,56 +1571,56 @@ msgid "Please upgrade." msgstr "" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "" #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "" #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "" @@ -1648,48 +1631,48 @@ msgid "Preparing blade" msgstr "" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "" #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1712,22 +1695,22 @@ msgid "QUEUE FULL" msgstr "" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" @@ -1737,7 +1720,7 @@ msgid "Remove the ejected filament from the front of the MMU." msgstr "" #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "" @@ -1749,24 +1732,24 @@ msgid "" msgstr "" #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "" @@ -1788,12 +1771,12 @@ msgid "Returning selector" msgstr "" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "" @@ -1803,15 +1786,15 @@ msgid "RstMMU" msgstr "" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" msgstr "" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "" @@ -1826,48 +1809,48 @@ msgid "SELECTOR CANNOT MOVE" msgstr "" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "" #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "" #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "" @@ -1885,72 +1868,72 @@ msgid "" msgstr "" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "" #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1959,23 +1942,23 @@ msgid "" msgstr "" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -1987,54 +1970,53 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "" #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "" @@ -2044,29 +2026,29 @@ msgid "Stop" msgstr "" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "" @@ -2101,17 +2083,17 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "" #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "" @@ -2135,7 +2117,7 @@ msgid "" msgstr "" #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2143,58 +2125,58 @@ msgid "" msgstr "" #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." msgstr "" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" msgstr "" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "" #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "" @@ -2209,15 +2191,15 @@ msgid "Unload" msgstr "" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "" @@ -2234,12 +2216,12 @@ msgid "Unloading to pulley" msgstr "" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "" #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "" @@ -2250,7 +2232,7 @@ msgid "WARNING TMC TOO HOT" msgstr "" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2259,184 +2241,179 @@ msgid "" msgstr "" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "" #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "" #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "" #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index e8bee3e7f..a7f4d74bf 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 nebo starsi" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 nebo novejsi" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s ocekavana verze" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Zrusit" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Doladeni Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Vse OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Vse je hotovo. Tisku zdar!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Vzdy" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Okoli" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Dojely oba Z voziky k~hornimu dorazu?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Automat." #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "AutoZavedeni fil." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -116,49 +114,48 @@ msgid "Avoiding grind" msgstr "Eliminace obrouseni" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Osa" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Delka osy" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Zpet" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Podlozka" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Zahrivani bedu" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Bed OK." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Korekce podlozky" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Podlozka/Topeni" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Stav remenu" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test remenu" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Detekovan vypadek proudu. Obnovit tisk?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Jasny" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Podsviceni" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "CHYBA KOMUNIKACE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibrace XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibrovat Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" " tlacitkem." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibruji Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" "tlacitkem." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibruji vychozi p." #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibrace" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibrace OK" @@ -269,130 +265,128 @@ msgid "" msgstr "Nelze provest akci, filament je zaveden. Nejprve jej vyjmete." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Karta vyjmuta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Vymente SD kartu" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Vymenit filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Zmena uspesna!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Vymena ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Kontrola osy X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Kontrola osy Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Kontrola osy Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Kontrola podlozky" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Kontrola endstopu" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Kontroluji soubor" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Kontrola hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Kontrola senzoru" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Kontrola" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Vymazat chybu TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Barva neni cista" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Komunitni prekl." #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Pokr." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Zchladit" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Naraz" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Det. narazu" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Detekovan naraz." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +397,24 @@ msgstr "" "Normal modu" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Ustrihnout" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Strihani" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Temny" @@ -430,7 +424,7 @@ msgid "Disable" msgstr "Vypnout" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Vypnout motory" @@ -442,7 +436,7 @@ msgid "Disengaging idler" msgstr "Odpojuji idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -453,7 +447,7 @@ msgstr "" "manualu, kapitola Zaciname." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -467,7 +461,7 @@ msgid "Done" msgstr "Konec" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "Korekce E" @@ -496,7 +490,7 @@ msgid "ERR Wait for User" msgstr "ERR: Cekam na uziv." #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "CHYBA:" @@ -508,17 +502,17 @@ msgid "Ejecting filament" msgstr "Vysouvam filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Koncovy spinac" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Kon. spinac nesepnut" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Konc. spinace" @@ -530,30 +524,30 @@ msgid "Engaging idler" msgstr "Zapinani idleru" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Extruder - info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autozav." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "Det. zaseku" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "F. runout" @@ -591,8 +585,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: ZASEK. FILAM." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS reakce" @@ -617,36 +611,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME CHYBA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Selhani" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Selhani MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falesne spusteni" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Rychlost vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test ventilatoru" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Kontr. vent." @@ -675,41 +667,41 @@ msgid "Feeding to nozzle" msgstr "Zavadim do trysky" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Vypadky filam." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament vytlacen a spravne barvy?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Filament nezaveden" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Senzor filamentu" @@ -741,42 +733,42 @@ msgstr "" "nejsou necistoty. Ujistete se, ze senzor funguje spravne." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Spotrebovano filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Soubor nekompletni. Pokracovat?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Dokoncovani pohybu" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Kal. prvni vrstvy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri " "sestaveni tiskarny." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Prutok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -785,28 +777,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Predni tiskovy vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Vpredu [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Predni/levy vent." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code je pripraven pro jinou verzi. Pokracovat?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -814,14 +806,14 @@ msgstr "" "G-code je pripraven pro jinou verzi. Vyslicujte model znovu. Tisk zrusen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 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=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -830,47 +822,47 @@ msgstr "" "zrusen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code je pripraven pro novejsi FW. Pokracovat?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "G-code je pripraven pro novejsi FW. Aktualizujte FW. Tisk zrusen." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW nastaveni" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Topeni/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Zahrivani" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Zahrivani OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -880,7 +872,7 @@ msgstr "" "nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -889,9 +881,8 @@ msgstr "" "kalibracnim procesem?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Vys. vykon" @@ -902,23 +893,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend má 280C! Tryska vyměněna a dotažena dle instrukcí?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Vent. hotendu:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Nyni provedu xyz kalibraci. Zabere to až 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." @@ -943,7 +934,7 @@ msgid "INVALID TOOL" msgstr "NEPLATNY NASTROJ" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -957,22 +948,22 @@ msgid "Improving bed calibration point" msgstr "Upresnovani kalibracniho bodu" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Informace" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Zav. SD karty" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Vlozte filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -985,14 +976,14 @@ msgid "" msgstr "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Je filament zaveden?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Je tiskovy plat na podlozce?" @@ -1002,98 +993,98 @@ msgid "Iteration" msgstr "Opakovani" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Posledni tisk" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Selhani posl. tisku" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Vlevo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Levy vent na trysce?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Vlevo [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Normalni" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Ztlumeny" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Korekce lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Doladeni osy Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Nacist vse" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Zavest filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Zavest do trysky" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Zatěžovací test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Cisteni barvy" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Zavadeni filamentu" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Uvolnena remenicka" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Hlasity" @@ -1108,8 +1099,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interni chyba MMU FW, resetujte MMU" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU mod" @@ -1119,7 +1109,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NEODPOVIDA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU opakovani: Obnova teploty..." @@ -1130,14 +1120,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST SELAHL" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Selhani MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU selhani zav" @@ -1152,68 +1142,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU neodpovida. Zkontrolujte kabely a jejich zapojeni." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU pripojeno" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Komp. magnetu" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Hlavni nabidka" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Merene zkos." #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Merim referencni vysku kalibracniho bodu" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Probiha zmena modu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Model" @@ -1234,28 +1221,28 @@ msgid "More details online." msgstr "Vice info na webu" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Posunout X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Posunout Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Posunout Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Posunout osu" @@ -1266,11 +1253,11 @@ msgid "Moving selector" msgstr "Presun selektoru" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/A" @@ -1280,82 +1267,80 @@ msgid "New firmware version available:" msgstr "Vysla nova verze FW:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Ne" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Zadna SD karta" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Bez pohybu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Zadne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nezapojeno" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Netoci se" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 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 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Nyni predehreji trysku pro PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Tryska" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Výměna trysek" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Tryska" @@ -1366,82 +1351,80 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Vyp" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "Zap" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Jednou" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "STOP: CHYBA TEPLOTY" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kal. ukoncena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibrace" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Nahrivani PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "PINDA kalibrace selhala" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1461,13 +1444,13 @@ msgid "Parking selector" msgstr "KLADKA SE NEOTACI" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pozastavit tisk" @@ -1478,7 +1461,7 @@ msgid "Performing cut" msgstr "Provadim rez" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1487,7 +1470,7 @@ msgstr "" "prvnich 4 bodu. Pokud tryska zachyti papir, okamzite vypnete tiskarnu." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1496,33 +1479,33 @@ msgstr "" "restartovanim tiskarny." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Zkontrolujte zapojeni IR senzoru a vyjmuty filament" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Zkontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Ocistete podlozku a stisknete tlacitko." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pro uspesnou kalibraci ocistete trysku. Potvrdte tlacitkem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Vlozte filament do extruderu a stiskem tlacitka jej zavedete." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1530,50 +1513,50 @@ msgstr "" "Vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Nejdriv zavedte filament" #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Otevrete idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Umistete tiskovy plat na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete tlacitko" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Vyjmete urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Nejprve sundejte transportni soucastky." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante tiskovy plat z podlozky." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Nejprve spustte kalibraci XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Vyjmete filament a zopakujte tuto akci" @@ -1583,51 +1566,51 @@ msgid "Please upgrade." msgstr "Prosim aktualizujte." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Cekejte" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Vypadky proudu" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Predehrev" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Predehrejte trysku!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Predehrev trysky. Vyckejte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Predehrev ke strihu" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Predehrev k vysunuti" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Predehrev k zavedeni" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Predehrev k vyjmuti" @@ -1638,48 +1621,48 @@ msgid "Preparing blade" msgstr "Pripravuji cepel" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Stisknete tlacitko" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Tisk prerusen" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Tiskovy vent.:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Tisk z SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Tisk pozastaven" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Cas tisku" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "IP adr. tiskarny:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1688,12 +1671,12 @@ msgstr "" "Zaciname." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Prumer trysky tiskarny se lisi od G-code. Pokracovat?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1720,27 +1703,27 @@ msgid "QUEUE FULL" msgstr "FRONTA PLNA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Vzadu [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Obnovovani tisku" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyjmete stary filament a stisknete tlacitko pro zavedeni noveho." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Prejmenovat" @@ -1754,24 +1737,24 @@ msgstr "" "nastrojovy index mimo rozsah (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Pokracovat" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Obnoveni tisku" @@ -1793,17 +1776,17 @@ msgid "Returning selector" msgstr "Vracim selektor" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Vpravo" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Vpravo [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1812,8 +1795,8 @@ msgstr "" "kalibracni proces od zacatku. Pokracovat?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD karta" @@ -1828,48 +1811,48 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SE NEHYBE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZASTAVENO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Hledam kalibracni bod podlozky" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Vybrat" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select 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_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Zvolte filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Vyber jazyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktera odpovida vasemu materialu." @@ -1880,72 +1863,72 @@ msgid "Selecting fil. slot" msgstr "Vyber fil. slot" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Selftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Start Selftestu" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Chyba Selftestu!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Selftest selhal" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Pro kalibraci presneho rehomovani bude nyni spusten selftest." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Senzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Senzor overen, vyjmete filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Nastavte teplotu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Nastaveni" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Tezke zkos." #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Plat" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1958,23 +1941,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Stav konc. spin." #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Tichy" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Lehke zkos." #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -1988,54 +1971,53 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytl se problem, srovnavam osu Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Trideni" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Trideni souboru" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Rychlost" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Toci se" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 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 c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Tichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Tiskove platy" @@ -2045,29 +2027,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Zastavit tisk" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Prisne" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Podpora" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Prohozene" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "TEPLOTNI VYJIMKA" @@ -2102,7 +2084,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC CHYBA NIZKE NAP." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2111,22 +2093,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Termálního model zatím nebyl kalibrován." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Teplota" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Testovani filamentu" @@ -2147,7 +2129,7 @@ msgstr "" "pohyb." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2157,7 +2139,7 @@ msgstr "" "vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2165,39 +2147,39 @@ msgstr "" "Je potreba kalibrovat osu Z. Postupujte dle prirucky, kapitola Zaciname." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Cas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Celkem" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Celkem selhani" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filament celkem" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Celkovy cas tisku" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Ladit" @@ -2212,15 +2194,15 @@ msgid "Unload" msgstr "Vyjmout" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Vyjmout filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Vysouvam filament" @@ -2237,12 +2219,12 @@ msgid "Unloading to pulley" msgstr "Vysunuti ke kladce" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Overeni selhalo, vyjmete filament a zkuste znovu." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Napeti" @@ -2253,7 +2235,7 @@ msgid "WARNING TMC TOO HOT" msgstr "TMC: VYSOKA TEPLOTA!" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2266,200 +2248,195 @@ msgstr "" "Stealth modu" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Ceka se na uzivatele" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Cekani na zchladnuti PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Cekani na zchladnuti trysky a podlozky." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Varovat" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 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 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Varovani: doslo ke zmene typu motherboardu." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Varovani: doslo ke zmene typu tiskarny." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Bylo vysunuti filamentu uspesne?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Chyba zapojeni" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Pruvodce" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Korekce X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 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 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 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 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte " "tiskarnu." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibrace XYZ selhala. Nahlednete do manualu." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibrace XYZ v poradku. X/Y osy jsou kolme. Gratuluji!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y vzdalenost od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Korekce Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Pruvodce muzete znovu spustit z menu Kalibrace -> Pruvodce." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Korekce Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Pocet mereni Z" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] odsazeni bodu" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "a stisknete tlacitko" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "k zavedeni filamentu" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "k vyjmuti filamentu" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "neznamy" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "neznamy stav" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Obnovit" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU vyp. proudu" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Vysunutí z MMU" @@ -2497,8 +2474,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU PODPĚTÍ VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Výměn materiálů" @@ -2531,10 +2508,13 @@ msgstr "" "2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Zavést do MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 95d8049be..9290c681d 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 oder älter" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 oder neuer" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s Level erwartet" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Abbruch" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Z Anpassen" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Alles richtig" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Alles abgeschlossen. Viel Spaß beim Drucken!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alphabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Immer" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Raumtemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Sind linke+rechte Z- Schlitten ganz oben?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Startposition" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Auto Leist" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "AutoLaden Filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -116,49 +114,48 @@ msgid "Avoiding grind" msgstr "Vermeide schleifen" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Achse" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Achsenlänge" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Zurück" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Bett" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Bett aufwärmen" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Bett OK" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Bett Level Korr." #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -171,35 +168,34 @@ msgstr "" "Reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Bett/Heizung" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Gurtstatus" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Riementest" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Stromausfall! Druck wiederherstellen?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Hell" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Helligkeit" @@ -209,17 +205,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEHLER" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibrierung XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibrierung Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,13 +224,13 @@ msgstr "" "Anschliessend den Knopf drücken." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibriere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -243,17 +239,17 @@ msgstr "" "Anschliessend den Knopf drücken." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibriere Start" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibrierung" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibrierung OK" @@ -272,130 +268,128 @@ msgstr "" "Entladen Sie es zuerst." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "SD Karte entfernt" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Wechsel SD Karte" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Filament-Wechsel" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Wechsel erfolgr.!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Wechsel ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Prüfe X Achse" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Prüfe Y Achse" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Prüfe Z Achse" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Prüfe Bett" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Prüfe Endschalter" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Überprüfe Datei" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Prüfe Düse" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Prüfe Sensoren" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Kontrolle" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "TM Fehler löschen" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Falsche Farbe" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Von der Community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Weit." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Abkühlen" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Gewählte Sprache kopieren?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Crash Erk." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Crash erkannt." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,24 +400,24 @@ msgstr "" "genutzt werden" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Fil. schneiden" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Messer" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Dimm" @@ -433,7 +427,7 @@ msgid "Disable" msgstr "Deaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Motoren aus" @@ -445,7 +439,7 @@ msgid "Disengaging idler" msgstr "Spannrol. auskuppeln" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -456,7 +450,7 @@ msgstr "" "eingestellt. Folgen Sie dem Handbuch, Kapitel Erste Schritte." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -469,7 +463,7 @@ msgid "Done" msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-Korrektur" @@ -498,7 +492,7 @@ msgid "ERR Wait for User" msgstr "FEHL. Warte Benutzer" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "FEHLER:" @@ -510,17 +504,17 @@ msgid "Ejecting filament" msgstr "Werfe Filament aus" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Endanschlag" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Ende nicht getroffen" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Endschalter" @@ -532,30 +526,30 @@ msgid "Engaging idler" msgstr "Spannrol. einkuppeln" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Extruder Info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autoladen" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F. Stau entd." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "FS. Auslauf" @@ -593,8 +587,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA NICHT FIL.FREI" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS Aktion" @@ -619,36 +613,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW-LAUFZEITFEHLER" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Fehlerstatistik" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "MMU-Fehler" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falschtriggerung" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Lüfter-Tempo" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Lüftertest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Lüfter Check" @@ -677,41 +669,41 @@ msgid "Feeding to nozzle" msgstr "Zufuhr zur Düse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fil. Mängel" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. Sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament extrudiert mit richtiger Farbe?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. nicht geladen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Filamentsensor" @@ -744,42 +736,42 @@ msgstr "" "dass nichts im PTFE-Schlauch fest- sitzt und der Sensor richtig liest." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Filament benutzt" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Datei unvollständig Trotzdem fortfahren?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Bewegung beenden" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Erste-Schicht Kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Zunächst führe ich den Selbsttest durch, um die häufigsten Probleme beim " "Zusammenbau zu überprüfen." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Durchfluss" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -788,28 +780,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Drucklüfter?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Vorne [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Druck/Extr. Lüfter" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-Code ist für einen anderen Level geslict. Fortfahren?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -818,14 +810,14 @@ msgstr "" "Druck abgebrochen." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-Code ist für einen anderen Drucker geslict. Fortfahren?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -834,12 +826,12 @@ msgstr "" "Druck abgebrochen." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-Code ist für eine neuere Firmware geslict. Fortfahren?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -848,35 +840,35 @@ msgstr "" "Druck abgebrochen." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW Einstellungen" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Heizung/Thermistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Aufwärmen" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Aufwärmen OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -887,7 +879,7 @@ msgstr "" "Danach können Sie drucken." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -896,9 +888,8 @@ msgstr "" "durch den Einricht- ungsablauf führe?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Hohe leist" @@ -909,25 +900,25 @@ msgid "Homing" msgstr "Startposition" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend bei 280C! Düse gewechselt, gemäß Spezifikation angezogen?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend-Lüfter:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" "Ich werde jetzt die XYZ-Kalibrierung durchführen. Es kan bis zu 24 " "Min.dauern." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchführen." @@ -952,7 +943,7 @@ msgid "INVALID TOOL" msgstr "UNGÜLTIGER FIL.PLATZ" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -966,22 +957,22 @@ msgid "Improving bed calibration point" msgstr "Verbesserung des Bettkalibrierungs- punkts" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Infoanzeige" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. SD Karte" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Filament einlegen" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -997,14 +988,14 @@ msgstr "" "Interner Laufzeitfehler. MMU zurücksetzen oder Firmware aktualisieren." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Ist das Filament geladen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Liegt das Stahlblech auf dem Heizbett?" @@ -1014,98 +1005,98 @@ msgid "Iteration" msgstr "Wiederholung" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Letzter Druck" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Letzte Druckfehler" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Links" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Extruderlüfter?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Links [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Hell.wert" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Dimmwert" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Lineare Korrektur" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Z einstellen" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Alle laden" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Filament laden" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "In Düse laden" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Lade Filament Test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Lade Farbe" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Filament lädt" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Lose Riemenscheibe" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Laut" @@ -1120,8 +1111,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware Fehler, setzen Sie die MMU zurück." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU Mod." @@ -1131,7 +1121,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU REAGIERT NICHT" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU-Neuversuch: Wiederherstelle die Temperatur..." @@ -1142,14 +1132,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELBSTTEST FEHL." #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "MMU Fehler" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU Ladefehler" @@ -1167,68 +1157,65 @@ msgstr "" "MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU verbunden" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Magnet Komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Hauptmenü" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Schräglauf" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Messen der Referenzhöhe des Kalibrierpunktes" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Gitter" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "MeshBett Ausgleich" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Modus" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Moduswechsel erfolgt..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modell" @@ -1249,28 +1236,28 @@ msgid "More details online." msgstr "Weiter Details online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Bewege X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Bewege Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Bewege Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Achse bewegen" @@ -1281,11 +1268,11 @@ msgid "Moving selector" msgstr "Bewege Selektor" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/V" @@ -1295,82 +1282,80 @@ msgid "New firmware version available:" msgstr "Neue Firmware- Version verfügbar:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nein" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Keine SD Karte" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Keine Bewegung." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Ohne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nicht angeschlossen" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Dreht sich nicht" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jetzt kalibriere ich den Abstand zwischen Düsenspitze und Druckbett." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Jetzt werde ich die Düse für PLA vorheizen." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Testdruck jetzt von Stahlblech entfernen." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Düse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Düsenwechsel" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Düsen Dia." @@ -1381,83 +1366,81 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Aus" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "An" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Einmal" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE THERM. FEHLER" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID Kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID Kalib. fertig" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID Kalibrierung" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "PINDA erwärmen" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA Kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "PINDA-Kalibrierung fehlgeschlagen" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1477,13 +1460,13 @@ msgid "Parking selector" msgstr "Parke Selektor" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Druck pausieren" @@ -1494,7 +1477,7 @@ msgid "Performing cut" msgstr "Führe Schnitt aus" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1503,7 +1486,7 @@ msgstr "" "ersten 4 Punkte. Drucker sofort aus- schalten, wenn das Papier erfasst wird." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1512,28 +1495,28 @@ msgstr "" "dem Assistenten fort, indem Sie den Drucker neu starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "IR Sensor Verbindungen über- prüfen. Ist Filament entladen?" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Prüfen:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Reinigen Sie das Heizbett und drücken Sie dann den Knopf." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" "Entfernen Sie überstehendes Filament von der Düse. Klicken wenn sauber." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1541,7 +1524,7 @@ msgstr "" "laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1550,50 +1533,50 @@ msgstr "" "den Knopf, um es zu laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Laden Sie zuerst das Filament." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Spannrolle öffnen und Filament von Hand entfernen" #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Legen Sie das Stahlblech auf das Heizbett." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Drücken Sie den Knopf um das Filament zu entladen." #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Ziehen Sie das Filament sofort heraus" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Zuerst Transportsicherungen entfernen." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Entfernen Sie das Stahlblech vom Heizbett." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Zuerst XYZ Kalibrierung ausführen." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Entladen Sie erst das Filament und versuchen Sie es nochmal." @@ -1603,51 +1586,51 @@ msgid "Please upgrade." msgstr "Bitte aktualisieren." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Warten" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Netzfehler" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Vorheizen" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Düse vorheizen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Vorheizen der Düse. Bitte warten." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Heizen zum Schnitt" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Heizen zum Auswurf" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Heizen zum Laden" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Heizen zum Entladen" @@ -1658,48 +1641,48 @@ msgid "Preparing blade" msgstr "Bereite Messer vor" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Knopf drücken zum" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Druck abgebrochen" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Drucklüfter:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Drucken von SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Druck pausiert" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Druckzeit" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Drucker IP Adr.:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1708,12 +1691,12 @@ msgstr "" "Schritte." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Düsendurchmesser weicht vom G-Code ab. Fortfahren?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1740,27 +1723,27 @@ msgid "QUEUE FULL" msgstr "QUEUE VOLL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Hinten [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Druck wiederherst" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Entferne das alte Fil. und drücke den Knopf, um das neue zu laden." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Umbenennen" @@ -1774,24 +1757,24 @@ msgstr "" "Prüfen Sie den G-Code auf Plätze außerhalb des Bereichs (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset XYZ Kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Druck fortsetzen" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Druck fortgesetzt" @@ -1813,17 +1796,17 @@ msgid "Returning selector" msgstr "Selektor zurückfahr." #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Rechts" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Rechts [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1832,8 +1815,8 @@ msgstr "" "beginnen. Fortfahren?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD Karte" @@ -1848,23 +1831,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SITZT FEST" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "GESTOPPT." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Suche Bett Kalibrierpunkt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Auswahl" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1873,25 +1856,25 @@ msgstr "" " im On-Screen-Menü aus." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Wähle filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Wähle Sprache" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vorheiztemperatur auswählen, die Ihrem Material entspricht." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Wählen Sie die Temperatur, die zu Ihrem Material passt." @@ -1902,72 +1885,72 @@ msgid "Selecting fil. slot" msgstr "Wähle Filament Platz" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Selbsttest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Selbsttest start" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Selbsttest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Selbsttest Fehler!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Selbsttest Error" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Selbsttest wird gestartet, um Startposition zu kalibrieren." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Sensor Info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Sensor überprüft, entladen Sie jetzt das Filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Temp. einstellen:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Einstellungen" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Sehr schräg" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Stahlblech" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1980,23 +1963,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Endschalter Status" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Leise" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Leicht schräg" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2009,55 +1992,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Fehler aufgetreten, Z-Kalibrierung erforderlich..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Sort." #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Sortiere Dateien" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Ton" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Geschwindigkeit" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Dreht sich" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Stabile Umgebungs- temperatur 21-26C und feste Stand- fläche erforderlich." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistiken" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Leise" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Stahlbleche" @@ -2067,29 +2049,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Druck abbrechen" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Ausgetauscht" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" @@ -2124,7 +2106,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNTERSPANN.FEHL." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2133,22 +2115,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Thermomodell noch unkalibriert." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Teste filament" @@ -2167,7 +2149,7 @@ msgid "" msgstr "Selektor erreicht Startpos. nicht. Prüf, ob etwas blockiert." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2178,7 +2160,7 @@ msgstr "" "im Handbuch." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2187,39 +2169,39 @@ msgstr "" " Schritte." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Zeit" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Gesamt" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Gesamte Fehler" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Gesamtes Filament" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Gesamte Druckzeit" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Feineinstellung" @@ -2234,15 +2216,15 @@ msgid "Unload" msgstr "Entla." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Fil. entladen" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Filament auswerfen" @@ -2259,14 +2241,14 @@ msgid "Unloading to pulley" msgstr "Entlade zur Riemens." #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "" "Überprüfung fehl- geschlagen, entladen Sie das Filament und nochmals " "versuchen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Spannungen" @@ -2277,7 +2259,7 @@ msgid "WARNING TMC TOO HOT" msgstr "WARNUNG TMC ZU HEISS" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2290,204 +2272,199 @@ msgstr "" "Stealth Modus" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Warte auf Benutzer.." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Warten, bis PINDA- Sonde abgekühlt ist" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Warten bis Heizung und Bett abgekühlt sind" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Warnen" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Warnung: Druckertyp und Platinentyp wurden beide geändert." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Warnung: Platinentyp wurde geändert." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Warnung: Druckertyp wurde geändert." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Konnten Sie das Filament entnehmen?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Verdrahtungsfehler" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Assistent" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "X-Korrektur" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ Kal. Details" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ Kalibrierung in Ordnung. Schräglauf wird automatisch korrigiert." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schräg. Gut gemacht!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "XYZ-Kalibrierung beeinträchtigt. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung beeinträchtigt. Kal. -Punkt vorne rechts nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "XYZ-Kalibrierung fehlgeschlagen. Vordere Kal.-Punkte nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-Kalibrierung fehlgeschlagen - mehr im Handbuch." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "XYZ-Kalibrierung fehlgeschlagen. Kal. -Punkt vorne rechts nicht erreichbar." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "XYZ-Kalibrierung ok. X/Y-Achsen sind senkrecht zueinander Glückwunsch!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y Entfernung vom Min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Y-Korrektur" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Im Menü Kalibrierung -> Assistent können Sie den Assistenten immer neu " "starten." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Z-Korrektur" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z-Test Nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] Punktversatz" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "und Knopf drücken" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "um Filament laden" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "um Filament entladen" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "unbekannt" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "Status unbekannt" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Aktualisiere" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU Netzfehler" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Aus MMU auswerf." @@ -2525,8 +2502,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU-UNTERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Materialwechsel" @@ -2559,10 +2536,13 @@ msgstr "" "Update auf Version 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "In MMU laden" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index e1f4e078e..70018d08d 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 o mayor" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 o mas nueva" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s nivel esperado" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Cancelar" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Ajustar-Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Todo bien" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Terminado. Felices impresiones!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Siemp." #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Carros Z izq./der. estan arriba maximo?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Llevar al origen" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Encendido" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Carga auto. filam." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Evitar morder" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Eje" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Longitud del eje" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Atras" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Base" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Calentando Base" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Base preparada" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Corr. de la cama" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -169,35 +166,34 @@ msgstr "" "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Base/Calentador" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Estado de correa" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test cinturon" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Se fue la luz. Re- anudar la impresion?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Brill." #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Brillo" @@ -207,17 +203,17 @@ msgid "COMMUNICATION ERROR" msgstr "ERROR COMUNICACION" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Calibrar XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Calibrar Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -226,13 +222,13 @@ msgstr "" "superiores. Despues haz clic." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Calibrando Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +237,17 @@ msgstr "" "superiores. Despues haz clic." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Calibrar pos.inicial" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Calibracion" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Calibracion OK" @@ -269,130 +265,128 @@ msgstr "" "No se puede realizar la acción, filamento ya cargado. Descárgalo primero." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Tarjeta retirada" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Cambiar Tarj. SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Cambiar filamento" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Cambio correcto!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Cambio correcto?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Control sensor X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Control sensor Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Control sensor Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Control base cal." #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Control endstops" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Verif. archivo" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Control fusor" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Comprobando sensores" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Comprobaciones" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Borrar error TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Color no homogeneo" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Desde la comunidad" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Enfriar" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Copiar idioma seleccionado?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Choque" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Det. choque" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Choque detectado." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +397,24 @@ msgstr "" "Modo normal" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Cortar filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Cuchillo" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Fecha:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Oscuro" @@ -430,7 +424,7 @@ msgid "Disable" msgstr "Desact." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Apagar motores" @@ -442,7 +436,7 @@ msgid "Disengaging idler" msgstr "Soltando tensor" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -453,7 +447,7 @@ msgstr "" "fijada. Siga el manual, capitulo Primeros Pasos." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -466,7 +460,7 @@ msgid "Done" msgstr "Listo" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "Corregir-E" @@ -495,13 +489,13 @@ msgid "ERR Wait for User" msgstr "ERR Espera usuario" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Expulsar de MMU" @@ -513,17 +507,17 @@ msgid "Ejecting filament" msgstr "Expulsando filamento" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Final de carrera" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Endstop no alcanzado" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Finales de carrera" @@ -535,30 +529,30 @@ msgid "Engaging idler" msgstr "Enganchando tensor" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruir" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Info. del extrusor" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "Autocarg.fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "Det. atasco f" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "Fin fil." @@ -596,8 +590,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: ATASCO FIL." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS accion" @@ -622,36 +616,34 @@ msgid "FW RUNTIME ERROR" msgstr "ERROR EJECUCION FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Estadistica Fallos" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Total Fallos MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falsa activacion" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Velocidad Vent" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test ventiladores" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Comprob.vent" @@ -680,41 +672,41 @@ msgid "Feeding to nozzle" msgstr "Aliment. a la boq." #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fil. acabado" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Sensor Fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filamento" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Es nitido el color nuevo?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. no introducido" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Sensor de fil." @@ -747,42 +739,42 @@ msgstr "" " ok." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Filamento usado" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Archivo incompleto. Continuar de todos modos?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Term. movimientos" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Cal. primera cap." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 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." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flujo" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,28 +783,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Vent. frontal?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Frontal [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Vents. front/izqui" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "Codigo G laminado para un nivel dif. Continuar?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -821,14 +813,14 @@ msgstr "" "Impresion cancelada." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "Codigo G laminado para un tipo de impresora dif.Cont.?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -837,12 +829,12 @@ msgstr "" " Impresion cancelada." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "Codigo G laminado para nuevo firmware. Continuar?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -851,35 +843,35 @@ msgstr "" "cancelada." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "Configuracion HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Calentador/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Calentando..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Calentando acabado." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -890,7 +882,7 @@ msgstr "" "listo para imprimir." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -899,9 +891,8 @@ msgstr "" " configuracion?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Rend.pleno" @@ -912,23 +903,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Fusor a 280C! Boquilla cambiado y ajust. a la medida?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Vent. d. fusor:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Hare la calibracion XYZ. Puede tardar hasta 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." @@ -953,7 +944,7 @@ msgid "INVALID TOOL" msgstr "HERR. INVALIDA" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -967,22 +958,22 @@ msgid "Improving bed calibration point" msgstr "Mejorando punto calibracion base" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Monitorizar" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. Tarjeta SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Introducir filamento" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -998,14 +989,14 @@ msgstr "" "firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Esta el filamento cargado?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Esta c. la lamina sobre la base?" @@ -1015,98 +1006,98 @@ msgid "Iteration" msgstr "Iteracion" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Ultima impresion" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Ultimos imp. fallos" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Izquierda" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Vent. izquierdo?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Izquierda [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Valor brill." #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Valor oscuro" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Correc. Linealidad" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Micropaso Eje Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Intr. todos fil." #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Introducir fil." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Cargar a boquilla" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Prueba de carga" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Cambiando color" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Introduciendo filam." #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Polea suelta" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Alto" @@ -1121,8 +1112,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Error interno del firmware MMU, reinicia el MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "Modo MMU" @@ -1132,7 +1122,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NO RESPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Reintento: Restaurando temperatura..." @@ -1143,14 +1133,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST FALLO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Fallos MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "Carga MMU falla" @@ -1165,68 +1155,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "La MMU no responde. Revise los cables y conectores." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU conectado" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Comp. imanes" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Menu principal" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Desv. medida" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Midiendo altura del punto de calibracion" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Malla" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Nivela. Malla Base" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Modo" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Cambio de modo progresando ..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modelo" @@ -1247,28 +1234,28 @@ msgid "More details online." msgstr "Mas detalles online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Mover X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Mover Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Mover Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Mover ejes" @@ -1279,11 +1266,11 @@ msgid "Moving selector" msgstr "Moviendo selector" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/D" @@ -1293,50 +1280,48 @@ msgid "New firmware version available:" msgstr "Nuevo firmware disponible:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "No" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "No hay tarjeta SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Sin movimiento" #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Ninguno" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "No hay conexion" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Ventilador no gira" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1344,33 +1329,33 @@ msgstr "" " la base." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Ahora precalentare la boquilla para PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Ahora retira la prueba de la lamina de acero." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Boquilla" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Cambio de boquilla" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "D boquilla" @@ -1381,84 +1366,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Ina" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 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" #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "Act" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Una vez" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERROR TERMICO" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "Cal. PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "Cal. PID terminada" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "Calibracion PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Calentando PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "Cal. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Fallo de la calibracion de PINDA" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1478,13 +1461,13 @@ msgid "Parking selector" msgstr "Aparcando selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pausa" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pausar impresion" @@ -1495,7 +1478,7 @@ msgid "Performing cut" msgstr "Realizando corte" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1504,7 +1487,7 @@ msgstr "" "los primeros 4 puntos. Si la boquilla coge el papel, apague inmediatamente." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1513,34 +1496,34 @@ msgstr "" "continua con el Asistente" #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Comprueba la conexion del IR sensor y filamento esta descargado." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Controla:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Limpia la superficie de la base, y luego presiona el dial." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Limpia boquilla para calibracion. Clic cuando acabes." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Coloca el filamento en el extrusor, luego presiona el dial para cargarlo." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,50 +1532,50 @@ msgstr "" "cargarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Carga primero el filamento." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Abre el tensor y retira el filamento manualmente." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Coloca la lam. de acero en la base calefactable." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pulsa el dial para descargar el filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Retira el filamento de inmediato" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Retira los soportes de envio primero." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Retira la lam. de acero de la base calefactable." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Realiza la calibracion XYZ primero." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Primero descarga el filamento, luego repite esta accion." @@ -1602,51 +1585,51 @@ msgid "Please upgrade." msgstr "Actualiza por favor." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Por favor espere" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Fallos energia" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Precalentar" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Precalienta extrusor" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Precalentando nozzle. Espera por favor." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Precalent. laminar" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Precalent. expulsar" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Precalent. cargar" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Precalent. descargar" @@ -1657,48 +1640,48 @@ msgid "Preparing blade" msgstr "Preparando cuchilla" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Pulsa el dial" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Impresion cancelada" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Vent.fusor:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Menu tarjeta SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Impresion en pausa" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Tiempo de imp." #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Dir. IP impresora:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1707,12 +1690,12 @@ msgstr "" "Calibracion flujo." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametro nozzle impresora difiere de cod.G. Continuar?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1739,28 +1722,28 @@ msgid "QUEUE FULL" msgstr "COLA LLENA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "Puerto RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Trasera [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Recuper. impresion" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Retira el fil. viejo y presione el dial para comenzar a cargar el nuevo." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Renombrar" @@ -1774,24 +1757,24 @@ msgstr "" "para si el índice de herramienta está fuera de rango (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset calibr. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Reanudar impres." #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Continuan. impresion" @@ -1813,17 +1796,17 @@ msgid "Returning selector" msgstr "Selector volviendo" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Derecha" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Derecha [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1832,8 +1815,8 @@ msgstr "" "comenzara de nuevo. Continuar?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "Tarj. SD" @@ -1848,23 +1831,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECT. SIN MOVERSE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "PARADA" #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Buscando punto de calibracion base" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Seleccionar" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1873,27 +1856,27 @@ msgstr "" " el menu en pantalla." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Selecciona filam.:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Cambiar el idioma" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selecciona la temperatura para precalentar la boquilla que se ajuste a tu " "material." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Selecciona la temperatura adecuada a tu material." @@ -1904,74 +1887,74 @@ msgid "Selecting fil. slot" msgstr "Eligiendo hueco fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Self test OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Iniciar Selftest" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Error Selftest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Fallo Selftest" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 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." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Info sensor" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Sensor verificado, retira el filamento ahora." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Establecer temp.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Configuracion" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Desv. severa" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Lamina" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1984,23 +1967,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Mostrar endstops" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Acallar" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Desv. ligera" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2014,55 +1997,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problema encontrado, nivelacion Z forzosa ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Ordenar" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Ordenando archivos" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Sonido" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Velocidad" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Ventilador girando" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 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 c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Estadisticas" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Sigilo" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Lamina de acero" @@ -2072,29 +2054,29 @@ msgid "Stop" msgstr "Parar" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Detener impresion" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Estrict" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Soporte" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Intercambiado" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" @@ -2129,7 +2111,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ERROR SBRVOLTAJE TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2138,22 +2120,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Modelo térmico todavia sin cal." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperaturas" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Probando filamento" @@ -2174,7 +2156,7 @@ msgstr "" "su movimiento." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2185,7 +2167,7 @@ msgstr "" "de calibracion)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2194,39 +2176,39 @@ msgstr "" "Primeros pasos." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Fecha" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Expirar" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Fallos totales" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filamento total" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Tiempo total imp." #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Ajustar" @@ -2241,15 +2223,15 @@ msgid "Unload" msgstr "Desc." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Descargar fil." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Descargando fil." @@ -2266,12 +2248,12 @@ msgid "Unloading to pulley" msgstr "Descarga hasta polea" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "La verificacion fallo, retira el filamento e intenta nuevamente." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Voltajes" @@ -2282,7 +2264,7 @@ msgid "WARNING TMC TOO HOT" msgstr "AVISO TMC DEM. CALOR" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2295,194 +2277,189 @@ msgstr "" "Modo silencio" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Esperando ordenes..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Esperando a que se enfrie la sonda PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Esperando enfriamiento de la base y extrusor." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Aviso" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 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 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Aviso: el tipo de placa ha cambiado." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Aviso: ha cambiado el tipo de impresora." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Se descargo con exito el filamento?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Error de conexion" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Asistente" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Corregir-X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "Detalles cal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibracion XYZ correcta. La desviacion se corregira automaticamente." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibracion XYZ correcta. Los ejes X/Y estan ligeramente desviados. Buen " "trabajo!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 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 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibracion XYZ fallada. Puntos frontales no alcanzables." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibracion XYZ fallada. Consulta el manual." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibracion XYZ ok. Ejes X/Y perpendiculares. Enhorabuena!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Dist. en Y desde min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Corregir-Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Si" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Siempre puedes acceder al asistente desde Calibracion -> Asistente" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Corregir-Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z-sensor nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] punto offset" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "y presione el dial" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "para cargar el fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "para descargar fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "desconocido" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "estado desconocido" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Actualizar" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "Fallo red MMU" @@ -2520,8 +2497,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU BAJO VOLTAJE VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Cambios materiales" @@ -2555,10 +2532,13 @@ msgstr "" "Actualizar a la versión 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Precarga a MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index c846fb752..10c9eef09 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 ou +ancien" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 ou +recent" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "niveau %s attendu" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Annuler" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Ajuster Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Tout est correct" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Tout est pret. Bonne impression!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alphabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Tjrs" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Ambiant" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Z~carriages gauche + droite tout en haut?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Assist" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Mise a 0 des axes" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Puiss.auto" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autocharge du fil." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Eviter broiement" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Axe" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Longueur de l'axe" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Retour" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Plateau" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Chauffe du plateau" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Plateau termine" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Reglage plateau" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" "attente d'un reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Plateau/Chauffage" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Statut courroie" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test de courroie" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Coupure detectee. Reprendre impres.?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Brill." #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Luminosite" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "ERREUR COMMUNICATION" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Calibrer XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Calibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" "l'axe Z jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Calibration Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" " Z jusqu'aux butees. Cliquez une fois fait." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Calib. mise a 0" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Calibration" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Calibration terminee" @@ -271,130 +267,128 @@ msgstr "" "d'abord." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Carte retiree" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Changez carte SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Changer filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Changement reussi!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Change correctement?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Verific. axe X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Verific. axe Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Verific. axe Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Verif. plateau" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Verific. butees" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Verific. fichier" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Verif. du hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Verif. des capteurs" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Verifications" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Effacer l'error TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Couleur incorrecte" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Fait de community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Refroidissement" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Copier la langue choisie?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Detect.crash" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Crash detecte." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,24 +400,24 @@ msgstr "" "mode Normal" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Coupe filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Coupeur" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Date:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Sombre" @@ -433,7 +427,7 @@ msgid "Disable" msgstr "Desact." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Desactiver moteurs" @@ -445,7 +439,7 @@ msgid "Disengaging idler" msgstr "Desenga.t de l'idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -456,7 +450,7 @@ msgstr "" " le manuel, chap. Premiers pas." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -470,7 +464,7 @@ msgid "Done" msgstr "Fait" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "Correct-E" @@ -499,13 +493,13 @@ msgid "ERR Wait for User" msgstr "ERR Att. Utilisateur" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "ERREUR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Éjecter du MMU" @@ -517,17 +511,17 @@ msgid "Ejecting filament" msgstr "Le fil. remonte" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Butee" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Butee non atteinte" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Butees" @@ -539,30 +533,30 @@ msgid "Engaging idler" msgstr "Engagem.t de l'idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extrudeur" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Infos extrudeur" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autocharg." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "Detect bour F" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "Fin de F." @@ -601,8 +595,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOQUE" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "Action FS" @@ -627,36 +621,34 @@ msgid "FW RUNTIME ERROR" msgstr "ERREUR EXECUTION FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Stat. d'echec" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Stat. d'echec MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Faux declenchement" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Vitesse vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test du ventilateur" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Verif vent." @@ -685,41 +677,41 @@ msgid "Feeding to nozzle" msgstr "Chargement vers buse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fins filament" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Capteur Fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament extrude et avec bonne couleur?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Filament non charge" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Capteur Fil." @@ -751,42 +743,42 @@ msgstr "" "Verifiez le tube PTFE. Verifiez que le capteur fonctionne." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Filament utilise" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Fichier incomplet. Continuer qd meme?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Mouvement final" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Cal. 1ere couche" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Je vais lancer le Auto-test pour verifier les problemes d'assemblage les " "plus communs." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flux" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -795,28 +787,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Ventilo impr avant?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Avant [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Ventilos avt/gauche" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code a ete prepare pour un niveau diff. Continuer?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -825,14 +817,14 @@ msgstr "" " Impression annulée." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code a ete prepare pour un type d'im- primante dif. Cont.?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -841,12 +833,12 @@ msgstr "" "Impression annulée." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code a ete prepare pour une FW version plus recente. Cont.?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -855,35 +847,35 @@ msgstr "" "annulee." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "Config HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Chauffage/Thermistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Chauffe" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Chauffe terminee." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -894,7 +886,7 @@ msgstr "" "Apres cela, tout sera pret pour imprimer." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -903,9 +895,8 @@ msgstr "" " guide dans le processus d'installation?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Haut.puiss" @@ -916,25 +907,25 @@ msgid "Homing" msgstr "Mise a zero" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend à 280C! Buse changée et resserrée aux spécifications?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "" "Je vais maintenant lancer la calibration XYZ. Cela peut prendre jusqu'à 24 " "min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." @@ -959,7 +950,7 @@ msgid "INVALID TOOL" msgstr "OUTIL INVALIDE" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -973,22 +964,22 @@ msgid "Improving bed calibration point" msgstr "Amelioration du point de calibration du plateau" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Ecran d'info" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. carte SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Inserez le filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -1005,14 +996,14 @@ msgstr "" " le FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Fil. est-il charge?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Est la plaque sur le plateau?" @@ -1022,98 +1013,98 @@ msgid "Iteration" msgstr "Iteration" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Derniere impres." #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Echecs derniere imp." #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Gauche" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Ventilo gauche?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Gauche [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Niveau brill" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Niv. sombre" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Correction lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Ajuster Z en dir." #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Tout Charger" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Charger filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Charger la buse" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Essai de charge." #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Charg. de la couleur" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Chargement du fil." #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Poulie lache" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Fort" @@ -1128,8 +1119,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Erreur interne du FW du MMU, reinitialiser le MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "Mode MMU" @@ -1139,7 +1129,7 @@ msgid "MMU NOT RESPONDING" msgstr "LE MMU NE REPOND PAS" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "Nouvelle tentative MMU: Restauration de la temperature..." @@ -1150,14 +1140,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU AUTO-TEST ECHEC" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Echecs MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "Def. charg. MMU" @@ -1173,68 +1163,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU ne repond pas. Verifiez le cablage et les connecteurs." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU connecte" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Compens. aim." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Menu principal" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Var. mesuree" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Je mesure la hauteur de reference du point de calibrage" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Mesh Bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mode" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Changement de mode en cours..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modele" @@ -1255,28 +1242,28 @@ msgid "More details online." msgstr "Plus de details en ligne." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Moteur" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Deplacer X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Deplacer Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Deplacer Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Deplacer l'axe" @@ -1287,11 +1274,11 @@ msgid "Moving selector" msgstr "Deplacement select." #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "I/D" @@ -1301,50 +1288,48 @@ msgid "New firmware version available:" msgstr "Nouvelle version de FW disponible:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Non" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Pas de carte SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Pas de mouvement." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Aucun" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Non connecte" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Ne tourne pas" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1352,33 +1337,33 @@ msgstr "" "plateau." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Maintenant je vais prechauffer la buse pour du PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Retirez maintenant l'impression de test de la plaque en acier." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Buse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Changement de buse" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Diam. buse" @@ -1389,83 +1374,81 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles" #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "1 fois" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE ERREUR THERM." #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "Calib. PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "Calib. PID terminee" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "Calibration PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Chauffe de la PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "Calib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Echec de la calibration en PINDA" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1485,13 +1468,13 @@ msgid "Parking selector" msgstr "Parquage selecteur" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pause de l'impr." @@ -1502,7 +1485,7 @@ msgid "Performing cut" msgstr "Coupe en cours" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1511,7 +1494,7 @@ msgstr "" "premiers points. Si la buse accroche le papier, eteignez vite l'imprimante." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1520,27 +1503,27 @@ msgstr "" "l'assistant en redemarrant l'imprimante." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "SVP, verifiez la connexion du capteur IR et decharge le filament." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Verifiez:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Nettoyez la plaque en acier et appuyez sur le bouton." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Nettoyez la buse pour la calibration. Cliquez une fois fait." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1548,7 +1531,7 @@ msgstr "" "pour le charger." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1557,50 +1540,50 @@ msgstr "" "pour le charger." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Veuillez d'abord charger un filament." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 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 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Placez la plaque en acier sur le plateau." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 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 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Retirez immediatement le filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Retirez d'abord les protections de transport." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Retirez la plaque en acier du plateau." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Veuillez d'abord lancer la calibration XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "SVP, dechargez le filament et reessayez." @@ -1610,51 +1593,51 @@ msgid "Please upgrade." msgstr "Mettez a jour le FW." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Merci de patienter" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Coup.de courant" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Prechauffage" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Prechauffez la buse!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Prechauffage de la buse. Merci de patienter." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Chauffe pour couper" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Chauf. pour remonter" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Chauffe pour charger" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Chauf.pour decharger" @@ -1665,48 +1648,48 @@ msgid "Preparing blade" msgstr "Preparation lame" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "App. sur sur bouton" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Impression annulee" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Vent. impr:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Impr. depuis la SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Impression en pause" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Temps d'impression" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Adr.IP imprimante:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1715,12 +1698,12 @@ msgstr "" "Premiers pas - Processus de calibration." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diamètre de la buse diffère du G-Code. Continuer?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1747,28 +1730,28 @@ msgid "QUEUE FULL" msgstr "FILE PLEINE" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Arriere [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Recup. impression" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Retirez l'ancien fil. puis appuyez sur le bouton pour charger le nouveau." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Renommer" @@ -1782,24 +1765,24 @@ msgstr "" " dans le G-code un index d'outil hors plage (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reinitialiser" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reinit. calib. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Reprise impression" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Reprise de l'impr." @@ -1821,17 +1804,17 @@ msgid "Returning selector" msgstr "Retournement select." #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Droite" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Droite [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1840,8 +1823,8 @@ msgstr "" "commencera du debut. Continuer?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "Carte SD" @@ -1856,23 +1839,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "ECHEC MOUV.T SELECT." #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ARRETE." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Recherche point calibration du plateau" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Selectionner" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1881,27 +1864,27 @@ msgstr "" "selectionnez-le dans le menu." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Choix du filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Choisir langue" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selectionnez la temperature de prechauffage de la buse qui correspond a " "votre materiau." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Selectionnez la temperature qui correspond a votre materiau." @@ -1912,73 +1895,73 @@ msgid "Selecting fil. slot" msgstr "Sélection du fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Auto-test OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Debut auto-test" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Auto-test" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Erreur auto-test!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Echec de l'auto-test" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Le Selftest sera lance pour calibrer la remise a zero precise sans capteur" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Info capteur" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Capteur verifie, retirez le filament maintenant." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Regler temp.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Reglages" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Deviat.sev." #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Plaque" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1991,23 +1974,23 @@ msgstr "" "%cReinitialiser" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Afficher butees" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Furtif" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Deviat.leg." #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2020,55 +2003,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Tri" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Tri des fichiers" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Son" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Vitesse" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Tourne" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 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 c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistiques" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Furtif" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Plaques en acier" @@ -2078,29 +2060,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Arreter impression" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Stricte" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Echange" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "ANOMALIE THERMIQUE" @@ -2135,7 +2117,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR SOUS TENSION TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2144,22 +2126,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Modele de thermique non calibre." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperature" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperatures" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Test du filament" @@ -2180,7 +2162,7 @@ msgstr "" "quoi que ce soit qui bloque son mouvement." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2190,7 +2172,7 @@ msgstr "" "jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2199,39 +2181,39 @@ msgstr "" "Premiers pas - Processus de calibration." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Heure" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Delai ecoule" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Totale" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Total des echecs" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filament total" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Temps total impr." #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Regler" @@ -2246,15 +2228,15 @@ msgid "Unload" msgstr "Dech." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Decharger fil." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Dechargement fil." @@ -2271,12 +2253,12 @@ msgid "Unloading to pulley" msgstr "Dechar.t vers poulie" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Verification en echec, retirez le filament et reessayez." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Tensions" @@ -2287,7 +2269,7 @@ msgid "WARNING TMC TOO HOT" msgstr "ATT TMC TROP CHAUD" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2300,94 +2282,89 @@ msgstr "" "mode furtif" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Attente utilisateur." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Attente du refroidissement de la sonde PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Attente du refroidissement des buse et plateau" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Avert" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 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 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Attention: Type de carte mere modifie." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Attention: Type d'imprimante modifie" #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Dechargement du filament reussi?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Erreur de cablage" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Assistant" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Correct-X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "Init XFLASH" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "Details calib. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 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 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 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_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 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 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" @@ -2395,109 +2372,109 @@ msgstr "" "atteignable." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 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." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Echec calibration XYZ. Les points de calibration en avant ne sont pas " "atteignables." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "Echec calibration XYZ. Consultez le manuel." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Echec calibration XYZ. Le point de calibration avant droit n'est pas " "atteignable." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "Calibration XYZ OK. Les axes X/Y sont perpendiculaires. Felicitations!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Distance Y du min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Correct-Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Oui" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Vous pouvez toujours relancer l'Assistant dans Calibration > Assistant." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Correct-Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Mesurer x-fois" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "Offset point [0;0]" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "et appuyez sur le bouton" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "pour charger le fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "pour decharger fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "inconnu" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "Etat inconnu" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Rafraichir" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "Def. alim. MMU" @@ -2535,8 +2512,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU SOUS-TENSION VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Changes matériels" @@ -2569,10 +2546,13 @@ msgstr "" "vers la version 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Précharge à MMU" +#~ msgid "XFLASH init" +#~ msgstr "Init XFLASH" + #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 09b5393e0..7d33ca494 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 ili stariji" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 ili noviji" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s level ocekivan" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Otkazati" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Podesavanje Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Sve je u redu" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Sve je gotovo. Sretno printanje!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Uvijek" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Ambijent" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Jesu lijevi i desni Z~nosaci podignuti?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Pomoc" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Pocetna tocka" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Auto napaj" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autopunj filamenta" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "Auto punjenje fil. je aktivno, pritisnite gumb i umetnite fil.." @@ -114,49 +112,48 @@ msgid "Avoiding grind" msgstr "Sprecavanje mljevenj" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Duljina osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Natrag" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Podloga" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Podloga se zagrijava" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Podloga zagrijana" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Podloga ispravna" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -169,35 +166,34 @@ msgstr "" "mlaznici? Ceka se resetiranje." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Grijac/Podloga" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Status remena" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Testiranje remena" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Doslo je do gasenja. Oporaviti print?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Svijet" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Svjetlina" @@ -207,17 +203,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOM. GRESKA" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibrirajte XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibrirajte Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -226,13 +222,13 @@ msgstr "" "Kliknite kada je zavrseno." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibriracija Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +237,17 @@ msgstr "" "Kliknite kada je zavrseno." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibracija nultocke" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibriranje" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibracija gotova" @@ -269,130 +265,128 @@ msgstr "" "Nije moguce izvrsiti radnju, filament je već napunjen. Prvo ga isprazni." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Kartica je uklonjena" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Promjeni SD karti." #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Promijeni filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Promijena uspjesna!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Ispravno izmjenjeno?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Provjera X osi" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Provjera Y osi" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Provjera Z osi" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Provjera podloge" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Provjera granicnika" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Provjera datoteke" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Provjera hotenda" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Provjera senzora" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Provjere" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Obriši TM pogrešku" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Boja nije ispravna" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Napravilo zajedno" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Nast." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Ohladi" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Kopirati odabrani jezik?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Udar" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Udar detekti." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Udar otkriven." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -400,24 +394,24 @@ msgid "" msgstr "Detekcija udarca moze biti ukljuceno samo u Normalnom nacinu rada" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Odrezite fil." #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Rezac" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Tamno" @@ -427,7 +421,7 @@ msgid "Disable" msgstr "Onemogu." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Onemoguci stepere" @@ -439,7 +433,7 @@ msgid "Disengaging idler" msgstr "Iskl. kliznika" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -451,7 +445,7 @@ msgstr "" "prvog sloja." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -465,7 +459,7 @@ msgid "Done" msgstr "Gotov" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-ispravan" @@ -494,13 +488,13 @@ msgid "ERR Wait for User" msgstr "ERR Cekam korisnika" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "POGRESKA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Izbaci iz MMU" @@ -512,17 +506,17 @@ msgid "Ejecting filament" msgstr "Izbacivanje fil." #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Granicnik" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Granicnik nije aktiv" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Granicnici" @@ -534,30 +528,30 @@ msgid "Engaging idler" msgstr "Angaziranje klizaca" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Info o ekstruderu" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. auto.punj" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F. zastopan" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "F. isteko" @@ -595,8 +589,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. ZAPEO" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS Akcija" @@ -621,36 +615,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW GRESKA IZVRSENJA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Neuspjesna stat" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Neuspjes. MMU stat" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Lazno aktiviranje" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Brzina vent" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test ventilatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Provjera vent" @@ -679,41 +671,41 @@ msgid "Feeding to nozzle" msgstr "Dovod do mlaznice" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Bez filmaneta" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Ekstrudiranje fil.s sa ispravnom bojom?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. nije napunjen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Senzor filamenta" @@ -745,42 +737,42 @@ msgstr "" " li je nešto zapelo u PTFE cijevi. Ocitava li senzor ispravno." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Iskoristeni fil." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Datoteka je nepotpuna. Svejedno nastaviti?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Zavrsni pokreti" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Prvi sloj kalib." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Prvo cu pokrenuti samotestiranje kako bih provjerio najcesce probleme sa " "montazom." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Protok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -789,28 +781,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Prednji print vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Prednj str[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Prednji/lijevi vent" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-kod izrezan za drugu razinu. Nastavite?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -819,14 +811,14 @@ msgstr "" "otkazan." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-kod izrezan za drugu vrstu printera. Nastavite?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -835,12 +827,12 @@ msgstr "" "je otkazan." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-kod izrezan za noviji firmware. Nastavite?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -849,35 +841,35 @@ msgstr "" "otkazan." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW podesavanje" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Grijac/Termostat" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Grijanje" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Grijanje je onemoguceno sigurnosnim mjeracem vremena." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Grijanje obavljeno." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -888,7 +880,7 @@ msgstr "" "printanje." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -897,9 +889,8 @@ msgstr "" "postupak postavljanja?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Visoka sna" @@ -910,24 +901,24 @@ msgid "Homing" msgstr "Navodjenje" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" "Zagrijati na 280C! Mlaznica promijenjena i stegnuta prema specifikacijama?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend vent:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Sada cu pokrenuti xyz kalibraciju. Trebat ce do 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Sada cu pokrenuti z kalibraciju." @@ -952,7 +943,7 @@ msgid "INVALID TOOL" msgstr "NEVALJAN ALAT" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -966,22 +957,22 @@ msgid "Improving bed calibration point" msgstr "Poboljšanje točke kalibracije podloge" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Info zaslon" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Obrada SD kartice" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Umetnite filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -997,14 +988,14 @@ msgstr "" "firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Je li filament napunjen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Je li celicna ploca na grijanoj podlozi?" @@ -1014,98 +1005,98 @@ msgid "Iteration" msgstr "Ponavljanje" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Zadnji print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Zadnji neusp. print" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Lijevo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Lijevi hotend vent?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Lijeva str[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Razina svjet" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Razina zatam" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Lin. ispravak" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Live podesavanje Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Puni sve" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Napunite fil." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Punjenje u mlazn" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Punjenje test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Ucitavanje boje" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Punjenje filamenta" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Labava remenica" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Glasno" @@ -1120,8 +1111,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interna pogreska firmware MMU-a, resetirajte MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU Mod" @@ -1131,7 +1121,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NE ODGOVARA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ponovni pokusaj: Vracanje temperature..." @@ -1142,14 +1132,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST N USPIO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "MMU ne uspijeva" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "Neusp. MMU punj" @@ -1164,68 +1154,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU ne reagira. Provjerite ozicenje i konektore." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU spojen" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Magnet. komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Nazad" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Mjereni nagib" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Mjerenje referentne visine kalibracijske tocke" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Mreza" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Izrav. mrez. podl" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Promjena moda u tijeku..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Model" @@ -1246,28 +1233,28 @@ msgid "More details online." msgstr "Vise detalja online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Pomaknite X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Pomaknite Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Pomaknite Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Pomaknite os" @@ -1278,11 +1265,11 @@ msgid "Moving selector" msgstr "Pomicanje odabiraca" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/A" @@ -1292,50 +1279,48 @@ msgid "New firmware version available:" msgstr "Dostupna nova verzija firmwera:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Ne" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Nema SD kartice" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Bez pomaka." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Nema" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nije povezano" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Ne okrece se" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" @@ -1343,33 +1328,33 @@ msgstr "" "podloge." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Sada cu zagrijati mlaznicu za PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Sada uklonite probni print sa celicne ploce." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Mlaznica" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Promjena mlaznice" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Mlaznica." @@ -1380,82 +1365,80 @@ msgid "OK" msgstr "Ok" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Pronadene stare postavke. Postavit ce se zadani PID, Esteps itd." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Jednom" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUZIRAN TERMAL EROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kal. zavrsena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibracija" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "PINDA se Zagrijava" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Kalibracija PINDA nije uspjela" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1458,13 @@ msgid "Parking selector" msgstr "Selektor parkiranja" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pauzirajte print" @@ -1492,7 +1475,7 @@ msgid "Performing cut" msgstr "Izvodjenje reza" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1501,7 +1484,7 @@ msgstr "" "mlaznica uhvati papir, odmah iskljucite printer." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,33 +1493,33 @@ msgstr "" "ponovnim pokretanjem printera." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Provjerite IR prikljucak senzora, izvadite filament ako postoji." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Molimo provjerite:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Ocistite grijacu podlogu, a zatim pritisnite gumb." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Molimo ocistite mlaznicu radi kalibracije. Kliknite kada ste gotovi." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Umetnite filament u ekstruder, a zatim pritisnite gumb za punjenje." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1544,50 +1527,50 @@ msgstr "" "Umetnite filament u prvu cijev MMU-a, a zatim pritisnite gumb za punjenje." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Molimo prvo ubacite filament." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Molimo otvorite klizac i rucno uklonite filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Stavite celicnu plocu na grijacu podlogu." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pritisnite gumb za praznjenje filamenta" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Molimo odmah izvucite filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Najprije uklonite prijevozne osloce." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Molimo uklonite celicnu plocu sa grijace podloge." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Prvo pokrenite XYZ kalibraciju." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Prvo izvadite filament, a zatim ponovite ovu radnju." @@ -1597,51 +1580,51 @@ msgid "Please upgrade." msgstr "Molimo nadogradite." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Molimo pricekajte" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Prekidi struje" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Predgrijavanje" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Predgr. mlaznicu!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Predgrijavanje mlaznice. Molim vas pricekajte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Predgr. za rezanje" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Predgr. za izbaci." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Predgr. za punjenje" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Predgr. za praznj." @@ -1652,48 +1635,48 @@ msgid "Preparing blade" msgstr "Priprema ostrice" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Pritisnite gumb" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Pritisnite gumb za predgrijavanje mlaznice i nastavite." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Print je prekinut" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Vent printa:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Printaj sa SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Print pauziran" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Vrijeme printanja" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Printer IP Adr:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1702,12 +1685,12 @@ msgstr "" "koraci, odjeljak Tijek kalibracije." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Promjer mlaznice razlikuje se od G-koda. Nastavite?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1734,27 +1717,27 @@ msgid "QUEUE FULL" msgstr "RED PUN" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi utor" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Zad. str.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Oporavak printa" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Uklonite stari fil. i pritisnite gumb za pocetak stavljanja novog." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Preimenuj" @@ -1768,24 +1751,24 @@ msgstr "" "za indeks alata izvan raspona (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Resetiraj" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Nastavite print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Nastavak printa" @@ -1807,17 +1790,17 @@ msgid "Returning selector" msgstr "Povratak izbornika" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Tocno" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Desna str.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1826,8 +1809,8 @@ msgstr "" "ispocetka. Nastavite?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD karti" @@ -1842,23 +1825,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "IZBORNIK SE NE MICE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZAUSTAVLJENO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Trazenje tocke kalibracije podloge" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Odaberi" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1867,27 +1850,27 @@ msgstr "" "zaslonu." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Odaberi filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Izaberi jezik" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Odaberite temperaturu predgrijavanja mlaznice koja odgovara vasem " "materijalu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Odaberite temperaturu koja odgovara vasem materijalu." @@ -1898,74 +1881,74 @@ msgid "Selecting fil. slot" msgstr "Odabir fil. utora" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Samotestiranje OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Pocetak selftesta" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Selftest error!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Selftest nije uspio" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Provest ce se selftest radi kalibracije preciznog ponovnog postavljanja bez " "senzora." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Info senzora" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Senzor je provjeren, odmah uklonite filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Postavi temperaturu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Postavke" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Veliki nagib" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Ploca" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1978,23 +1961,23 @@ msgstr "" "%cResetiraj" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Pokazi granicnike" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Tih" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Lagani nagib" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2008,56 +1991,55 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Naisao je neki problem, nametnuto Z-niveliranje..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Vrsta" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Sortiranje datoteka" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Brzina" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Okrece se" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Potrebna je stabilna temperatura okoline 21-26C, potrebno je cvrsto " "postolje." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Tiho" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Celicna ploca" @@ -2067,29 +2049,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Zaustavi print" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Strogo" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Podrska" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Zamjenjeno" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "TERMALNA ANOMALIJA" @@ -2124,7 +2106,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC NISKA VOLTAZA" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2133,22 +2115,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Toplinski model još nije kalibriran." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Testiram filament" @@ -2169,7 +2151,7 @@ msgstr "" "sprjecava njegovo kretanje." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2179,7 +2161,7 @@ msgstr "" "optimalnu visinu. Provjerite slike u prirucniku (poglavlje Kalibracija)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2188,39 +2170,39 @@ msgstr "" "poglavlje Prvi koraci, odjeljak Tijek kalibracije." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Vrijeme" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Pauza" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Ukupno" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Totalne pogreske" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Totalno filamenta" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Vrijeme printanja" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Ugodi" @@ -2235,15 +2217,15 @@ msgid "Unload" msgstr "Prazni" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Ispraznite fil." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Praznjenje filamenta" @@ -2260,12 +2242,12 @@ msgid "Unloading to pulley" msgstr "PRAZNJ DO REMENICE" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Provjera nije uspjela, uklonite filament i pokusajte ponovno." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Voltaza" @@ -2276,7 +2258,7 @@ msgid "WARNING TMC TOO HOT" msgstr "UPOZORENJE TMC VRUC" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2288,195 +2270,190 @@ msgstr "" "u tihom modu" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Ceka se korisnik..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Ceka se hladenje PINDA sonde" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Ceka se hladjenje mlaznice i podloge" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Upozore" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Upozorenje: promijenjeni su i tip printera i tip maticne ploce." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Upozorenje: tip maticne ploce je promijenjen." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Upozorenje: promijenjena je vrsta printera." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Je li praznjenje fil. bilo uspjesno?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Greska u ozicenju" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Carobnjak" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "X-ispravan" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH validacija" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ detalji kal" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ kalibracija u redu. Iskrivljenost ce se automatski ispraviti." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ kalibracija je u redu. Osi X/Y su malo nagnute. Bravo!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "XYZ kalibracija je ugrozena. Prednje kalibracijske tocke nisu dostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ kalibracija je ugrozena. Desna prednja tocka kalibracije nije dostupna." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "XYZ kalibracija nije uspjela. Tocka kalibracije podloga nije pronadena." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "XYZ kalibracija nije uspjela. Prednje kalibracijske tocke nisu dostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kalibracija nije uspjela. Molimo pogledajte prirucnik." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "XYZ kalibracija nije uspjela. Desna prednja tocka kalibracije nije dostupna." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ kalibracija u redu. Osi X/Y su okomite. Cestitamo!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y distanca od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Y-ispravan" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Da" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Carobnjak uvijek mozete nastaviti iz Kalibracija -> Carobnjak." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Z-ispravan" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z-sonda br." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] razmak tocke" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "i pritisnite gumb" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "da napuni filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "da isprazni filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "nepoznato" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "nepoznato stanje" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Osvjeziti" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "Neusp. MMU nap" @@ -2514,8 +2491,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU PODNAPON VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Materijal razmjene" @@ -2548,10 +2525,13 @@ msgstr "" "2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Predpunjenje MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH validacija" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 3d4dd8471..e01dd96b9 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 vagy regebbi" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 v. ujabb" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "Vart szint: %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Megsem" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Z allitasa" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Minden rendben" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Keszen vagyunk. Jo nyomtatast!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Abece" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Mindig" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Kornyezet" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "A Z tengely a felso vegponton van?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Seged" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Autom." #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto homeolas" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Auto ero" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Fil. auto.betolt." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "Autom. betoltes be, nyomd meg a gombot es helyzed be a filamentet." @@ -114,49 +112,48 @@ msgid "Avoiding grind" msgstr "Daralas megelozese" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Tengely" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Tengely hossz" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Vissza" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Asztal" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Asztal futes" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Asztal kesz" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Szint. korrekcio" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -169,35 +166,34 @@ msgstr "" " az ujrainditast." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Asztal/Fej futes" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Szij allapot" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Szij teszt" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Aramkieses volt, nyomt. folytatasa?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Fenyes" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Fenyero" @@ -207,17 +203,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMUNIKACIOS HIBA" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "XYZ kalibracio" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Z kalibracio" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -226,13 +222,13 @@ msgstr "" "nem er, majd nyomd meg ha keszen vagy." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Z kalibralasa" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +237,17 @@ msgstr "" "er, majd nyomd meg ha keszen vagy." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Home poz. kalibralas" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibracio" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibracio kesz" @@ -269,130 +265,128 @@ msgstr "" "A muvelet nem hajthato vegre, a filament mar be van toltve. Vedd ki elobb." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Kartya eltavolitva" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Cserelj SD kartyat" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Filament csere" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Csere sikerult!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Sikerult a csere?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "X tengely ellenorzes" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Y tengely ellenorzes" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Z tengely ellenorzes" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Asztal ellenorzese" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Vegallaskapcs. ellen" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Fajl ellenorzese" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Hotend ellenorzese" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Szenz. ellenorzese" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Ellenorzesek" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "TM hiba törlése" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Szin nem jo" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Kozossegi" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Folyt" #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Lehutes" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Kivalasztott nyelv masolasa?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Utkozes" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Utkozes erz." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Utkozes erzekelve." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +397,24 @@ msgstr "" "kapcsolhato be" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Filament vagasa" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Vago" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Sotet" @@ -430,7 +424,7 @@ msgid "Disable" msgstr "Letilt" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Motorok kikapcsol." @@ -442,7 +436,7 @@ msgid "Disengaging idler" msgstr "Gorgo levalasztasa" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -454,7 +448,7 @@ msgstr "" " bekezdest." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -468,7 +462,7 @@ msgid "Done" msgstr "Kesz" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-korrekcio" @@ -497,13 +491,13 @@ msgid "ERR Wait for User" msgstr "Felh. varakozas HIBA" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "HIBA:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Kiadás az MMUból" @@ -515,17 +509,17 @@ msgid "Ejecting filament" msgstr "Filament kiadasa" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Vegallaskapcsolo" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Vegallask. nem kapcs" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Vegallaskapcsolok" @@ -537,30 +531,30 @@ msgid "Engaging idler" msgstr "Gorgo becsatolasa" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autobetolt" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "Dugul. eszlel" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "F. fogyas" @@ -598,8 +592,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FIL. SZORULT" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FSz akcio" @@ -624,36 +618,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW FUTAS HIBA" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Hiba statisztika" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "MMU hiba stat." #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Hamis kivalto ok" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Vent. sebesseg" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Ventillator teszt" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Vent.proba" @@ -682,41 +674,41 @@ msgid "Feeding to nozzle" msgstr "Fuvokahoz toltes" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fil. kifutasok" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. szenzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament es a szine rendben?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. nincs betoltve" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Filament szenzor" @@ -748,42 +740,42 @@ msgstr "" "Ellenorizd a PTFE csovet es a szenzort." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Felhasznalt filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "A fajl vege hianyzik. Folytatod igy is?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Mozdulat befejezese" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Elso reteg kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Elsokent lefuttatom az onellenorzest, hogy megnezzem a leggyakoribb " "osszeszerelesi problemakat." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flow" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -792,28 +784,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Elso targyhuto vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Elulso old[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Elso/bal ventillator" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "A G-kod mas szintre lett elokesztve. Folytassam?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -822,14 +814,14 @@ msgstr "" "megallitva." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "A G-kod mas nyomtato tipusra lett elokesztve.Folytassam?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -838,12 +830,12 @@ msgstr "" "Nyomtatas megallitva." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "A G-kod ujabb firmverre lett elokesztve.Folytassam?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -852,35 +844,35 @@ msgstr "" "Nyomtatas megallitva." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW beallitas" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Futotest/Termisztor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Futes folyamatban" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "A bizonsagi idozito leallitotta a futest" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Futes kesz." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -891,7 +883,7 @@ msgstr "" "nyomtathatsz is." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -900,9 +892,8 @@ msgstr "" " a beallitasi folyamaton?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Magas ero" @@ -913,23 +904,23 @@ msgid "Homing" msgstr "Homeolas" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "A hotend 280C-os! Fuvoka kicserleve es kelloen meghuzva?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Lefuttatom az XYZ kalibraciot. Ez akár 24 percig is eltarthat." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Lefuttatom a Z kalibraciot." @@ -954,7 +945,7 @@ msgid "INVALID TOOL" msgstr "HELYTELEN SZERSZAM" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -968,22 +959,22 @@ msgid "Improving bed calibration point" msgstr "Bed kalibracio pontositasa" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Info kepernyo" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "SD kartya inic." #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Helyezd be a filam." #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -998,14 +989,14 @@ msgid "" msgstr "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Filament behelyezve?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Rajta van az acellap a targyasztalon?" @@ -1015,98 +1006,98 @@ msgid "Iteration" msgstr "Iteracio" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Utolso nyomtatas" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Utolso nyomt. hibak" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Bal" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Bal hotend vent.?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Bal [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Fenyes szint" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Sotet szint" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Lin. korrekcio" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Z magassag beall." #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Ossz.bet" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Filament betolt." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Betolt. fuvokahoz" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Betöltési teszt" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Szin tisztitasa" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Filament betoltese" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Laza szijtarcsa" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Hangos" @@ -1121,8 +1112,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware hiba, kerlek inditsd ujra az MMU-t" #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU Mod" @@ -1132,7 +1122,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NEM VALASZOL" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ujra: Homerseklet visszaallitasa" @@ -1143,14 +1133,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST HIBA" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "MMU hibak" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU bet. hibak" @@ -1166,68 +1156,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU csatlakozott" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Magnes komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Fomenu" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Meroleg. hiba" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Kalibracios pont magassaganak merese" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Halo" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Asztal szintezes" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Modvaltas folyamatban..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modell" @@ -1248,28 +1235,28 @@ msgid "More details online." msgstr "Tovabbi reszletek a neten." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "X mozgatasa" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Y mozgatasa" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Z mozgatasa" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Tengely mozgatasa" @@ -1280,11 +1267,11 @@ msgid "Moving selector" msgstr "Szelektor mozgatasa" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/A" @@ -1294,83 +1281,81 @@ msgid "New firmware version available:" msgstr "Uj firmver verzio erheto el:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nem" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Nincs SD kartya" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Nincs mozgas." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Nincs" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nincs csatlakoztatva" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Nem forog" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Most beallitjuk a fuvoka hegye es a targyasztal felulete kozotti tavolsagot." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Felfutom a fuvokat PLA-hoz." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Vedd le a tesztnyomatot az acellaprol." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Fuvoka" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Fuvoka csereand" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Fuv. atm." @@ -1381,83 +1366,81 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Ki" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Regi beallitasokat talaltam. Az alap PID, Esteps, stb. lesz beallitva." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "Be" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Egyszer" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "SZUNET HOMERSEK.HIBA" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kalibracio" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kal. kesz" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibracio" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "PINDA Futes" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "PINDA kalibracio sikertelen." #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1458,13 @@ msgid "Parking selector" msgstr "Szelektor parkolasa" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Szun." #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Nyomtatas szunet" @@ -1492,7 +1475,7 @@ msgid "Performing cut" msgstr "Filament vagas" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1501,7 +1484,7 @@ msgstr "" " fuvoka hozzaer a papirlaphoz, azonnal kapcsold ki a nyomtatot." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,29 +1493,29 @@ msgstr "" "folytathatod az uzembe helyezest a nyomtato ujrainditasaval." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Nezd meg az IR szenzor csatlakoz., vedd ki a filam., ha bent van." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Kerlek ellenorizd:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Kerlek, tisztisd le a targyasztalt, majd nyomd meg a gombot." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" "Kerlek, tisztisd meg a fuvokat kalibracio elott. Nyomd meg a gombot, ha " "keszen vagy." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1540,7 +1523,7 @@ msgstr "" "betolteshez." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,51 +1532,51 @@ msgstr "" "a betolteshez." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Kerlek eloszor toltsd be a filamentet." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "" "Kerlek, nyisd ki a nyomogorgo ajtajat, es tavolitsd el a filamentet kezzel." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Kerlek, helyzed az acellapot a targyasztalra." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Kerlek, nyomd meg a gombot a filament kiadasahoz" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Kerlek, huzd ki a filamentet most" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Tavolitsd el a szallitasi segedanyagokat." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Kerlek, tavolisd el az acellapot az asztalrol." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Kerlek, elobb futtasd le az XYZ kalibraciot." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Kerlek eloszor vedd ki a filamentet, majd probalkozz ujra." @@ -1603,51 +1586,51 @@ msgid "Please upgrade." msgstr "Kerlek frissits." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Kerlek varj" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Aramkimaradasok" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Elofutes" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Futsd fel a fuvokat!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Fuvoka futese folyamatban. Kerlek, varj." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Melegites vagashoz" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Melegites kiadashoz" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Felfutes betolteshez" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Felfutes kiadashoz" @@ -1658,48 +1641,48 @@ msgid "Preparing blade" msgstr "Penge elokeszites" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Nyomd meg a gombot" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Nyomd meg a gombot a folytatashoz es a fuvoka felfutesehez." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Nyomt. megszakitva" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Targyhuto:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Nyomtatas SD-rol" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Nyomt. szuneteltetve" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Nyomtatasi ido" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Nyomtato IP cime:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1708,12 +1691,12 @@ msgstr "" "lepesek fejezetenek Kalibracio menete bekezdeset." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "A fuvoka atmeroje elter a G-kodtol. Folytasasm?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1738,27 +1721,27 @@ msgid "QUEUE FULL" msgstr "SOR TELE" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Hatso old.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Nyomt. visszaallit" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vedd ki a regi fil., majd nyomd meg a gombot az uj fil. betoltesehez." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Atnevezes" @@ -1772,24 +1755,24 @@ msgstr "" "kivuli ertekeket a G kodban." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Ujrainditas" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "XYZ kal. nullazas" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Nyomt. folytatasa" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Nyomtatas folytatasa" @@ -1811,17 +1794,17 @@ msgid "Returning selector" msgstr "Szelektor vissza" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Jobb" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Jobb old.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1830,8 +1813,8 @@ msgstr "" "fog mindent kezdeni. Folytatod?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SDkartya" @@ -1846,50 +1829,50 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SZELEKTOR NEM MOZOG" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "MEGALLITVA." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Kalibracios pont keresese az asztalon" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Kivalasztas" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Valassz egy filamentet az elso reteg kalibraciojahoz a menubol." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Valassz filamentet:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Valassz nyelvet" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Valaszd ki a fuvoka homersekletet, amelyik megfelel az altalad hasznalt " "anyaghoz ajanlott homersekletnek." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Valassz homersekletet, ami megfelel a filamenthez." @@ -1900,73 +1883,73 @@ msgid "Selecting fil. slot" msgstr "Fil.poz.kivalasztasa" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Ondiagnosztika OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Ondiagnosztika indul" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Ondiagnosztika" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Ondiagnosztika hiba!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Ondiag. sikertelen" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "A pontos szenzor nelkuli homing erdekeben lefuttatom az ondiagnosztikat." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Szenzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Szenzor OK, vedd ki a filamentet most." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Homerseklet beall.:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Beallitasok" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "NagyMerol.hiba" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Acellap" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1979,23 +1962,23 @@ msgstr "" "%cUjrainditas" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Vegallaskapcsolok" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Halk" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Kis merol.hiba" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2009,54 +1992,53 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Hiba tortent, Z szintezes indul..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Rendez" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Fajlok rendezese" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Hang" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Sebesseg" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Forog" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabil 21-26C homerseklet es egy merev allvany (asztal) szukseges." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statisztika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Halk" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Acellapok" @@ -2066,29 +2048,29 @@ msgid "Stop" msgstr "Allj" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Nyomt. megallitasa" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Szigoru" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Tamogatas" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Felcserelve" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "Homersekl. anomalia" @@ -2123,7 +2105,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ALACSONY FESZ." #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2132,22 +2114,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "A termikus modell még nincs kalibrálva." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Homerseklet" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Homersekletek" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Filament tesztelese" @@ -2168,7 +2150,7 @@ msgstr "" "mozgasat." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2179,7 +2161,7 @@ msgstr "" "Kalibracio fejezeteben." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2188,39 +2170,39 @@ msgstr "" " fejezetenek Kalibracio menete bekezdeset." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Ido" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Idotullepes" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Ossz." #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Ossz. hiba" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Osszes filament" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Ossz. nyomt. ido" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Finomhangolas" @@ -2235,15 +2217,15 @@ msgid "Unload" msgstr "Kiadas" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Filament kiadasa" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Filament kiadasa" @@ -2260,12 +2242,12 @@ msgid "Unloading to pulley" msgstr "Kiadas a gorgohoz" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Ellenorzes sikertelen, vedd ki a filamentet es probald ujra." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Feszultsegek" @@ -2276,7 +2258,7 @@ msgid "WARNING TMC TOO HOT" msgstr "FIGYELEM A TMC FORRO" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2289,198 +2271,193 @@ msgstr "" "Halk modban" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Var. a felhasznalora" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "A PINDA szenzor kihuleset varom." #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "A fuvoka es az asztal kihuleset varom." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Figylem." #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Figyelem: a nyomtato es az alaplap tipusa is megvaltozott." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Figyelem: az alaplap tipusa megvaltozott." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Figyelem: a nyomtato tipusa megvaltozott." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Sikerult kivenni a filamentet?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Kabelezesi hiba" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Varazslo" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "X-korrekcio" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH inicializal" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ kal. reszlet" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "XYZ kalibracio OK. Az esetleges X/Y merolegessegi hiba automatikusan " "korrigalva lesz." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "XYZ kalibracio sikerult. Az X/Y tengelyeken enyhe merolegessegi hiba van." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Az XYZ kalibracio sikertelen. Az elulso kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Az XYZ kalibracio sikertelen. A jobb kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Az XYZ kalibracio sikertelen. Az asztal kalibracios pontja nem erheto el." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Az XYZ kalibracio sikertelen. Az elulso kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kalibracio sikertelen. Kerlek, nezz bele a kezikonyvbe." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Az XYZ kalibracio sikertelen. A jobb kalibracios pontok nem erhetoek el." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ kalibracio OK. Az X/Y tengelyek merolegesek. Gratulalok!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y-minimum tavolsag" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Y-korrekcio" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Igen" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "A Varazsolt barmikor elered a Kalibracio -> Varazslo menubol." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Z-korrekcio" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z meres szama" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] pont offszet" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "es nyomd meg a gombot" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "filam. betoltesehez" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "filament kiadasahoz" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "ismeretlen" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "ismeretlen allapot" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Frissites" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU tap hibak" @@ -2518,8 +2495,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU VCC ALACSONY" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Anyagcserék" @@ -2539,8 +2516,8 @@ msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." msgstr "" -"A szelektor nem tud mozogni, mert a FINDA filamentet észlelt. Győződj meg arról," -"hogy nincs fil. a szelektorban, és a FINDA megfelelően működik." +"A szelektor nem tud mozogni, mert a FINDA filamentet észlelt. Győződj meg " +"arról,hogy nincs fil. a szelektorban, és a FINDA megfelelően működik." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 @@ -2552,10 +2529,13 @@ msgstr "" "2.1.9-es verzióra." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Betöltés az MMUba" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH inicializal" + #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index e40fb89b6..df38deb02 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 o inferiore" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 o superiore" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "atteso livello %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Annulla" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Compensaz. Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Nessun errore" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Tutto fatto. Buona stampa!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfabeti" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Sempre" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Ambiente" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "I carrelli Z sin/des sono altezza max?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Trova origine" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Automatico" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autocaric. filam." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Evito triturazione" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Assi" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Lunghezza dell'asse" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Indietro" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Piano" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Riscald. piano" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Piano fatto." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Correz. liv.piano" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Piano/Riscald." #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Stato cinghie" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test cinghie" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Blackout rilevato. Recuperare stampa?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Chiaro" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Luminosita'" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "ERRORE COMUNICAZIONE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Calibra XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Calibra Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" "all'altezza massima. Click per terminare." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Calibrando Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" "all'altezza massima. Click per terminare." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Calibrazione Home" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Calibrazione" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Calibr. completa" @@ -271,130 +267,128 @@ msgstr "" "prima." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "SD rimossa" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Cambia scheda SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Cambia filamento" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Cambio riuscito!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Cambio corretto?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Verifica asse X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Verifica asse Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Verifica asse Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Verifica piano" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Verifica finecorsa" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Verifica file" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Verifica ugello" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Controllo sensori" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Controlli" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Cancella errore TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Colore non puro" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Contribuiti" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Raffredda" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Copiare la lingua selezionata?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Impatto" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Rileva.crash" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Rilevato impatto." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,24 +399,24 @@ msgstr "" "in Modalita normale" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Taglia filamento" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Tagliatr." #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Scuro" @@ -432,7 +426,7 @@ msgid "Disable" msgstr "Disatt." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Disattiva motori" @@ -444,7 +438,7 @@ msgid "Disengaging idler" msgstr "Distacco idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -455,7 +449,7 @@ msgstr "" "impostata. Seguire manuale, Primi Passi, Calibrazione primo strato." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -469,7 +463,7 @@ msgid "Done" msgstr "Fatto" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "Correzione-E" @@ -498,13 +492,13 @@ msgid "ERR Wait for User" msgstr "ERR Attendere utente" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "ERRORE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Espelli da MMU" @@ -516,17 +510,17 @@ msgid "Ejecting filament" msgstr "Espellendo filamento" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Finecorsa" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Finec. fuori portata" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Finecorsa" @@ -538,30 +532,30 @@ msgid "Engaging idler" msgstr "Ingaggio idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Estrusore" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Info estrusore" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "Autocar.fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "Ril. blocco" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "Ril. fine fil" @@ -599,8 +593,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOCC" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "Azione FS" @@ -625,36 +619,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Stat. fallimenti" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Stat.fall. MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falso innesco" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Velocita vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test ventola" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Control.vent" @@ -683,41 +675,41 @@ msgid "Feeding to nozzle" msgstr "Alim. in ugello" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fil. esauriti" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Sensore fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filamento" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filamento estruso e con colore corretto?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. non caricato" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Sensore filam." @@ -750,42 +742,42 @@ msgstr "" "correttamente." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Fil. utilizzato" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "File incompleto. Continuare comunque?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Finaliz. spostamenti" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Cal. primo strato" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 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." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flusso" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,28 +786,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Ventola frontale?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Fronte [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Ventola frontale/sin" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code processato per un livello diverso. Continuare?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -824,14 +816,14 @@ msgstr "" "slice del modello. Stampa annullata." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 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=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -840,12 +832,12 @@ msgstr "" "Annullamento stampa." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code processato per un FW piu recente. Continuare?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -854,35 +846,35 @@ msgstr "" "annullata." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "Impostazioni HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Riscald./Termist." #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Riscaldamento..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Riscald. completo" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +885,7 @@ msgstr "" "stampare." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +894,8 @@ msgstr "" "processo di configurazione?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Forte" @@ -915,23 +906,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend a 280C! Ugello cambiato e serrato secondo le specifiche?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Ventola hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Adesso avviero una Calibrazione XYZ. Puo durare fino a 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." @@ -956,7 +947,7 @@ msgid "INVALID TOOL" msgstr "STRUM NON VAL" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -970,22 +961,22 @@ msgid "Improving bed calibration point" msgstr "Miglioramento punto di calibrazione del piatto" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Schermata info" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Inizial. scheda SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Inserire filamento" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -1000,14 +991,14 @@ msgstr "" "Errore runtime interno. Provare a resettare la MMU o ad aggiornare il FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Il filamento e' stato caricato?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Piastra d'acciaio su piano riscaldato?" @@ -1017,98 +1008,98 @@ msgid "Iteration" msgstr "Iterazione" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Ultima stampa" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Errori ultima stampa" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Sinistra" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Vent SX hotend?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Sinistra [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Liv. Chiaro" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Liv. Scuro" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Correzione lineare" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Compensazione Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Carica tutti" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Carica filamento" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Carica ugello" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Prova di carica." #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Caricando colore" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Caricando filamento" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Puleggia lenta" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Forte" @@ -1123,8 +1114,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Errore interno FW MMU, resettare la MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "Mod. MMU" @@ -1134,7 +1124,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NON RISPONDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Riprova. Ripristino temperatura..." @@ -1145,14 +1135,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST FALLITO" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Fallimenti MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "Car MMU falliti" @@ -1167,68 +1157,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU non risponde. Controlla cavi e connettori." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU connessa" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Comp. Magneti" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Menu principale" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Dev. misurata" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Misura altezza di rif. del punto di calib." #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Griglia" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Liv. griglia piano" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mod." #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Cambio modalita in corso..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modello" @@ -1249,28 +1236,28 @@ msgid "More details online." msgstr "Piu dettagli online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motore" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Sposta X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Sposta Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Sposta Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Muovi asse" @@ -1281,11 +1268,11 @@ msgid "Moving selector" msgstr "Muovo il selettore" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/D" @@ -1295,82 +1282,80 @@ msgid "New firmware version available:" msgstr "Nuova vers. FW disponibile:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "No" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Nessuna SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Nessun movimento." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Nessuno" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normale" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Non connesso" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Non gira" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 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 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Adesso preriscaldero l'ugello per PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Ugello" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Cambio dell'ugello" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Dia.Ugello" @@ -1381,84 +1366,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 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." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Singolo" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERRORE TERMICO" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "Calibrazione PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "Calib. PID completa" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "Calibrazione PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Riscaldamento PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "Calib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Calibrazione temperatura fallita" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1478,13 +1461,13 @@ msgid "Parking selector" msgstr "Posteggio selettore" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pausa" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Metti in pausa" @@ -1495,7 +1478,7 @@ msgid "Performing cut" msgstr "Eseguo taglio" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1504,7 +1487,7 @@ msgstr "" "punti. In caso l'ugello muova il foglio spegnere subito la stampante." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1513,34 +1496,34 @@ msgstr "" "riprendi il Wizard." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Controllare il collegamento al sensore e rimuovere il filamento." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Verifica:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Pulisci il piatto, poi premi la manopola." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Pulire l'ugello per la calibrazione, poi fare click." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 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." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1549,50 +1532,50 @@ msgstr "" "caricarlo." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Carica il filamento, per favore." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 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 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Posizionate la piastra d'acciaio sul piano riscaldato." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Estrarre il filamento immediatamente" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Rimuovete i materiali da spedizione" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Rimuovete la piastra di acciaio dal piano riscaldato" #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Esegui la calibrazione XYZ prima." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Scaricare prima il filamento, poi ripetere l'operazione." @@ -1602,51 +1585,51 @@ msgid "Please upgrade." msgstr "Prego aggiornare." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Attendere" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Interr. corr." #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Preriscalda" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Prerisc. ugello!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Preriscaldando l'ugello. Attendere prego." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Preriscalda. taglio" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Preriscalda. espuls." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Preriscald. carico" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Preriscald. scarico" @@ -1657,48 +1640,48 @@ msgid "Preparing blade" msgstr "Preparo la lama" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Premere la manopola" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Stampa interrotta" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Vent.stam:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Stampa da SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Stampa in pausa" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Tempo di stampa" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Ind. IP stampante:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1707,12 +1690,12 @@ msgstr "" "Primi Passi." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametro ugello diverso da G-Code. Continuare?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1739,27 +1722,27 @@ msgid "QUEUE FULL" msgstr "CODA PIENA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "Porta RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Retro [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Recupero stampa" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Rimuovi il fil. precedente e premi la manopola per caricare il nuovo." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Rinomina" @@ -1773,24 +1756,24 @@ msgstr "" "Controllare l'indice strumento nel G-code (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset calibr. XYZ." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Riprendi stampa" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Riprendi stampa" @@ -1812,17 +1795,17 @@ msgid "Returning selector" msgstr "Ritorno selettore" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Destra" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Destra [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1831,8 +1814,8 @@ msgstr "" "ricominciare dall'inizio. Continuare?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "Mem. SD" @@ -1847,23 +1830,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELETTORE BLOCCATO" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ARRESTATO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Ricerca punti calibrazione piano" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Seleziona" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1872,27 +1855,27 @@ msgstr "" "menu sullo schermo." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Seleziona il filam.:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Seleziona lingua" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selezionate la temperatura per il preriscaldamento dell'ugello adatta al " "vostro materiale." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Seleziona la temperatura appropriata per il tuo materiale." @@ -1903,72 +1886,72 @@ msgid "Selecting fil. slot" msgstr "Seleziono slot fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Autotest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Avvia autotest" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Autotest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Errore Autotest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Autotest fallito" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Verra effettuato un self test per calibrare l'homing senza sensori" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Info Sensore" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Sensore verificato, rimuovere il filamento." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Imposta temperatura:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Impostazioni" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Deviaz. forte" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Piano" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1981,23 +1964,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Stato finecorsa" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Silenz." #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Deviaz. lieve" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2011,55 +1994,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Sono stati rilevati problemi, avviato livellamento Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Ordina" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Ordinando i file" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Suono" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Velocita" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Gira" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 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 c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistiche" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Silenz." #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Piani d'acciaio" @@ -2069,29 +2051,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Arresta stampa" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Esatto" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Supporto" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Scambiato" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" @@ -2126,7 +2108,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2135,22 +2117,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Modello termico non calibrato." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperature" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Provo il filamento" @@ -2171,7 +2153,7 @@ msgstr "" " sia nulla che ne blocchi il movimento." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2182,7 +2164,7 @@ msgstr "" "manuale (capitolo sulla calibrazione)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2191,39 +2173,39 @@ msgstr "" "Primi Passi - Sequenza di Calibrazione." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Cron." #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Totale" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Totale fallimenti" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filamento totale" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Tempo stampa totale" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Regola" @@ -2238,15 +2220,15 @@ msgid "Unload" msgstr "Scarica" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Scarica filam." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Scaricando filamento" @@ -2263,12 +2245,12 @@ msgid "Unloading to pulley" msgstr "Scarico in puleggia" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Verifica fallita, rimuovere il filamento e riprovare." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Voltaggi" @@ -2279,7 +2261,7 @@ msgid "WARNING TMC TOO HOT" msgstr "ATTENZIONE TMC CALDO" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2292,196 +2274,191 @@ msgstr "" "Modalita silenziosa" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Attendendo utente..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "In attesa del raffreddamento della sonda PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "In attesa del raffreddamento dell'ugello e del piano" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Avviso" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 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 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Avviso: tipo di scheda madre cambiato" #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Avviso: tipo di stampante cambiato." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Filamento scaricato con successo?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Errore cablaggio" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Correzione-X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "Inizializza XFLASH" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ Cal. dettagli" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 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 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 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 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato " "trovato." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibraz. XYZ fallita. Consultare manuale." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrazione XYZ OK. Gli assi X/Y sono perpendicolari. Complimenti!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Distanza Y dal min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Correzione-Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Si" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "E possibile riprendere il Wizard in qualsiasi momento attraverso " "Calibrazione -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Correzione-Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Nr. Z-test" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] punto offset" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "e cliccare manopola" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "per caricare il fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "per scaricare fil." #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "sconosciuto" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "stato sconosciuto" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Ricaricare" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "Manc. corr. MMU" @@ -2519,8 +2496,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "SOTTOTENSION MCU VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Scambi materiali" @@ -2553,10 +2530,13 @@ msgstr "" "stampante. Aggiornamento alla versione 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Precarica MMU" +#~ msgid "XFLASH init" +#~ msgstr "Inizializza XFLASH" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 762494658..393de3378 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 of ouder" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 of nieuwer" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s niveau verwacht" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Annuleren" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Z aanpassen" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Allemaal goed" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Klaar. Happy printing!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Altijd" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Kamertemp." #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Zijn beide Z wagen heelemaal boven?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Assist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Startpositie" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Auto power" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autoladen filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Slijpen vermijden" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "As" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Aslengte" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Terug" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Bed" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Bed opwarmen" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Bed klaar" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Bed niveau correct" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Bed/Verwarming" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Riem status" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Riemtest" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Stroomstoring. Print herstellen?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Helder" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Helderheid" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "COMMUNICATIEFOUT" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibratie XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibratie Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" " stoppers. Druk knop als klaar." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibrere Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" "stoppers. Druk knop als klaar." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibreren start" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibratie" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibratie klaar" @@ -271,130 +267,128 @@ msgstr "" "uitladen." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "SD verwijderd" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Wissel SD kaart" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Wissel filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Wissel geslaagd!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Wissel ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Controleer X as" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Controleer Y as" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Controleer Z as" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Controleer bed" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Controleer endstops" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Bestand controle" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Controleer hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Controleer sensors" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Checks" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "TM-fout wissen" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Kleur niet juist" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Van de community" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Door." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Afkoelen" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Geselecteerde taal kopieren?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Crash" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Crashdet." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Crash gedetecteerd." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,24 +399,24 @@ msgstr "" "gebruikt worden" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Fil. knippen" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Mes" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Dim" @@ -432,7 +426,7 @@ msgid "Disable" msgstr "Uitschak" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Motoren uit" @@ -444,7 +438,7 @@ msgid "Disengaging idler" msgstr "Ontkoppel spanrol" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -456,7 +450,7 @@ msgstr "" "calibration." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -470,7 +464,7 @@ msgid "Done" msgstr "Klaar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-correctie" @@ -499,13 +493,13 @@ msgid "ERR Wait for User" msgstr "FOUT Wacht gebruiker" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "FOUT:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Uitwerp. van MMU" @@ -517,17 +511,17 @@ msgid "Ejecting filament" msgstr "Fil. word ontladen" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Eindstop" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Endstop niet geraakt" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Eindstops" @@ -539,30 +533,30 @@ msgid "Engaging idler" msgstr "Koppel spanrol" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autoladen" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F.Jam ontdek." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "FS. uitloop" @@ -600,8 +594,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA NIET FIL.VRIJ" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS actie" @@ -626,36 +620,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FOUT" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Foutstatistieken" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "MMU-Fouten" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Valse triggering" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Fan snelh." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Fan test" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Fans check" @@ -684,41 +676,41 @@ msgid "Feeding to nozzle" msgstr "Voeding tot tuit" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fil. fouten" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament extrudeert met de juiste kleur?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. niet geladen" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Filamentsensor" @@ -750,42 +742,42 @@ msgstr "" " of er niets vastzit in de PTFE-buis. Controleer of de sensor goed leest." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Gebruikte filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Bestand onvolledig. Toch doorgaan?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Voortgang afwerken" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Eerste laag kal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Ten eerste zullen we de zelftest uitvoeren om de meest voorkomende " "montageproblemen te controleren." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Stromen" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,28 +786,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Voorzijde fan?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Voorkant [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Fans voor/links" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-Code is voor een ander niveau geslict. Doorgaan?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -824,14 +816,14 @@ msgstr "" " Druk geannuleerd." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-Code is voor een ander printertype geslict. Doorgaan?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -840,12 +832,12 @@ msgstr "" "alsjeblieft. Druk geannuleerd." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-Code is voor een nieuwere firmware geslict. Doorgaan?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -854,35 +846,35 @@ msgstr "" "alsjeblieft. Druk geannuleerd." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW Configuratie" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Verwarmer/Therm." #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Opwarmen" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Verwarming uitgeschakeld door veiligheidstimer." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Opwarmen klaar." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +885,7 @@ msgstr "" "printen." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +894,8 @@ msgstr "" "installatieproces?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Hoog verm." @@ -915,23 +906,23 @@ msgid "Homing" msgstr "Startpositie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend op 280C! Tuit vervangen en aangedraaid volgens specificaties?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend fan:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Begin nu met xyz-kalibratie. Het kan tot 24 min. duren." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Begin nu met z-kalibratie." @@ -956,7 +947,7 @@ msgid "INVALID TOOL" msgstr "ONGELDIG TOOL" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -970,22 +961,22 @@ msgid "Improving bed calibration point" msgstr "Verbetering van het bedijkingspunt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Info scherm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. SD kaart" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Voer filament in" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -1001,14 +992,14 @@ msgstr "" "werken." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Is filament geladen?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Ligt de staalplaat op het bed?" @@ -1018,98 +1009,98 @@ msgid "Iteration" msgstr "Iteratie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Laatste print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Laatste printfouten" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Links" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Linker hotend fan?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Linkerkant[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Helder waard" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Dim waarde" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Lineaire correctie" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Live Z aanpassen" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Laad alle" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Filament laden" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Tot tuit laden" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Ladingstest" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Laden kleur" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Laden filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Losse riemschijf" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Hard" @@ -1124,8 +1115,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware interne fout, reset de MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU Mod" @@ -1135,7 +1125,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU REAGEERT NIET" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: Temperatuur herstellen..." @@ -1146,14 +1136,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU ZELFTEST MISLUKT" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "MMU fout" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU laadfout" @@ -1168,68 +1158,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU reageert niet. Controleer de bedrading en connectoren." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU verbonden" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Magnet. comp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Hoofdmenu" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Scheefheid" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Referentie hoogte van het kalibratiepunt meten" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Mesh bed Leveling" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Stand" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Moduswijziging bezig..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Model" @@ -1250,28 +1237,28 @@ msgid "More details online." msgstr "Meer details online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Verplaats X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Verplaats Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Verplaats Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "As verplaatsen" @@ -1282,11 +1269,11 @@ msgid "Moving selector" msgstr "Bewege selector" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/V" @@ -1296,82 +1283,80 @@ msgid "New firmware version available:" msgstr "Nieuwe firmware versie beschikbaar:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nee" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Geen SD kaart" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Geen beweging." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Geen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normaal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Niet verbonden" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Draait niet" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Begin met kalibratie tussen de tuit en het bed." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Opwarmen van de tuit voor PLA voor." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Verwijder nu de testprint van staalplaat." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Tuit" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Tuit wisselen" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Tuit d." @@ -1382,84 +1367,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Uit" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Oude instellingen gevonden. Standaard PID, E-steps etc. instellingen worden " "geladen." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "Aan" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Eenmaal" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE TERMISCHE FOUT" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kalibratie klaar" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibratie" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "PINDA opwarmen" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kalib." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "PINDA-kalibratie mislukt" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1479,13 +1462,13 @@ msgid "Parking selector" msgstr "Parkere selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pauze" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Print pauzeren" @@ -1496,7 +1479,7 @@ msgid "Performing cut" msgstr "Voer cut uit" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1505,7 +1488,7 @@ msgstr "" "tuit. Als de tuit het papier beweegt, onmiddellijk uitschakelen." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1514,36 +1497,36 @@ msgstr "" "wizard door de printer opnieuw te starten." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" "AUB IR sensor ver- binding kontrolleren , verwijder filament indien " "aanwezig." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Controleer aub:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Maak het bed schoon en druk op de knop." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Reinig de tuit voor de kalibratie. Druk op de knop wanneer gereed." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Steek a.u.b. filament in de extruder en druk op de knop om het te laden." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1552,50 +1535,50 @@ msgstr "" " te laden." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Laad a.u.b. eerst filament." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Open spanrol en verwijder filament handmatig." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Leg staalplaat op bed." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Druk op de knop om filament te verwijderen" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Trek onmiddellijk de filament eruit" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Verwijder eerst de transport beschermers." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Verwijder staalplaat van het bed." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Voer eerst de XYZ-kalibratie uit." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Verwijder eerst het filament en probeer het opnieuw." @@ -1605,51 +1588,51 @@ msgid "Please upgrade." msgstr "Voer een upgrade uit" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Even geduld aub" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Stroomstoringen" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Voorverwarmen" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Tuit voorverwarmen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Opwarmen van de tuit. Wacht aub." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Opwarm. te snijden" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Opwarm.te uitwerpen" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Opwarmen invoeren" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Opwarmen uitwerpen" @@ -1660,48 +1643,48 @@ msgid "Preparing blade" msgstr "Bereid mes voor" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Druk op knop" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Druk op de knop om de tuit voor te verwarmen en door te gaan." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Print afgebroken" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Print fan:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Print van SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Print pauzeren" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Print tijd" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Printer IP-adres:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1710,12 +1693,12 @@ msgstr "" "steps, sectie Calibration flow." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Tuitdiameter wijkt af van de G-code. Doorgaan?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1742,28 +1725,28 @@ msgid "QUEUE FULL" msgstr "QUEUE VOL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Achterkant[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Print herstellen" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "" "Verwijder de oude filament en druk op de knop om nieuwe filament te laden." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Hernoem" @@ -1777,24 +1760,24 @@ msgstr "" "de G-code voor filament index buiten bereik (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Print hervatten" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Hervatten print" @@ -1816,17 +1799,17 @@ msgid "Returning selector" msgstr "Selctor terugrijden" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Rechts" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Recht.kant[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1835,8 +1818,8 @@ msgstr "" " vanaf het begin. Doorgaan?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD kaart" @@ -1851,23 +1834,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR BEWEG FOUT" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "GESTOPT." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Zoeken bed kalibratiepunt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Selecteer" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1876,27 +1859,27 @@ msgstr "" " het schermmenu." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Kies filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Kies taal" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw " "materiaal." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Selecteer de temperatuur die overeenkomt met uw materiaal." @@ -1907,74 +1890,74 @@ msgid "Selecting fil. slot" msgstr "Selectere fil. slot" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Zelftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Zelftest start" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Zelftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Zelftest fout!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Zelftest mislukt" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Zelftest zal worden uitgevoerd om nauwkeurige sensorloze auto positie te " "kalibreren." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Sensor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Sensor geverifieerd, verwijder nu het filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Temp. instellen:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Instellingen" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Erg scheef" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Staalplaat" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1987,23 +1970,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Toon endstops" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Stil" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Beetje scheef" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2017,56 +2000,55 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Er is een probleem opgetreden, Z-kalibratie afgedwongen ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Sort." #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Bestanden sorteren" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Geluid" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Snelheid" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Draait" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "En stabiele 21-26C omgevingstemperatuur is nodig,een stevige stand is " "vereist." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistieken" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Stil" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Staalplaten" @@ -2076,29 +2058,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Print stoppen" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Gewisseld" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" @@ -2133,7 +2115,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ONDERVOLT. FOUT" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2142,22 +2124,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Thermo model nog ongekalibreerd." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatuur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperaturen" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Teste filament" @@ -2178,7 +2160,7 @@ msgstr "" "zit." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2189,7 +2171,7 @@ msgstr "" "(Calibration chapter)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2198,39 +2180,39 @@ msgstr "" "handleiding, hoofdstuk First steps, section Calibration flow." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Tijd" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Time-out" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Totaal" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Totaal fouten" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Totaal fil." #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Totaal printtijd" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Fijnafstemming" @@ -2245,15 +2227,15 @@ msgid "Unload" msgstr "Ontla." #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Fil. uitwerpen" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Uitwerpen filament" @@ -2270,12 +2252,12 @@ msgid "Unloading to pulley" msgstr "Ontlade n. riemschi." #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Verificatie mislukt, verwijder het filament en probeer het opnieuw." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Spanning" @@ -2286,7 +2268,7 @@ msgid "WARNING TMC TOO HOT" msgstr "WAARSCH. TMC TE HEET" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2299,193 +2281,188 @@ msgstr "" "Stealth stand" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Wacht op gebruiker.." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Wachten op afkoelen van PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Wachten op afkoelen van tuit en bed" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Waarsch." #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "" "Waarschuwing: zowel het printertype als het moederbordtype is gewijzigd." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Waarschuwing: type moederbord gewijzigd." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Waarschuwing: printertype gewijzigd." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Is filament succes- vol verwijderd?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Aansluitingsfout" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "X-correctie" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ kal. details" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "XYZ-kalibratie in orde. Scheefheid zal automatisch worden gecorrigeerd." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ-kalibratie in orde. X / Y-assen zijn licht scheef. Goed gedaan!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-kalibratie niet gelukt. Voorste kalibratiepunten niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-kalibratie niet gelukt. Rechter voor kalibratiepunt niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-kalibratie mislukt. Bed ijkpunt niet gevonden." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-kalibratie mislukt. Raadpleeg de handleiding aub." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-kalibratie ok. X / Y-assen staan loodrecht. Gefeliciteerd!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y afstand van min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Y-correctie" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "U kunt de wizard altijd hervatten via Kalibratie -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Z-correctie" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z-test nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] punt offset" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "en druk op knop" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "om filament te laden" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "om fil. uitwerpen" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "onbekend" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "Status onbekend" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Refresh" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU stroomstor." @@ -2523,8 +2500,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU ONDERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Materailwisseling." @@ -2557,10 +2534,13 @@ msgstr "" "printer. Update naar versie 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Voorladen in MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 268070f83..df19df39c 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 eller eldre" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 eller nyere" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s nivå ventet" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Avbryt" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Justerer Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Alt korrekt" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Alt klart. God printing!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Alltid" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Omgivelse" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Er venstre og høyre Z-vogn helt oppe?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Hjelp" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto hjem" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Autostyrke" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "AutoLast filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Unngår sliping" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Akse" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Akselengde" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Tilbake" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Seng" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Sengen varmes" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Seng ferdig" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Plankorrekt seng" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" "omstart." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Seng/Varmer" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Beltestatus" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Belte test" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Oppdaget Strømbrudd! Gjenoppta print?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Lys" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Lysstyrke" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKASJONSFEIL" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibrer XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" "Deretter trykk." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibrer Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" " trykk." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibrerer hjem" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibrering" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibrering ferdig" @@ -270,130 +266,128 @@ msgstr "" "Kan ikke utføre handling, filamentet er allerede lasted. Avless det først." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Kort fjernet" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Bytt SD kort" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Bytt filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Bytte vellykket!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Byttet riktig?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Sjekker X aksen" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Sjekker Y aksen" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Sjekker Z aksen" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Sjekker seng" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Sjekker endesensorer" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Sjekker fil" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Sjekker hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Sjekker sensorer" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "G-code sjekk" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Fjern TM-feil" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Farge ikke riktig" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Community laget" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Fort." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Nedkjøling" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Kopiere det valgte språket?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Krasj" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Krasjdetek." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Krasj oppdaget." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -404,24 +398,24 @@ msgstr "" "Normal modus" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Kutt filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Kutter" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Dato:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Svak" @@ -431,7 +425,7 @@ msgid "Disable" msgstr "Deaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Frigjør motorer" @@ -443,7 +437,7 @@ msgid "Disengaging idler" msgstr "Frigjør tomgangshjul" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -454,7 +448,7 @@ msgstr "" "manualen, under First Steps, for hvordan det første laget skal kalibreres." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -468,7 +462,7 @@ msgid "Done" msgstr "Ferdig" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-korreksjon" @@ -497,13 +491,13 @@ msgid "ERR Wait for User" msgstr "ERR Vent på Bruker" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "FEIL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Løs ut fra MMU" @@ -515,17 +509,17 @@ msgid "Ejecting filament" msgstr "Mater ut filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Endesensor" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Traff ikke endesens." #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Endesensorer" @@ -537,30 +531,30 @@ msgid "Engaging idler" msgstr "Aktiverer tomgangsh." #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Ekstruderinfo" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autolast" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F. kork føle" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "F. Løput" @@ -598,8 +592,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. FAST" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS aksjon" @@ -624,36 +618,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEIL" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Feilstatistikk" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Feil stat. MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falskt utløsning" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Viftehastighet" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Viftetest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Viftesjekk" @@ -682,41 +674,41 @@ msgid "Feeding to nozzle" msgstr "Mater til dyse" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Tomt filament" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. Sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Kommer Filament ut og har riktig farge?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. ikke lastet" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Filamentsensor" @@ -748,40 +740,40 @@ msgstr "" "ingenting står fast i PTFE røret. Sjekk at sensoren leser riktig." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Brukt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Fil er ukomplett. Fortsette allikevel?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Avslutter bevegelser" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Førstelagskal." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "Først skal jeg kjøre en selvtest for å sjekke vanlige byggefeil." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flyt" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -790,28 +782,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Fremre printvifte?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Fremsiden [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Fremre/venstre vifte" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code sliced for en annen høyde. Fortsette?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -819,14 +811,14 @@ msgstr "" "G-code sliced for en annen høyde. Vennligst slice igjen. Print avbrutt." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code sliced for en annen printer. Fortsette?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -834,12 +826,12 @@ msgstr "" "G-code sliced for en annen printer. Vennligst slice igjen. Print avbrutt." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code sliced for nyere fastvare. Fortsette?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -848,35 +840,35 @@ msgstr "" "avbrutt." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "GW oppsett" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Varmer/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Varmer opp" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Varme skrudd av pga. sikkerhet." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Oppvarming ferdig." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -886,7 +878,7 @@ msgstr "" "oppsett, hvor Z aksen blir kalibrert. Du er da klar til å printe." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -895,9 +887,8 @@ msgstr "" "gjennom oppsettprosessen?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Høy styrke" @@ -908,23 +899,23 @@ msgid "Homing" msgstr "Søker" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend på 280C! Dyse byttet og strammet til spesifikasjonene?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend-vifte:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Nå skal jeg kjøre kalibreringen. Det kan ta opptil 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Nå kjører jeg Z-kalibreringen." @@ -949,7 +940,7 @@ msgid "INVALID TOOL" msgstr "UGYLDIG VERKTØY" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -963,22 +954,22 @@ msgid "Improving bed calibration point" msgstr "Forbedrer seng kalibreringspunkt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Infoskjerm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. SD kort" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Sett inn filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -991,14 +982,14 @@ msgid "" msgstr "Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Er filament lastet?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Er stålplaten på varmesenga?" @@ -1008,98 +999,98 @@ msgid "Iteration" msgstr "Iterasjon" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Siste print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Siste printfeil" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Venstre" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Venst. hotendvifte?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Vens. side[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Nivå Lyst" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Nivå Dimmet" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Lin. korreksjon" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Juster Live-Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Last Alle" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Last inn filam." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Last til dysen" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Lastetest" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Laster farge" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Laster filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Løs reim" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Høyt" @@ -1114,8 +1105,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU fastvare intern feil, vennligst nullstill MMU-en." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU Mod." @@ -1125,7 +1115,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU SVARER IKKE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: gjenoppretter temperatur..." @@ -1136,14 +1126,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SELVTEST FEILET" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "MMU feil" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU lastefeil" @@ -1158,68 +1148,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU svarer ikke. Sjekk ledninger og koblinger." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU tilkoblet" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Magnet komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Hovedmeny" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Målt skjevhet" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Måler referansehøyde for kalibreringspunkt" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Plan-nett" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Sengeplanering" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Modus" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Modus endres..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modell" @@ -1240,28 +1227,28 @@ msgid "More details online." msgstr "Flere detaljer online" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Beveg X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Beveg Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Beveg Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Beveg akse" @@ -1272,11 +1259,11 @@ msgid "Moving selector" msgstr "Flytter velger" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr " -" @@ -1286,82 +1273,80 @@ msgid "New firmware version available:" msgstr "Ny fastvare tilgjengelig:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nei" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "SD-kort mangler" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Ingen bevegelse." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Ingen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Ikke tilkoblet" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Spinner ikke" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Jeg vil nå kalibrere avstanden mellom tuppen av dysen og varmeplaten." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Jeg vil nå forvarme dysen for PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Fjern nå testprintet fra stålplaten." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Dyse" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Dysebytte" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Dyse diam." @@ -1372,83 +1357,81 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Av" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Gamle verdier funnet Standarinnstillinger for PID, Esteg etc. blir satt." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "På" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "En gang" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSET THERMISK FEIL" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kal. ferdig" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibrering" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "PINDA varmes" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "PINDA kalibrering mislyktes" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1468,13 +1451,13 @@ msgid "Parking selector" msgstr "Parkerer velger" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pause" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pause printjobben" @@ -1485,7 +1468,7 @@ msgid "Performing cut" msgstr "Utfører kutt" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1494,7 +1477,7 @@ msgstr "" "dysen tar papiret, skru umiddelbart av printeren." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1503,34 +1486,34 @@ msgstr "" "omstarte printeren." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "" "Vennligst sjekk koblingen til IR sensorer. Last ut filament om lastet." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Venligst sjekk:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Rengjør stålplaten og trykk valghjulet." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Rengjør dysen og trykk valghjulet." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "Sett inn filament I ekstruderen og trykk valghjulet for å laste." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1539,50 +1522,50 @@ msgstr "" "laste." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Vennligst sett inn filament først." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Åpne taljedøren og fjern filamentet for hånd." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Plasser stålplaten på varmesenga." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Trykk valghjulet for å ta ut filamentet" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Trekk ut filamented med en gang" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Vennligst fjern sendingsbeskyttelsen først." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Vennligst ta stålplaten av varmesenga." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Vennligst fullfør XYZ kalibreringen først." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "" "Vennligst last ut filamentet først, deretter repeter denne handlingen." @@ -1593,51 +1576,51 @@ msgid "Please upgrade." msgstr "Vennligst oppdater." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Vennligst vent" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Strømfeil" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Forvarming" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Forvarm dysen!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Forvarmer dysen. Vennligst vent..." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Forvarmer for kutt" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Forvarmer for utmat." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Forvarmer for last" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Forvarmer for fil." @@ -1648,48 +1631,48 @@ msgid "Preparing blade" msgstr "Forbereder blad" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Trykk valghjulet" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Trykk valghjulet for å forvarme dysen og fortsette." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Print avbrutt" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Printvifte:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Print fra SD-kort" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Print satt på pause" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Printetid" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Printer IP adr.:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1697,12 +1680,12 @@ msgstr "" "Printeren er ikke kalibrert. Vennligst se manualen, under First Steps." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Dysediameteren er forskjellig fra G-Code. Fortsette?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1727,27 +1710,27 @@ msgid "QUEUE FULL" msgstr "FULL KØ" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Baksiden [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Gjenopptar print" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Ta bort det gamle filamentet og trykk valghjulet for å laste et nytt." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Gi nytt navn" @@ -1761,24 +1744,24 @@ msgstr "" "g-code for verktøys-inteks ut av rekkevidde (T0-T4)" #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Nullstill" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Nullstill XYZ kal." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Gjenoppta print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Gjenopptar print" @@ -1800,17 +1783,17 @@ msgid "Returning selector" msgstr "Returnerer velger" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Høyre" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Høyre side[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1819,8 +1802,8 @@ msgstr "" "begynne på nytt. Fortsette?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD-kort" @@ -1835,48 +1818,48 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR STÅR FAST" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "STOPPET." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Søker etter kalibreringspunkt" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Velg" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Velg filamenttype for Førstelags- kalibrering." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Velg filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Velg språk" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "Velg dysetemperatur som passer ditt materiale." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Velg temperaturen som passer ditt materiale." @@ -1887,73 +1870,73 @@ msgid "Selecting fil. slot" msgstr "Velger fil. spor" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Selvtest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Selvtest starter" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Selvtest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Selvtest feil!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Selvtest feilet" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Selvtest vil bli kjørt for å kalibrere nøyaktig sensorløs hjemposisjon." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Sensorinformasjon" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Sensor verifiserte, fjern filamentet nå." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Satt temperatur:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Innstillinger" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Stor skjevhet" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Plate" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1966,23 +1949,23 @@ msgstr "" "%cNullstill" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Vis endesensorer" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Lydløs" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Lett skjevhet" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -1994,55 +1977,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Problem møtt. Z aksjeplanering tvunget ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Sorter" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Sorter filer" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Lyd" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Hastighet" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Spinner" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "En stabil rom- temperatur på 21-26C og et solid underlag er nødvendig." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistikk" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Stille" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Stål plate" @@ -2052,29 +2034,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Stopp printjobb" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Streng" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "System info" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Byttet" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "THERMISK ANOMALI" @@ -2109,7 +2091,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC LAVSPENNING FEIL" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2118,22 +2100,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Termisk modell ikke kalibrert enda." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Tester filament" @@ -2152,7 +2134,7 @@ msgstr "" "Velgeren kan ikke gå hjem riktig. sjekk om noe står i veien for bevegelsen." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2163,7 +2145,7 @@ msgstr "" "skal se ut." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2172,39 +2154,39 @@ msgstr "" "hovedmenyen og følg Veilederen." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Dato" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Tidsavbrudd" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Totalt" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Feil totalt" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filament totalt" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Printetid totalt" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Juster" @@ -2219,15 +2201,15 @@ msgid "Unload" msgstr "Last ut" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Last ut filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Laster ut filament" @@ -2244,12 +2226,12 @@ msgid "Unloading to pulley" msgstr "Utlaster til trinse" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Verifisering feilet. Fjern filamentet og prøv igjen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Strøm/Volt" @@ -2260,7 +2242,7 @@ msgid "WARNING TMC TOO HOT" msgstr "VARSEL TMC FOR VARM" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2273,192 +2255,187 @@ msgstr "" "Stillemodus" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Venter på bruker..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Venter på PINDA nedkjøling" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Venter på dyse- og platenedkjøling" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Advarsel" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Advarsel: Både printertype og hovedkortype er forandret." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Advarsel: Hovedkortype forandret." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Advarsel: Printertype forandret." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Ble filamentet lastet helt ut?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Koblingsfeil" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Veileder" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "X-korreksjon" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ cal. detaljer" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ kalibreringen er grei. Skjevhet blir justert automatisk." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ kalibreringen er god. Godt jobba!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ kalibreringen feilet. Front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "XYZ kalibreringen feilet. Høyre front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ kalibreringen feilet. Kalibreringspunkt ikke funnet." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ kalibreringen feilet. Front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ kal. mislyktes. Vennligst rådfør med håndboken." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ kalibreringen feilet. Høyre front kalibreringspunkt ikke nådd." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "" "XYZ kalibrering OK.\n" "X og Y aksen er perpendikulær. Gratulerer!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y distanse fra min." #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Y-korreksjon" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Du kan alltid starte Veilederen fra Kalibrering -> Veileder." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Z-korreksjon" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z-sensor nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] punktforskyv." #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "og trykk på knappen" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "for filamentlast" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "for filament ut" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "ukjent" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "ukjent tilstand" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Forfriske" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU strøm feil" @@ -2496,8 +2473,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU UNDERSPENN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Materialutveksling" @@ -2530,10 +2507,13 @@ msgstr "" "versjon 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Forlast til MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 37937874a..9ed3e6b5b 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 lub starszy" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 lub nowszy" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "Oczekiwano wersji %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Anuluj" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Ustawianie Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Wszystko OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Gotowe. Udanego drukowania!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfab" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Zawsze" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Otoczenie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Obydwa konce osi sa na szczycie?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Asyst." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto zerowanie" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Automatycz" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autoladowanie fil." #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Unikaj scierania" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Dlugosc osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Wstecz" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Stol" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Grzanie stolu" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Stol OK" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Korekta stolu" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Stol/Grzanie" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Stan paskow" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test paskow" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Wykryto zanik napiecia.Kontynowac?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Jasny" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Jasnosc" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "BLAD KOMUNIKACJI" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibracja XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibruj Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" "ogranicznikow. Nacisnij, by potwierdzic." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibruje Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" "ogranicznikow. Nacisnij, by potwierdzic." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Zerowanie osi" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibracja" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibracja OK" @@ -270,130 +266,128 @@ msgstr "" "Nie mozna wykonac akcji, filament jest juz zaladowany. Rozladuj go najpierw." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Karta wyjeta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Zmiana karty SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Wymiana filamentu" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Wymiana ok!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Wymiana ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Kontrola osi X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Kontrola osi Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Kontrola osi Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Kontrola stolu" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Kontrola krancowek" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Sprawdzanie pliku" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Kontrola hotendu" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Kontrola czujnikow" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Testy" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Wyczyść błąd TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Kolor zanieczysz." #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Od spolecznosci" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Kont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Chlodzenie" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Skopiowac wybrany jezyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Zderzen" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Wykr.zderzen" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Zderzenie wykryte" #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -405,24 +399,24 @@ msgstr "" "trybie Normalnym" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Ciecie filamentu" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Nozyk" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Sciemn" @@ -432,7 +426,7 @@ msgid "Disable" msgstr "Wylacz" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Wylacz silniki" @@ -444,7 +438,7 @@ msgid "Disengaging idler" msgstr "Zwalnianie docisku" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -455,7 +449,7 @@ msgstr "" " z instrukcja: rozdzial Wprowadzenie." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -469,7 +463,7 @@ msgid "Done" msgstr "Wyk." #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "Korekcja-E" @@ -498,13 +492,13 @@ msgid "ERR Wait for User" msgstr "ERR czekam na uzytk." #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "BLAD:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Wysun z MMU" @@ -516,17 +510,17 @@ msgid "Ejecting filament" msgstr "Wysuwanie filamentu" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Krancowka" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Krancowka nie aktyw." #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Krancowki" @@ -538,30 +532,30 @@ msgid "Engaging idler" msgstr "Urucham. docisku" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Ekstruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Ekstruder - info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "Autolad. fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "Zaciecie fil." #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "Koniec fil." @@ -600,8 +594,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FIL. ZABLOK." #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "Akcja FS" @@ -626,36 +620,34 @@ msgid "FW RUNTIME ERROR" msgstr "BLAD DZIALANIA FW" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Statystyki bledow" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Bledy MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falszywy alarm" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Predkosc went." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test wentylatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Sprawd.went." @@ -684,41 +676,41 @@ msgid "Feeding to nozzle" msgstr "Podaw. do dyszy" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Konc.filamentu" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Czuj. filam." #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament wychodzi z dyszy,kolor jest ok?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. nie zaladowany" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Czujnik filamentu" @@ -750,42 +742,42 @@ msgstr "" "nic nie utknelo w rurce PTFE. Sprawdz czy czujnik odczytuje prawidlowo." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Uzyty filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Plik niekompletny. Kontynowac?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Konczenie druku" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Kal. 1. warstwy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas " "montazu." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Przeplyw" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,28 +786,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Przedni went. druku?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Przod [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Przedni/lewy wentyl." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code pociety dla innej wersji. Kontynuowac?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -823,14 +815,14 @@ msgstr "" "G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 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=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -839,47 +831,47 @@ msgstr "" "anulowany." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code pociety dla nowszego FW. Kontynuowac?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." msgstr "G-code pociety dla nowszego FW. Zaktualizuj FW. Druk anulowany." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "Ustawienia HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Grzalka/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Grzanie..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Grzanie zakonczone" #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -889,7 +881,7 @@ msgstr "" "krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -898,9 +890,8 @@ msgstr "" "ustawieniem?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Wysoka wyd" @@ -911,24 +902,24 @@ msgid "Homing" msgstr "Bazowanie" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "" "Hotend rozgrzany do 280°C! Dysza wymieniona i dokręcona wg specyfikacji?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Went. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Przeprowadze teraz kalibracje XYZ. Zajmie to do 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." @@ -953,7 +944,7 @@ msgid "INVALID TOOL" msgstr "BLEDNE NARZEDZIE" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -967,22 +958,22 @@ msgid "Improving bed calibration point" msgstr "Poprawa punktu kalibracji stolu" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Ekran informacyjny" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Inic. karty SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Wprowadz filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -997,14 +988,14 @@ msgid "" msgstr "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Filament jest zaladowany?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Czy plyta stal. jest na podgrzew. stole?" @@ -1014,98 +1005,98 @@ msgid "Iteration" msgstr "Iteracja" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Ost. wydruk" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Ostatnie bledy druku" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Lewa" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Lewy went hotendu?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Lewo [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Poziom jasn." #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Poziom ciem." #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Korekcja liniowa" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Ustaw. Live Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Zalad. wszystkie" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Ladowanie fil." #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Zaladuj do dyszy" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Test ładowania" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Czyszcz. koloru" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Laduje filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Luzne kolo pasowe" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Glosny" @@ -1120,8 +1111,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Blad wewnetrzny MMU FW, zresetuj MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "Tryb MMU" @@ -1131,7 +1121,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NIE ODPOWIADA" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU wznaw. Nagrzewanie..." @@ -1142,14 +1132,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU BLAD SELFTEST" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Bledy MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "Bledy lad. MMU" @@ -1164,68 +1154,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU nie reaguje. Sprawdz okablowanie i zlacza." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU podlaczone" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Kor. magnesow" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Menu glowne" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Zmierz. skos" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Okreslam wysokosc odniesienia punktu kalibracyjnego" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Siatka" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Poziomowanie stolu" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Tryb" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Trwa zmiana trybu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Model" @@ -1246,28 +1233,28 @@ msgid "More details online." msgstr "Więcej szczegółów online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Silnik" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Ruch osi X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Ruch osi Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Ruch osi Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Ruch osi" @@ -1278,11 +1265,11 @@ msgid "Moving selector" msgstr "Ruch wybieraka" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/D" @@ -1292,82 +1279,80 @@ msgid "New firmware version available:" msgstr "Dostepna nowa wersja FW:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nie" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Brak karty SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Brak ruchu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Brak" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nie podlaczono" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Nie kreci sie" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 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 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Nagrzewam dysze dla PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Teraz zdejmij wydruk testowy ze stolu." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Dysza" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Wymiana dyszy" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Sr. dyszy" @@ -1378,84 +1363,82 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Wyl" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, " "itp." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "Wl" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "1-raz" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUZA BLAD TERMICZNY" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "Kalibracja PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "Kal. PID zakonczona" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "Kalibracja PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Grzanie sondy PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "Kalib. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Kalibracja temperaturowa nieudana" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1458,13 @@ msgid "Parking selector" msgstr "Parkowanie wybieraka" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Wstrzym. wydruku" @@ -1492,7 +1475,7 @@ msgid "Performing cut" msgstr "Odcinanie" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1501,7 +1484,7 @@ msgstr "" "punktow. Jesli dysza zahaczy o papier, natychmiast wylacz drukarke." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,33 +1493,33 @@ msgstr "" "Asystenta przez restart drukarki." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Sprawdz:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Oczysc powierzchnie druku i nacisnij pokretlo." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 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." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1545,50 +1528,50 @@ msgstr "" "zaladowac." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Najpierw zaladuj filament." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Umiescic plyte stalowa na stole podgrzewanym." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Wyciagnij filament teraz" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Najpierw usun zabezpieczenia transportowe" #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Zdjac plyte stalowa z podgrzewanego stolu." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Najpierw uruchomic kalibracje XYZ" #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Najpierw rozladuj filament, nastepnie powtorz czynnosc." @@ -1598,51 +1581,51 @@ msgid "Please upgrade." msgstr "Prosze zaktualizowac" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Prosze czekac" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Zaniki zasil." #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Grzanie" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Nagrzej dysze!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Nagrzewanie dyszy. Prosze czekac." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Nagrzew. obciecia" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Nagrzew. wysuniecia" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Nagrzew.do ladowania" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Nagrzew. do rozlad." @@ -1653,48 +1636,48 @@ msgid "Preparing blade" msgstr "Przygot. ostrza" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Wcisnij pokretlo" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Druk przerwany" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "WentWydruk:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Druk z karty SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Druk wstrzymany" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Czas druku" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Adr. IP drukarki:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1703,12 +1686,12 @@ msgstr "" "Pierwsze Kroki." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Srednica dyszy rozni sie od tej w G-code. Kontynuowac?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1735,27 +1718,27 @@ msgid "QUEUE FULL" msgstr "KOLEJKA PELNA" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Tyl [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Wznawianie wydruku" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Wyciagnij poprzedni filament i nacisnij pokretlo aby zaladowac nowy." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Zmien nazwe" @@ -1769,24 +1752,24 @@ msgstr "" " pod wzgledem indeksu narzedzia poza zakresem (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset kalibr. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Wznowic wydruk" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Wznawianie druku" @@ -1808,17 +1791,17 @@ msgid "Returning selector" msgstr "Powrot wybieraka" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Prawa" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Prawo [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1827,8 +1810,8 @@ msgstr "" "Kontynuowac?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "Karta SD" @@ -1843,23 +1826,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "WYBIERAK NIE RUSZA" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZATRZYMANO." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Szukam punktu kalib. na stole" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Wybierz" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1868,25 +1851,25 @@ msgstr "" "ekranowym." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Wybierz filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Wybor jezyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "Wybierz temperature grzania dyszy odpowiednia dla materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Wybierz temperature, ktora odpowiada Twojemu filamentowi." @@ -1897,74 +1880,74 @@ msgid "Selecting fil. slot" msgstr "Wybieranie slotu fil" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Selftest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Selftest startuje" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Selftest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Blad selftest!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Selftest nieudany" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez " "krancowek" #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Info o sensorach" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Czujnik sprawdzony, wyciagnij filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Ustaw temperature:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Ustawienia" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Znaczny skos" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Plyta" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1977,23 +1960,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Pokaz krancowki" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Cichy" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Lekki skos" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2007,55 +1990,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Wykryto problem, wymuszono poziomowanie osi Z." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Sort." #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Sortowanie plikow" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Dzwiek" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Predkosc" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Kreci sie" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 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 c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statystyki" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Cichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Plyty stalowe" @@ -2065,29 +2047,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Przerwanie druku" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Restr." #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Wsparcie" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Zamieniono" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" @@ -2122,7 +2104,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ZA NIS. NAPIECIE TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2131,22 +2113,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Model termicznego nie zostal skalib." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperatury" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Test filamentu" @@ -2167,7 +2149,7 @@ msgstr "" " ruchu." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2178,7 +2160,7 @@ msgstr "" " Kalibracja)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2187,39 +2169,39 @@ msgstr "" " Kroki." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Czas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Wyl. czas." #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Suma" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Suma bledow" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Zuzycie filamentu" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Laczny czas druku" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Strojenie" @@ -2234,15 +2216,15 @@ msgid "Unload" msgstr "Rozladuj" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Rozladowanie fil" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Rozladowuje filament" @@ -2259,12 +2241,12 @@ msgid "Unloading to pulley" msgstr "Rozladow. do radelka" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Napiecia" @@ -2275,7 +2257,7 @@ msgid "WARNING TMC TOO HOT" msgstr "UWAGA TMC ZA GORACY" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2288,196 +2270,191 @@ msgstr "" "trybie Stealth" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Czekam na uzytk. ..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Czekam az spadnie temp. sondy PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Oczekiwanie na wychlodzenie dyszy i stolu" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Ostrzez" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 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 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Ostrzezenie: plyta glowna ulegla zmianie." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Ostrzezenie: rodzaj drukarki ulegl zmianie" #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Rozladowanie fil. ok?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Blad polaczenia" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Asystent" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Korekcja-X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "Szczegoly kal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 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 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 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 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic " "montaz drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "" "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic " "montaz drukarki." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracja XYZ ok. Osie X/Y sa prostopadle. Gratulacje!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Dystans od 0 w osi Y" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Korekcja-Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Tak" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Zawsze mozesz uruchomic Asystenta ponownie przez Kalibracja -> Asystent." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Korekcja-Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Ilosc Pomiarow" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] przesun.punktu" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "i nacisnij pokretlo" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "aby zaladow. fil." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "aby rozlad. filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "nieznane" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "Stan nieznany" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Odswiezac" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "Zaniki zas. MMU" @@ -2515,8 +2492,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU POD NAPIĘCI. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Wymiany materiałów" @@ -2549,10 +2526,13 @@ msgstr "" "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Załaduj do MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index f5489e4bd..27d0fa3d1 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 / mai vechi" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 / mai nou" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "nivel %s asteptat" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Anuleaza" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Ajustare Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Totul OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Totul este OK. Distractie placuta!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Mereu" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Ambiental" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Este axa Z aliniata sus?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Put. auto" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Inc.auto Filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -116,49 +114,48 @@ msgid "Avoiding grind" msgstr "Avoiding grind" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Axa" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Lungime axa" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Inapoi" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Pat" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Patul se incalzeste" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Pat incalzit" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Nivelare pat" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -171,35 +168,34 @@ msgstr "" "reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Incalzitor/Pat" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Status curele" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test curele" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Pana de curent. Continuati printul?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Maxim" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Luminozitate ecran" @@ -209,17 +205,17 @@ msgid "COMMUNICATION ERROR" msgstr "EROARE DE COMUNICARE" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Calibrare XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Calibrare Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -228,13 +224,13 @@ msgstr "" "butonul cand este gata." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Calibrare Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -243,17 +239,17 @@ msgstr "" "butonul cand este gata." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Calibrare home" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Calibrare" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Calibrare gata" @@ -272,130 +268,128 @@ msgstr "" "intai." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Card scos" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Schimba card SD" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Schimba filamentul" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Schimbare cu succes!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Schimbat corect?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Verificare axa X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Verificare axa Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Verificare axa Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Verificare pat" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Verif. endstop-uri" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Verif. fisier" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Verificare hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Verificare senzori" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Verificari" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Ștergeți eroare TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Culoare gresita" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Comunitate" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Cont." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Racire" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Copiaza limba selectata?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Coliz." #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Det.coliziune" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Coliziune detectata." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -406,24 +400,24 @@ msgstr "" "doar in modul normal" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Taie filamentul" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Cutter" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Data:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Minim" @@ -433,7 +427,7 @@ msgid "Disable" msgstr "Dezactiv" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Oprire steppere" @@ -445,7 +439,7 @@ msgid "Disengaging idler" msgstr "Decuplare idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -456,7 +450,7 @@ msgstr "" "manual, capitolul First steps, sectiunea First layer calibration." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -470,7 +464,7 @@ msgid "Done" msgstr "Gata" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-correctie" @@ -499,13 +493,13 @@ msgid "ERR Wait for User" msgstr "ERR Astept utilizat." #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "EROARE:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Scoateți din MMU" @@ -517,17 +511,17 @@ msgid "Ejecting filament" msgstr "Se scoate filamentul" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Endstop" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Endstop neatins" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Endstop-uri" @@ -539,30 +533,30 @@ msgid "Engaging idler" msgstr "Cuplare idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Info. extruder" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "Autoload fil." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F. blocaj det" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "Fil. epuizat" @@ -600,8 +594,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. BLOCAT" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "Actiune FS" @@ -626,36 +620,34 @@ msgid "FW RUNTIME ERROR" msgstr "Eroare FW RUNTIME" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Statistici erori" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Stat. erori MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "nu detect. schimbare" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Viteza vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test ventilator" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Verif. vent." @@ -684,41 +676,41 @@ msgid "Feeding to nozzle" msgstr "Incarcare la varf" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Epuizari Fil." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Senzor Fil." #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Fil. curge si are culoarea corecta?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Fil. nu e incarcat" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Senz. de filament" @@ -750,42 +742,42 @@ msgstr "" " nu este nimic blocat in tub-ul PTFE. Verifica daca senz. funct. corect." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Filament folosit" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Fisier incomplet. Continua oricum?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Finalizare miscari" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Cal. first layer" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Mai intai, voi rula testele automate pentru a verifica cele mai intalnite " "probleme de asamblare." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flow" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -794,28 +786,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Vent. print?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Fata [µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Ventilatoarele sunt" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "Versiune de G-code incorecta. Continuati?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -824,14 +816,14 @@ msgstr "" "anulat." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code pregatit pentru un alt tip de printer. Continuati?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -840,12 +832,12 @@ msgstr "" " nou. Print anulat." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code pregatit pentru firmware mai nou. Continuati?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -854,35 +846,35 @@ msgstr "" "Print anulat." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "Setup HW" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Incalzitor/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Incalzire" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Incalzirea dezactivata de timer-ul de siguranta" #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Incalzirea gata." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -893,7 +885,7 @@ msgstr "" "printezi." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -902,9 +894,8 @@ msgstr "" "automate si calibrarile?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Put. max" @@ -915,23 +906,23 @@ msgid "Homing" msgstr "Homing" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend la 280C! Varf schimbat si strans conf. specificatiei?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Vent. hotend:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Voi rula calibrarea XYZ acum. Va dura până la 24 de min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Voi rula calibrarea Z acum." @@ -956,7 +947,7 @@ msgid "INVALID TOOL" msgstr "INSTRUMENT INVALID" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -970,22 +961,22 @@ msgid "Improving bed calibration point" msgstr "Imbunatatirea punctului de calibrare al patului" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Ecran informatii" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. card SD" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Incarca filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -999,14 +990,14 @@ msgstr "" "ERR de rulare interna. Incercati sa resetati MMU sau actualizati firmwarul." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Este filamentul incarcat?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Este suprafata de print pe pat?" @@ -1016,98 +1007,98 @@ msgid "Iteration" msgstr "Iteratie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Ultimul print" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Erorile ultim. print" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Stanga" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Vent. hotend?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Stanga [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Lum. maxim" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Lum. minim" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Corectie lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Reglare Z live" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Incarca toate" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Incarca filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Incarca la varf" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Incarcare Test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Incarcare culoare" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Incarcare filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Fulie slabita" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Tare" @@ -1122,8 +1113,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Intermal MMU ERR, Va rog resetati MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "Mod MMU" @@ -1133,7 +1123,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NU RASPUNDE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Restabilirea temperaturii..." @@ -1144,14 +1134,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST. ESUATA" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Erori MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "Err. incarc MMU" @@ -1166,68 +1156,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU nu raspunde. Verificati cablajul si conectorii." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU conectat" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Comp. magneti" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Meniu principal" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Distorsiune" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Masurare distanta de referinta pentru punctul de calib." #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Mesh" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Calibrare mesh" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mod" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Schimbare mod in progres..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Model" @@ -1248,28 +1235,28 @@ msgid "More details online." msgstr "Mai multe detalii online" #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Miscare X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Miscare Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Miscare Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Miscare axe" @@ -1280,11 +1267,11 @@ msgid "Moving selector" msgstr "Miscare selector" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/A" @@ -1294,82 +1281,80 @@ msgid "New firmware version available:" msgstr "Vers. de firmware noua disponibila:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nu" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Fara card SD" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Fara miscare." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "N/A" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nu este conectat" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Nu se roteste" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "Acum voi calibra distanta dintre varf si suprafata patului." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Acum voi preincalzi extruder-ul pentru PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Acum inlaturati printul de test de pe suprafata de print." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Varf" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Schimbare varf" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Diam. varf" @@ -1380,82 +1365,80 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Off" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Setari vechi detectate. PID, Esteps etc. de baza vor fi setate." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "On" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "O data" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "OPRIT THERMAL ERROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "Calibrare PID" #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "Calibrare PID gata" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "Calibrare PID" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Incalzire PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "Cal. PINDA" #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Calibrarea temperaturii a esuat" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1475,13 +1458,13 @@ msgid "Parking selector" msgstr "Parcare selector" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pauza print" @@ -1492,7 +1475,7 @@ msgid "Performing cut" msgstr "Efect. taiere" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1501,7 +1484,7 @@ msgstr "" "Daca varful prinde hartia, opriti imediat imprimanta." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1510,27 +1493,27 @@ msgstr "" "ul repornind imprimanta." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Verificati senzorul IR, scoateti filamentul daca exista." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Verificati:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Curatati patul si apoi apasati butonul pentru a continua." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Curatati varful pentru calibrare. Apasati butonul cand terminati." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1538,7 +1521,7 @@ msgstr "" "incarca." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1547,50 +1530,50 @@ msgstr "" "pentru a-l incarca." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Va rugam incarcati filamentul mai intai." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Deschideti idler-ul si scoateti filamentul manual." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Asezati suprafata de print pe pat." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Apasati butonul pentru a scoate filamentul." #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Va rugam scoateti filamentul imediat" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Va rugam scoateti protectiile de transport mai intai." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Va rugam indepartati suprafata de print de pe pat." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Va rugam rulati calibrarea XYZ mai intai." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Va rugam mai intai sa scoateti filamentul, apoi incercati din nou." @@ -1600,51 +1583,51 @@ msgid "Please upgrade." msgstr "Va rugam actualizati" #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Va rog asteptati" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Err. alimentare" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Preincalzire" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Preincalziti varful!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Preincalzire extruder. Asteptati, va rugam." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Preincalzire..." #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Preincalzire..." #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Preincalz. incarcare" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Preincalz. scoatere" @@ -1655,48 +1638,48 @@ msgid "Preparing blade" msgstr "Pregatire lama" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Apasati butonul" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Apasati butonul pentru a preincalzi extruder-ul si continuati." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Print anulat" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Vent. print:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Printare de pe SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Print oprit" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Durata print" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "IP imprimanta:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1705,12 +1688,12 @@ msgstr "" "capitolul First steps, sectiunea Calibration flow." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Diametrul varfului diferă t de cel din G-code. Continuati?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1737,27 +1720,27 @@ msgid "QUEUE FULL" msgstr "QUEUE PLIN" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "Port RPi" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Spate [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Recuperare print" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Scoateti fil. vechi si apasati butonul pentru a incarca nou." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Redenumeste" @@ -1771,24 +1754,24 @@ msgstr "" "Verifica G-codul ptr indexul instrum. in afara intervalului (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset." #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset. calibr. XYZ" #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Continua print" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Reluare print..." @@ -1810,17 +1793,17 @@ msgid "Returning selector" msgstr "Returnare selector" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Dreapta" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Dreapta [µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1829,8 +1812,8 @@ msgstr "" " de la inceput. Continuati?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "Card SD" @@ -1845,23 +1828,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR NU SE MISCA" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "OPRIT." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Se cauta punctele de calibrare" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Selecteaza" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1870,26 +1853,26 @@ msgstr "" "ecran." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Select. filamentul:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Selectati limba" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "" "Selectati temperatura de preheat a extruder-ului pentru materialul ales." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Selectati temp. potrivita pentru materialul curent." @@ -1900,73 +1883,73 @@ msgid "Selecting fil. slot" msgstr "Selectare slot fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Testare automata OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Start Autotestare" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Testare automata" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Err. test. automata!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Autotestare esuata" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Testarea automata va fi rulata pentru a calibra sensorless rehoming-ul." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Info. senzori" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Senzorul a fost verificat, scoate filamentul." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Setati temperatura:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Setari" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Deform. severa" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Suprafata" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1979,23 +1962,23 @@ msgstr "" "%cReset." #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Stare endstop-uri" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Silent." #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Dist. usoara" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2009,55 +1992,54 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "A fost intalnita o problema, calibrarea Z a fost initiata..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Sortare" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Sortare fisiere..." #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Sunet" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Viteza" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Se roteste" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "" "Temp. ambient. stabila (21-26C) si o suprafata de lucru rigida necesare." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistici" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Silent." #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Suprafete print" @@ -2067,29 +2049,29 @@ msgid "Stop" msgstr "Stop" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Oprire print" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Strict" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Informatii" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "inversate" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "ANOMALIE TERMICA" @@ -2124,7 +2106,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR subtensiune TMC" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2133,22 +2115,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Modelul termic nu este inca calibrat." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatura" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperaturi" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Testare filament" @@ -2169,7 +2151,7 @@ msgstr "" "blocheza miscarea." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2179,7 +2161,7 @@ msgstr "" "inaltimea optima. Folositi pozele din handbook (capitolul Calibration)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2188,39 +2170,39 @@ msgstr "" "First steps, sectiunea Calibration flow." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Data" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Total erori" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filament total" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Durata totala print" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Optiuni" @@ -2235,15 +2217,15 @@ msgid "Unload" msgstr "Unload" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Descarca filam." #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Scoatere filament" @@ -2260,12 +2242,12 @@ msgid "Unloading to pulley" msgstr "Scoatere la pully" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Verificarea a esuat, scoateti filamentul si incercati din nou." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Voltaje" @@ -2276,7 +2258,7 @@ msgid "WARNING TMC TOO HOT" msgstr "TMC SUPRAINCALZIT" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2289,92 +2271,87 @@ msgstr "" "modul silentios" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Se asteapta..." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Se asteapta racirea probei PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Se ateapta racirea extruder-ului si a patului" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Avert." #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Atentie: tipul imprimantei si al placii de baza s-a schimbat." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Atentie: tipul placii de baza s-a schimbat." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Atentie: tipul imprimantei s-a schimbat." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Filamentul a fost scos cu succes?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Eroare de cablare" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Wizard" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Corect. X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "Init XFLASH" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "Detalii cal. XYZ" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "Calibrarea XYZ in regula. Distorsiunea va fi corectata automat." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "" "Calibrarea XYZ in regula. Axele X/Y sunt distorsionate putin. Felicitari!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "" "Calibrarea XYZ compromisa. Punctele de calibrare din fata nu pot fi atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" @@ -2382,105 +2359,105 @@ msgstr "" "atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "" "Calibrarea XYZ a esuat. Un punct de calibrare a patului nu a fost gasit." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "" "Calibrarea XYZ a esuat. Punctele de calibrare din fata nu pot fi atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "Calibrarea XYZ a esuat. Va rugam consultati manualul." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "" "Calibrarea XYZ a esuat. Punctele de calibrare din fata dreapta nu pot fi " "atinse." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Calibrarea XYZ ok. Axele X/Y sunt perpendiculare. Felicitari!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Distanta Y de la min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Corect. Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Da" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Puteti oricand sa reluati Wizard-ul din Calibrare -> Wizard." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Corect. Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Nr. Z-probe" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] offset origine" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "si apasa butonul" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "a incarca filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "a scoate filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "necunoscut" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "vers. necunoscuta" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Reimprospata" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "Err. MMU curent" @@ -2518,8 +2495,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU SUBTENSIUNE VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Schimburi material" @@ -2553,10 +2530,13 @@ msgstr "" "Actualizați la versiunea 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Preîncărcare MMU" +#~ msgid "XFLASH init" +#~ msgstr "Init XFLASH" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 97cf978d5..531ca0481 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 a starsie" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 a novsie" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "Ocakavana verzia %s" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Zrusit" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Doladenie Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Vsetko OK" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Vsetko je hotove!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Abeceda" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Vzdy" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Okolie" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Dosli oba Z voziky k hornemu dorazu?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Asist." #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto home" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Automat." #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autozav. filamentu" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Avoiding grind" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Os" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Dlzka osi" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Spat" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Podlozka" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Zahrievanie podlozky" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Podlozka OK." #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Korekcia podlozky" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -169,35 +166,34 @@ msgstr "" "Kalibracia Z zlyhala. Sensor nezopol. Znecistena tryska? Cakam na reset." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Podlozka/Zohrievanie" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Stav remena" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Test remena" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Nastal vypadok prudu. Obnovit tlac?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Jasne" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Podsvietenie" @@ -207,17 +203,17 @@ msgid "COMMUNICATION ERROR" msgstr "COMMUNICATION ERROR" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibracia XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibrovat Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -226,13 +222,13 @@ msgstr "" " tlacidlom." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibrujem Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -241,17 +237,17 @@ msgstr "" "tlacidlom." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibr. vychodziu p." #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibracia" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibracia OK" @@ -269,130 +265,128 @@ msgstr "" "Nie je mozne vykonat akciu, filament je uz zavedeny. Najskor ho vytiahnite." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Karta vysunuta" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Zmenit SD kartu" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Vymenit filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Vymena uspesna!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Vymena ok?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Kontrola osi X" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Kontrola osi Y" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Kontrola osi Z" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Kontrola podlozky" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Kontrola endstopu" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Kontrolujem subor" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Kontrola hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Kontrola senzorov" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Kontroly" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Vymazanie chyby TM" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Nespravna farba" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Komunitny prekl." #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Pokr." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Schladit" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Kopirovat vybrany jazyk?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Naraz" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Det. narazu" #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Zisteny naraz." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -403,24 +397,24 @@ msgstr "" "Normalnom rezime" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Odstrihnut fil." #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Strihanie" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Tmavy" @@ -430,7 +424,7 @@ msgid "Disable" msgstr "Vypnut" #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Vypnut motory" @@ -442,7 +436,7 @@ msgid "Disengaging idler" msgstr "Uvolnenie idlera" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -453,7 +447,7 @@ msgstr "" "manualu, kapitola Zaciname, odstavec Nastavenie prvej vrstvy." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -467,7 +461,7 @@ msgid "Done" msgstr "Hotov" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "Korekcia E" @@ -496,13 +490,13 @@ msgid "ERR Wait for User" msgstr "ERR Wait for User" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "ERROR:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Vysunúť z MMU" @@ -514,17 +508,17 @@ msgid "Ejecting filament" msgstr "Vysunutie filamentu" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Koncovy spinac" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Kon. spinac nezopol" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Konc. spinace" @@ -536,30 +530,30 @@ msgid "Engaging idler" msgstr "Zapojenie idlera" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autozav." #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F. zasek" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "F. vypadok" @@ -597,8 +591,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. STUCK" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS Akcia" @@ -623,36 +617,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Statistiky zlyhani" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Zlyhania MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Falosne spustenie" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Rychlost vent." #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Test ventilatora" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Kontr. vent." @@ -681,41 +673,41 @@ msgid "Feeding to nozzle" msgstr "Zavedenie do trysky" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Vypadky filam." #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. senzor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Filament vytlaceny a spravnej farby?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Filament nezavedeny" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Senzor filamentu" @@ -747,42 +739,42 @@ msgstr "" " ci je PTFE trubicka priechodzia a senzor funguje spravne." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Spotrebovany filam." #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Subor nekompletny. Pokracovat?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Dokoncovanie pohybu" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Kal. prvej vrstvy" #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Najskor pomocou selftestu skontrolujem nejcastejsie chyby vznikajuce pri " "zostaveni tlaciarne." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Prietok" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -791,28 +783,28 @@ msgstr "" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Predny tlacovy vent?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Predna st.[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Predny/lavy vent." #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code pripraveny pre inu uroven. Pokracovat?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -820,14 +812,14 @@ msgstr "" "G-code pripraveny pre inu verziu. Vygenerujte G-code znova. Tlac zrusena." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code je pripraveny pre iny typ tlaciarne.Pokracovat?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -836,12 +828,12 @@ msgstr "" "zrusena." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code je pripraveny pre novsi firmware. Pokracovat?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -850,35 +842,35 @@ msgstr "" "zrusena." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW nastavenie" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Zohr./Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Zahrievanie" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Zohrievanie prerusene bezpecnostnym casovacom." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Zahrievanie OK." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -888,7 +880,7 @@ msgstr "" "nastavenia, v ktorom skalibrujem os Z. Potom budete moct zacat tlacit." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -897,9 +889,8 @@ msgstr "" "previedla kalibracnym procesom?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Vys. vykon" @@ -910,23 +901,23 @@ msgid "Homing" msgstr "Navrat" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend ma 280C! Tryska je vymenena a utiahnuta podla specifikacie?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend vent.:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Teraz urobim XYZ kalibraciu. Zaberie to až 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Teraz urobim kalibraciu Z." @@ -951,7 +942,7 @@ msgid "INVALID TOOL" msgstr "INVALID TOOL" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -965,22 +956,22 @@ msgid "Improving bed calibration point" msgstr "Zlepsenie bodu kalibracie podlozky" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Informacie" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Nacitanie SD karty" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Vlozte filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -993,14 +984,14 @@ msgid "" msgstr "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Je filament zavedeny?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Je platna na podlozke?" @@ -1010,98 +1001,98 @@ msgid "Iteration" msgstr "Opakovanie" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Posledna tlac" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Zlyhanie posl. tlace" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Vlavo" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Lavy vent na tryske?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Lava str.[µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Normalne" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Stlmene" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Korekcia lin." #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Doladenie osi Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Zaviest vsetko" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Zaviest filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Zaved. do trysky" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Záťažový test" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Cistenie farby" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Zavedenie filamentu" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Uvolnena remenica" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Hlasny" @@ -1116,8 +1107,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "Chyba MMU Firmwaru, resetujte MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU mod" @@ -1127,7 +1117,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU NOT RESPONDING" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Obnovenie teploty..." @@ -1138,14 +1128,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SAMOTEST ZLYHAL" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "Zlyhanie MMU" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU zlyhalo" @@ -1160,68 +1150,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU neodpoveda. Skontrolujte zapojenie a konektory." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU pripojene" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Komp. magnetu" #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Hlavna ponuka" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Merane skos." #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Meriam referencnu vysku kalibracneho bodu" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Mriezka" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Vyrovnanie podl." #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Rezim" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Prebieha zmena modu..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Model" @@ -1242,28 +1229,28 @@ msgid "More details online." msgstr "Viac podrobnosti online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Posunut X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Posunut Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Posunut Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Posunut os" @@ -1274,11 +1261,11 @@ msgid "Moving selector" msgstr "Presun selektora" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/A" @@ -1288,83 +1275,81 @@ msgid "New firmware version available:" msgstr "Vysla nova verzia firmware:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nie" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Ziadna SD karta" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Bez pohybu." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Ziadne" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Nezapojene" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Netoci sa" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Teraz skalibrujem vzdialenost medzi koncom trysky a povrchom podlozky." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Teraz predohrejem trysku pre PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Teraz odstrante testovaci vytlacok z platne." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Tryska" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Vymena trysky" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Tryska" @@ -1375,82 +1360,80 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Vyp" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "Neplatne hodnoty nastavenia. Bude pouzite predvolene PID, Esteps atd." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "Zap" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "Raz" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSED THERMAL ERROR" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kal." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kal. ukoncena" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibracia" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "Nahrievanie PINDA" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "Kalibracia PINDA zlyhala" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1470,13 +1453,13 @@ msgid "Parking selector" msgstr "Parkovanie selektora" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Pauza" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pozastavit tlac" @@ -1487,7 +1470,7 @@ msgid "Performing cut" msgstr "Strihanie" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1496,7 +1479,7 @@ msgstr "" "tryska zachytí papier, ihneď vypnite tlačiareň." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1505,35 +1488,35 @@ msgstr "" "restartovanim tlaciarne." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Prosim skontrolujte zapojenie IR senzoru a vyberte filament" #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Skontrolujte:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Prosim ocistite podlozku a stlacte tlacidlo." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "" "Pre uspesnu kalibraciu ocistite prosim tlacovu trysku. Potvrdte tlacidlom." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" "Prosim vlozte filament do extruderu a stlacte tlacidlo k jeho zavedeniu" #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1542,50 +1525,50 @@ msgstr "" "zavedeniu" #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Prosim najskor zavedte filament" #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Prosim otvorte idler a manualne odstrante filament." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Umiestnite prosim platnu na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pre vysunutie filamentu stlacte tlacidlo" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Prosim vyberte urychlene filament" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Najskor prosim odstrante prevozne pomocky." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Odstrante prosim platnu z podlozky." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Najskor spustite kalibraciu XYZ." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Prosim vyberte filament a zopakujte tuto akciu" @@ -1595,51 +1578,51 @@ msgid "Please upgrade." msgstr "Aktualizujte prosim." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Cakajte prosim" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Vypadky prudu" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Predohrev" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Predohrejte trysku!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Predhrev trysky. Prosim cakajte." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Predohrev k strihu" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Predhrev k vysunutiu" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Predhrev k zavedeniu" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Predohrev k vybratiu" @@ -1650,48 +1633,48 @@ msgid "Preparing blade" msgstr "Priprava cepele" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Stlacte tlacidlo" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Pre nahriatie trysky a pokracovanie stlacte tlacidlo." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Tlac prerusena" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Tlacovy vent.:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Tlac z SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Tlac pozastavena" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Cas tlace" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "IP adr. tlaciarne:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1700,12 +1683,12 @@ msgstr "" "kapitola Zaciname, odstavec Postup kalibracie." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Priemer trysky tlaciarne sa lisi od G-code. Pokracovat?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1732,27 +1715,27 @@ msgid "QUEUE FULL" msgstr "QUEUE FULL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Zadna str.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Obnovovanie tlace" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Vyberte stary filament a stlacte tlacidlo pre zavedenie noveho." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Premenovat" @@ -1766,24 +1749,24 @@ msgstr "" "nastroj mimo rozsah (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Reset" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Reset XYZ kalibr." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Pokracovat" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Obnovenie tlace" @@ -1805,17 +1788,17 @@ msgid "Returning selector" msgstr "Navrat selektora" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Vpravo" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Prava str.[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1824,8 +1807,8 @@ msgstr "" "kalibracny proces od zaciatku. Pokracovat?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD karta" @@ -1840,48 +1823,48 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR CANNOT MOVE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZASTAVENE." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Hladam kalibracny bod podlozky" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Vybrat" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." msgstr "Zvolte filament pre kalibraciu prvej vrstvy z nasledujuceho menu" #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Zvolte filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Vyber jazyka" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "Vyberte teplotu predohrevu trysky ktora zodpoveda vasmu materialu." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Zvolte teplotu, ktora odpoveda vasmu materialu." @@ -1892,72 +1875,72 @@ msgid "Selecting fil. slot" msgstr "Vyber slotu fil." #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Samotest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Zaciatok testu" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Samotest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Chyba samotestu!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Samotest zlyhal" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "Bude spusteny test pre kalibraciu presneho navratu." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Senzor info" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Senzor overeny, vyberte filament." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Nastavte teplotu:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Nastavenia" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Tazke skos." #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Platna" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1970,23 +1953,23 @@ msgstr "" "%cReset" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Stav konc. spin." #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Tichy" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Lahke skos." #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2000,54 +1983,53 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Vyskytol sa problem, zarovnam os Z ..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Triedit" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Triedenie suborov" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Zvuk" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Rychlost" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Toci sa" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Je vyzadovana stabilna izbova teplota 21-26C a pevna podlozka." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistika" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Tichy" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Platne" @@ -2057,29 +2039,29 @@ msgid "Stop" msgstr "Zast." #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Zastavit tlac" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Prisne" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Podpora" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Prehodene" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" @@ -2114,7 +2096,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2123,22 +2105,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Termálny model zatiaľ nebol kalibrovaný" #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Teplota" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Teploty" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Kontrola filamentu" @@ -2159,7 +2141,7 @@ msgstr "" "pohyb." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2169,7 +2151,7 @@ msgstr "" "vysku. Postupujte podla obrazku v handbooku (kapitola Kalibracia)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2178,39 +2160,39 @@ msgstr "" "Zaciname, sekcia Postup kalibracie." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Cas" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Casovac" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Celkom" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Celkom zlyhani" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Filament celkom" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Celkovy cas tlace" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Ladit" @@ -2225,15 +2207,15 @@ msgid "Unload" msgstr "Vysuv" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Vybrat filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Vysuvanie filamentu" @@ -2250,12 +2232,12 @@ msgid "Unloading to pulley" msgstr "Vysuv. do remenice" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Overenie zlyhalo, vyberte filament a skuste znovu." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Napatie" @@ -2266,7 +2248,7 @@ msgid "WARNING TMC TOO HOT" msgstr "WARNING TMC TOO HOT" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2279,192 +2261,187 @@ msgstr "" "Tichom rezime" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Caka sa na uzivatela" #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Caka sa na ochladenie PINDA" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Cakanie na schladenie trysky a podlozky." #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Varovat" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Varovanie: doslo k zmene typu tlaciarne a maticnej dosky." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Varovanie: doslo k zmene typu maticnej dosky." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Varovanie: doslo k zmene typu tlaciarne." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Bolo vysunutie filamentu uspesne?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Chyba zapojenia" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Sprievodca" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "Korekcia X" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "Detaily XYZ kal." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "" "Kalibracia XYZ v poriadku. Skosenie bude automaticky vyrovnane pri tlaci." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "Kalibracia XYZ v poriadku. X/Y osi mierne skosene. Dobra praca!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "Kalibracia XYZ je nepresna. Predne kalibracne body su nedostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "Kalibracia XYZ je nepresna. Pravy predny bod je nedostupny." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "Kalibracia XYZ zlyhala. Kalibracny bod podlozky nenajdeny." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "Kalibracia XYZ zlyhala. Predne kalibracne body su nedostupne." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "Kalibracia XYZ zlyhala. Nahliadnite do manualu." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "Kalibracia XYZ zlyhala. Pravy predny bod je nedostupny." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "Kalibracia XYZ v poradku. X/Y osi su kolme. Gratulujeme!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y vzdialenost od min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Korekcia Y" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Ano" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "" "Sprievodcu mozete kedykolvek znovu spustit z menu Kalibracia -> Sprievodca" #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Korekcia Z" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Pocet merani Z" #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] odsadenie bodu" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "a stlacte tlacidlo" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "k zavedeniu filam." #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "k vybraniu filamentu" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "neznamy" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "neznamy stav" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Obnovit" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU vyp. prudu" @@ -2502,8 +2479,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU UNDERVOLTAGE VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Výmena materiálu" @@ -2536,10 +2513,13 @@ msgstr "" "verziu 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Predzásobenie MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 550330f91..18b09d739 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -16,93 +16,91 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" #. MSG_IR_03_OR_OLDER c=18 -#: ../../Firmware/Filament_sensor.cpp:289 -#: ../../Firmware/Filament_sensor.cpp:366 ../../Firmware/messages.cpp:171 +#: ../../Firmware/Filament_sensor.cpp:278 +#: ../../Firmware/Filament_sensor.cpp:355 ../../Firmware/messages.cpp:172 msgid " 0.3 or older" msgstr " 0.3 el äldre" #. MSG_IR_04_OR_NEWER c=18 -#: ../../Firmware/Filament_sensor.cpp:291 -#: ../../Firmware/Filament_sensor.cpp:369 ../../Firmware/messages.cpp:170 +#: ../../Firmware/Filament_sensor.cpp:280 +#: ../../Firmware/Filament_sensor.cpp:358 ../../Firmware/messages.cpp:171 msgid " 0.4 or newer" msgstr " 0.4 el nyare" #. MSG_SELFTEST_FS_LEVEL c=20 -#: ../../Firmware/ultralcd.cpp:6885 +#: ../../Firmware/ultralcd.cpp:6625 msgid "%s level expected" msgstr "%s nivå förväntad" #. MSG_CANCEL c=10 -#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1976 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/messages.cpp:18 ../../Firmware/ultralcd.cpp:1930 +#: ../../Firmware/ultralcd.cpp:3601 msgid ">Cancel" msgstr ">Avbryt" #. MSG_BABYSTEPPING_Z c=13 -#. Beware: must include the ':' as its last character -#: ../../Firmware/ultralcd.cpp:2656 +#: ../../Firmware/ultralcd.cpp:2595 msgid "Adjusting Z" msgstr "Justerar Z" #. MSG_SELFTEST_CHECK_ALLCORRECT c=20 -#: ../../Firmware/ultralcd.cpp:7155 +#: ../../Firmware/ultralcd.cpp:6833 msgid "All correct" msgstr "Allt korrekt" #. MSG_WIZARD_DONE c=20 r=3 -#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:4044 +#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:3944 msgid "All is done. Happy printing!" msgstr "Allt är klart. God utskrift!" #. MSG_SORT_ALPHA c=8 -#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4656 +#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4485 msgid "Alphabet" msgstr "Alfabet" #. MSG_ALWAYS c=6 -#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4187 +#: ../../Firmware/messages.cpp:8 ../../Firmware/ultralcd.cpp:4075 msgid "Always" msgstr "Alltid" #. MSG_AMBIENT c=14 -#: ../../Firmware/ultralcd.cpp:1390 +#: ../../Firmware/ultralcd.cpp:1358 msgid "Ambient" msgstr "Omgivande" #. MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2878 +#: ../../Firmware/ultralcd.cpp:2810 msgid "Are left and right Z~carriages all up?" msgstr "Är båda Z-vagnarna helt uppe?" #. MSG_SOUND_BLIND c=7 -#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4332 +#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:4167 msgid "Assist" msgstr "Assist" #. MSG_AUTO c=6 -#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:168 ../../Firmware/ultralcd.cpp:5489 msgid "Auto" msgstr "Auto" #. MSG_AUTO_HOME c=18 -#: ../../Firmware/Marlin_main.cpp:3238 ../../Firmware/messages.cpp:9 -#: ../../Firmware/ultralcd.cpp:4720 +#: ../../Firmware/Marlin_main.cpp:3218 ../../Firmware/messages.cpp:9 +#: ../../Firmware/ultralcd.cpp:4549 msgid "Auto home" msgstr "Auto hem" #. MSG_AUTO_POWER c=10 -#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:5632 +#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4128 msgid "Auto power" msgstr "Auto kraft" #. MSG_AUTOLOAD_FILAMENT c=18 -#: ../../Firmware/ultralcd.cpp:5437 +#: ../../Firmware/ultralcd.cpp:5243 msgid "AutoLoad filament" msgstr "Autoladda filament" #. MSG_AUTOLOADING_ENABLED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2299 +#: ../../Firmware/ultralcd.cpp:2234 msgid "" "Autoloading filament is active, just press the knob and insert filament..." msgstr "" @@ -115,49 +113,48 @@ msgid "Avoiding grind" msgstr "Undviker slipning" #. MSG_SELFTEST_AXIS c=16 -#: ../../Firmware/ultralcd.cpp:6864 +#: ../../Firmware/ultralcd.cpp:6604 msgid "Axis" msgstr "Axel" #. MSG_SELFTEST_AXIS_LENGTH c=20 -#: ../../Firmware/ultralcd.cpp:6863 +#: ../../Firmware/ultralcd.cpp:6603 msgid "Axis length" msgstr "Axellängd" #. MSG_BACK c=18 -#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:2729 -#: ../../Firmware/ultralcd.cpp:4128 ../../Firmware/ultralcd.cpp:5714 -#: ../../Firmware/ultralcd.cpp:7667 +#: ../../Firmware/messages.cpp:63 ../../Firmware/ultralcd.cpp:2668 +#: ../../Firmware/ultralcd.cpp:4026 ../../Firmware/ultralcd.cpp:5486 +#: ../../Firmware/ultralcd.cpp:7328 msgid "Back" msgstr "Tillbaka" #. MSG_BED c=13 -#: ../../Firmware/Marlin_main.cpp:2032 ../../Firmware/Marlin_main.cpp:4625 -#: ../../Firmware/Marlin_main.cpp:4677 ../../Firmware/messages.cpp:12 -#: ../../Firmware/ultralcd.cpp:1388 ../../Firmware/ultralcd.cpp:5587 -#: ../../Firmware/ultralcd.cpp:5738 +#: ../../Firmware/Marlin_main.cpp:2024 ../../Firmware/Marlin_main.cpp:4598 +#: ../../Firmware/Marlin_main.cpp:4650 ../../Firmware/messages.cpp:12 +#: ../../Firmware/ultralcd.cpp:1356 ../../Firmware/ultralcd.cpp:4143 msgid "Bed" msgstr "Bädd" #. MSG_BED_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6146 ../../Firmware/messages.cpp:14 -#: ../../Firmware/ultralcd.cpp:540 +#: ../../Firmware/Marlin_main.cpp:6109 ../../Firmware/messages.cpp:14 +#: ../../Firmware/ultralcd.cpp:531 msgid "Bed Heating" msgstr "Bädden värms upp" #. MSG_BED_DONE c=20 -#: ../../Firmware/Marlin_main.cpp:6177 ../../Firmware/messages.cpp:13 -#: ../../Firmware/ultralcd.cpp:543 +#: ../../Firmware/Marlin_main.cpp:6140 ../../Firmware/messages.cpp:13 +#: ../../Firmware/ultralcd.cpp:534 msgid "Bed done" msgstr "Bädd klar" #. MSG_BED_CORRECTION_MENU c=18 -#: ../../Firmware/ultralcd.cpp:4732 +#: ../../Firmware/ultralcd.cpp:4561 msgid "Bed level correct" msgstr "Bäddnivå korrekt" #. MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:2213 ../../Firmware/Marlin_main.cpp:2970 +#: ../../Firmware/Marlin_main.cpp:2205 ../../Firmware/Marlin_main.cpp:2970 #: ../../Firmware/Marlin_main.cpp:2980 #: ../../Firmware/mesh_bed_calibration.cpp:2859 #: ../../Firmware/mesh_bed_calibration.cpp:2867 @@ -170,35 +167,34 @@ msgstr "" " på återställning." #. MSG_SELFTEST_BEDHEATER c=20 -#: ../../Firmware/ultralcd.cpp:6821 +#: ../../Firmware/ultralcd.cpp:6561 msgid "Bed/Heater" msgstr "Bädd/Värmare" #. MSG_BELT_STATUS c=18 -#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1441 -#: ../../Firmware/ultralcd.cpp:1710 +#: ../../Firmware/messages.cpp:17 ../../Firmware/ultralcd.cpp:1409 +#: ../../Firmware/ultralcd.cpp:1671 msgid "Belt status" msgstr "Bält status" #. MSG_BELTTEST c=18 -#: ../../Firmware/ultralcd.cpp:4722 +#: ../../Firmware/ultralcd.cpp:4551 msgid "Belt test" msgstr "Bält test" #. MSG_RECOVER_PRINT c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:1588 ../../Firmware/Marlin_main.cpp:1610 -#: ../../Firmware/messages.cpp:81 +#: ../../Firmware/Marlin_main.cpp:1602 ../../Firmware/messages.cpp:82 msgid "Blackout occurred. Recover print?" msgstr "Blackout inträffat. Återställa utskr?" #. MSG_BRIGHT c=6 -#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5489 msgid "Bright" msgstr "Ljus" #. MSG_BRIGHTNESS c=18 -#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4667 -#: ../../Firmware/ultralcd.cpp:5642 +#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:4496 +#: ../../Firmware/ultralcd.cpp:5415 msgid "Brightness" msgstr "Ljusstyrka" @@ -208,17 +204,17 @@ msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEL" #. MSG_CALIBRATE_BED c=18 -#: ../../Firmware/ultralcd.cpp:4726 +#: ../../Firmware/ultralcd.cpp:4555 msgid "Calibrate XYZ" msgstr "Kalibrera XYZ" #. MSG_HOMEYZ c=18 -#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4728 +#: ../../Firmware/messages.cpp:50 ../../Firmware/ultralcd.cpp:4557 msgid "Calibrate Z" msgstr "Kalibrera Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2840 +#: ../../Firmware/ultralcd.cpp:2775 msgid "" "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -227,13 +223,13 @@ msgstr "" "Klicka när du är klar." #. MSG_CALIBRATE_Z_AUTO c=20 r=2 -#: ../../Firmware/Marlin_main.cpp:2169 ../../Firmware/messages.cpp:19 -#: ../../Firmware/ultralcd.cpp:582 +#: ../../Firmware/Marlin_main.cpp:2161 ../../Firmware/messages.cpp:19 +#: ../../Firmware/ultralcd.cpp:575 msgid "Calibrating Z" msgstr "Kalibrerar Z" #. MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 -#: ../../Firmware/ultralcd.cpp:2839 +#: ../../Firmware/ultralcd.cpp:2774 msgid "" "Calibrating Z. Rotate the knob to move the Z carriage up to the end " "stoppers. Click when done." @@ -242,17 +238,17 @@ msgstr "" "Klicka när du är klar." #. MSG_CALIBRATING_HOME c=20 -#: ../../Firmware/ultralcd.cpp:7157 +#: ../../Firmware/ultralcd.cpp:6835 msgid "Calibrating home" msgstr "Kalibrerar hem" #. MSG_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:66 ../../Firmware/ultralcd.cpp:5447 +#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:5253 msgid "Calibration" msgstr "Kalibrering" #. MSG_HOMEYZ_DONE c=20 -#: ../../Firmware/ultralcd.cpp:593 +#: ../../Firmware/ultralcd.cpp:586 msgid "Calibration done" msgstr "Kalibraring utförd" @@ -270,130 +266,128 @@ msgstr "" "Kan inte utföra åtgärden, filament är redan laddat. Ta bort det först." #. MSG_SD_REMOVED c=20 -#: ../../Firmware/ultralcd.cpp:7554 +#: ../../Firmware/ultralcd.cpp:7226 msgid "Card removed" msgstr "Kort borttaget" #. MSG_CNG_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5401 +#: ../../Firmware/ultralcd.cpp:5207 msgid "Change SD card" msgstr "Byt ut SD-kort" #. MSG_FILAMENTCHANGE c=18 -#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5355 -#: ../../Firmware/ultralcd.cpp:5596 +#: ../../Firmware/messages.cpp:39 ../../Firmware/ultralcd.cpp:5161 +#: ../../Firmware/ultralcd.cpp:5397 msgid "Change filament" msgstr "Ändra filament" #. MSG_CHANGE_SUCCESS c=20 -#: ../../Firmware/ultralcd.cpp:2177 +#: ../../Firmware/ultralcd.cpp:2117 msgid "Change success!" msgstr "Ändring utförd!" #. MSG_CORRECTLY c=20 -#: ../../Firmware/ultralcd.cpp:2225 +#: ../../Firmware/ultralcd.cpp:2164 msgid "Changed correctly?" msgstr "Ändring korrekt?" #. MSG_CHECKING_X c=20 -#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:6036 -#: ../../Firmware/ultralcd.cpp:7147 +#: ../../Firmware/messages.cpp:21 ../../Firmware/ultralcd.cpp:5789 +#: ../../Firmware/ultralcd.cpp:6825 msgid "Checking X axis" msgstr "Kontroll X-axel" #. MSG_CHECKING_Y c=20 -#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:6045 -#: ../../Firmware/ultralcd.cpp:7148 +#: ../../Firmware/messages.cpp:22 ../../Firmware/ultralcd.cpp:5799 +#: ../../Firmware/ultralcd.cpp:6826 msgid "Checking Y axis" msgstr "Kontroll Y-axel" #. MSG_SELFTEST_CHECK_Z c=20 -#: ../../Firmware/ultralcd.cpp:7149 +#: ../../Firmware/ultralcd.cpp:6827 msgid "Checking Z axis" msgstr "Kontroll Z-axel" #. MSG_SELFTEST_CHECK_BED c=20 -#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:7150 +#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:6828 msgid "Checking bed" msgstr "Kontroll bädd" #. MSG_SELFTEST_CHECK_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:7146 +#: ../../Firmware/ultralcd.cpp:6824 msgid "Checking endstops" msgstr "Kontroll ändlägen" #. MSG_CHECKING_FILE c=17 -#: ../../Firmware/ultralcd.cpp:7244 +#: ../../Firmware/ultralcd.cpp:6920 msgid "Checking file" msgstr "Kontrollerar fil" #. MSG_SELFTEST_CHECK_HOTEND c=20 -#: ../../Firmware/ultralcd.cpp:7152 +#: ../../Firmware/ultralcd.cpp:6830 msgid "Checking hotend" msgstr "Kontroll hotend" #. MSG_SELFTEST_CHECK_FSENSOR c=20 -#: ../../Firmware/messages.cpp:94 ../../Firmware/ultralcd.cpp:7153 -#: ../../Firmware/ultralcd.cpp:7154 +#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 +#: ../../Firmware/ultralcd.cpp:6832 msgid "Checking sensors" msgstr "Kontroll sensorer" #. MSG_CHECKS c=18 -#: ../../Firmware/ultralcd.cpp:4560 +#: ../../Firmware/ultralcd.cpp:4394 msgid "Checks" msgstr "Kontroller" #. MSG_TM_ACK_ERROR c=18 -#: ../../Firmware/messages.cpp:178 ../../Firmware/ultralcd.cpp:5390 +#: ../../Firmware/messages.cpp:179 ../../Firmware/ultralcd.cpp:5196 msgid "Clear TM error" msgstr "Rensa TM-fel" #. MSG_NOT_COLOR c=19 -#: ../../Firmware/ultralcd.cpp:2228 +#: ../../Firmware/ultralcd.cpp:2167 msgid "Color not correct" msgstr "Färg ej korrekt" #. MSG_COMMUNITY_MADE c=18 -#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3581 +#: ../../Firmware/messages.cpp:23 ../../Firmware/ultralcd.cpp:3489 msgid "Community made" msgstr "Allmänhetsgjord" #. MSG_CONTINUE_SHORT c=5 -#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4150 +#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4048 msgid "Cont." msgstr "Frts." #. MSG_COOLDOWN c=18 -#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2136 +#: ../../Firmware/messages.cpp:25 ../../Firmware/ultralcd.cpp:2090 msgid "Cooldown" msgstr "Kyla ner" #. MSG_COPY_SEL_LANG c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3519 +#: ../../Firmware/ultralcd.cpp:3427 msgid "Copy selected language?" msgstr "Kopiera det valda språket?" #. MSG_CRASH c=7 -#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1231 -#: ../../Firmware/ultralcd.cpp:1260 +#: ../../Firmware/messages.cpp:26 ../../Firmware/ultralcd.cpp:1199 +#: ../../Firmware/ultralcd.cpp:1228 msgid "Crash" msgstr "Krock" #. MSG_CRASHDETECT c=13 -#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4238 -#: ../../Firmware/ultralcd.cpp:4239 ../../Firmware/ultralcd.cpp:4241 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5620 -#: ../../Firmware/ultralcd.cpp:5624 +#: ../../Firmware/messages.cpp:28 ../../Firmware/ultralcd.cpp:4111 +#: ../../Firmware/ultralcd.cpp:4116 msgid "Crash det." msgstr "Krockdetekt." #. MSG_CRASH_DETECTED c=20 -#: ../../Firmware/Marlin_main.cpp:568 ../../Firmware/messages.cpp:27 +#: ../../Firmware/Marlin_main.cpp:573 ../../Firmware/messages.cpp:27 msgid "Crash detected." msgstr "Krock upptäckt." #. MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3423 +#: ../../Firmware/ultralcd.cpp:3342 msgid "" "Crash detection can\n" "be turned on only in\n" @@ -404,24 +398,24 @@ msgstr "" "normalt läge" #. MSG_CUT_FILAMENT c=16 -#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 -#: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 +#: ../../Firmware/messages.cpp:61 ../../Firmware/mmu2_reporting.cpp:321 +#: ../../Firmware/ultralcd.cpp:4817 ../../Firmware/ultralcd.cpp:5237 msgid "Cut filament" msgstr "Skär filament" #. MSG_CUTTER c=9 -#: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4187 ../../Firmware/ultralcd.cpp:4192 +#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4075 ../../Firmware/ultralcd.cpp:4080 msgid "Cutter" msgstr "Skärare" #. MSG_DATE c=17 -#: ../../Firmware/ultralcd.cpp:1651 +#: ../../Firmware/ultralcd.cpp:1612 msgid "Date:" msgstr "Datum:" #. MSG_DIM c=6 -#: ../../Firmware/messages.cpp:166 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:167 ../../Firmware/ultralcd.cpp:5489 msgid "Dim" msgstr "Dim" @@ -431,7 +425,7 @@ msgid "Disable" msgstr "Inaktiv." #. MSG_DISABLE_STEPPERS c=18 -#: ../../Firmware/ultralcd.cpp:4596 +#: ../../Firmware/ultralcd.cpp:4430 msgid "Disable steppers" msgstr "Inaktivera stepper" @@ -443,7 +437,7 @@ msgid "Disengaging idler" msgstr "Kopplar ur Idler" #. MSG_BABYSTEP_Z_NOT_SET c=20 r=12 -#: ../../Firmware/Marlin_main.cpp:1556 ../../Firmware/Marlin_main.cpp:3374 +#: ../../Firmware/Marlin_main.cpp:1557 ../../Firmware/Marlin_main.cpp:3354 #: ../../Firmware/messages.cpp:11 msgid "" "Distance between tip of the nozzle and the bed surface has not been set yet." @@ -454,7 +448,7 @@ msgstr "" "Vänligen följ manualen Första lagrets kalibrering." #. MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:4012 +#: ../../Firmware/ultralcd.cpp:3912 msgid "" "Do you want to repeat last step to readjust distance between nozzle and " "heatbed?" @@ -468,7 +462,7 @@ msgid "Done" msgstr "Klar" #. MSG_EXTRUDER_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4081 +#: ../../Firmware/ultralcd.cpp:3979 msgid "E-correct" msgstr "E-korrektion" @@ -497,13 +491,13 @@ msgid "ERR Wait for User" msgstr "FEL Inväntar anv" #. MSG_ERROR c=10 -#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2280 +#: ../../Firmware/messages.cpp:29 ../../Firmware/ultralcd.cpp:2215 msgid "ERROR:" msgstr "FEL:" #. MSG_EJECT_FROM_MMU c=16 -#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:331 -#: ../../Firmware/ultralcd.cpp:4989 ../../Firmware/ultralcd.cpp:5428 +#: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:325 +#: ../../Firmware/ultralcd.cpp:4804 ../../Firmware/ultralcd.cpp:5234 msgid "Eject from MMU" msgstr "Utmat från MMU" @@ -515,17 +509,17 @@ msgid "Ejecting filament" msgstr "Matar ut filament" #. MSG_SELFTEST_ENDSTOP c=16 -#: ../../Firmware/ultralcd.cpp:6834 +#: ../../Firmware/ultralcd.cpp:6574 msgid "Endstop" msgstr "Ändläge" #. MSG_SELFTEST_ENDSTOP_NOTHIT c=20 -#: ../../Firmware/ultralcd.cpp:6839 +#: ../../Firmware/ultralcd.cpp:6579 msgid "Endstop not hit" msgstr "Ändlage inte nått" #. MSG_SELFTEST_ENDSTOPS c=20 -#: ../../Firmware/ultralcd.cpp:6825 +#: ../../Firmware/ultralcd.cpp:6565 msgid "Endstops" msgstr "Ändlägen" @@ -537,30 +531,30 @@ msgid "Engaging idler" msgstr "Koppla in Idler" #. MSG_EXTRUDER c=17 -#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3397 +#: ../../Firmware/messages.cpp:30 ../../Firmware/ultralcd.cpp:3316 msgid "Extruder" msgstr "Extruder" #. MSG_INFO_EXTRUDER c=18 -#: ../../Firmware/ultralcd.cpp:1706 +#: ../../Firmware/ultralcd.cpp:1667 msgid "Extruder info" msgstr "Extruder info" #. MSG_FSENSOR_AUTOLOAD c=13 -#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4135 -#: ../../Firmware/ultralcd.cpp:4142 +#: ../../Firmware/messages.cpp:45 ../../Firmware/ultralcd.cpp:4033 +#: ../../Firmware/ultralcd.cpp:4040 msgid "F. autoload" msgstr "F. autoladdn" #. MSG_FSENSOR_JAM_DETECTION c=13 -#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:4144 +#: ../../Firmware/messages.cpp:46 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:4042 msgid "F. jam detect" msgstr "F.stopp skett" #. MSG_FSENSOR_RUNOUT c=13 -#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4141 +#: ../../Firmware/messages.cpp:44 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4039 msgid "F. runout" msgstr "F. slut" @@ -598,8 +592,8 @@ msgid "FINDA: FILAM. STUCK" msgstr "FINDA: FILAM. STOPP" #. MSG_FS_ACTION c=10 -#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:4150 -#: ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 +#: ../../Firmware/ultralcd.cpp:4051 msgid "FS Action" msgstr "FS aktion" @@ -624,36 +618,34 @@ msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEL" #. MSG_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5455 +#: ../../Firmware/ultralcd.cpp:5261 msgid "Fail stats" msgstr "Felstatistik" #. MSG_MMU_FAIL_STATS c=18 -#: ../../Firmware/ultralcd.cpp:5458 +#: ../../Firmware/ultralcd.cpp:5264 msgid "Fail stats MMU" msgstr "Felstatistik MMU" #. MSG_FALSE_TRIGGERING c=20 -#: ../../Firmware/ultralcd.cpp:6880 +#: ../../Firmware/ultralcd.cpp:6620 msgid "False triggering" msgstr "Felaktig triggning" #. MSG_FAN_SPEED c=14 -#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:5589 -#: ../../Firmware/ultralcd.cpp:5740 +#: ../../Firmware/messages.cpp:34 ../../Firmware/ultralcd.cpp:4145 msgid "Fan speed" msgstr "Fläktfart" #. MSG_SELFTEST_FAN c=20 -#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6989 -#: ../../Firmware/ultralcd.cpp:7143 ../../Firmware/ultralcd.cpp:7144 -#: ../../Firmware/ultralcd.cpp:7145 +#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:6696 +#: ../../Firmware/ultralcd.cpp:6821 ../../Firmware/ultralcd.cpp:6822 +#: ../../Firmware/ultralcd.cpp:6823 msgid "Fan test" msgstr "Fläkttest" #. MSG_FANS_CHECK c=13 -#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:5609 +#: ../../Firmware/messages.cpp:31 ../../Firmware/ultralcd.cpp:4149 msgid "Fans check" msgstr "Fläktcheck" @@ -682,41 +674,41 @@ msgid "Feeding to nozzle" msgstr "Matar till munstycke" #. MSG_FIL_RUNOUTS c=15 -#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1230 -#: ../../Firmware/ultralcd.cpp:1259 ../../Firmware/ultralcd.cpp:1313 -#: ../../Firmware/ultralcd.cpp:1315 +#: ../../Firmware/messages.cpp:32 ../../Firmware/ultralcd.cpp:1198 +#: ../../Firmware/ultralcd.cpp:1227 ../../Firmware/ultralcd.cpp:1281 +#: ../../Firmware/ultralcd.cpp:1283 msgid "Fil. runouts" msgstr "Fil. avbrott" #. MSG_FSENSOR c=12 -#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3358 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4600 -#: ../../Firmware/ultralcd.cpp:5600 +#: ../../Firmware/messages.cpp:47 ../../Firmware/ultralcd.cpp:3277 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4434 +#: ../../Firmware/ultralcd.cpp:5401 msgid "Fil. sensor" msgstr "Fil. sensor" #. MSG_FILAMENT c=17 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:33 -#: ../../Firmware/ultralcd.cpp:3691 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:33 +#: ../../Firmware/ultralcd.cpp:3601 ../../Firmware/ultralcd.cpp:6674 msgid "Filament" msgstr "Filament" #. MSG_FILAMENT_CLEAN c=20 r=3 -#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2288 -#: ../../Firmware/ultralcd.cpp:2292 +#: ../../Firmware/messages.cpp:37 ../../Firmware/ultralcd.cpp:2223 +#: ../../Firmware/ultralcd.cpp:2227 msgid "Filament extruding & with correct color?" msgstr "Extruderas filament med rätt färg?" #. MSG_NOT_LOADED c=19 -#: ../../Firmware/ultralcd.cpp:2227 +#: ../../Firmware/ultralcd.cpp:2166 msgid "Filament not loaded" msgstr "Filament ej laddat" #. MSG_SELFTEST_FILAMENT_SENSOR c=17 -#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6875 -#: ../../Firmware/ultralcd.cpp:6879 ../../Firmware/ultralcd.cpp:6883 -#: ../../Firmware/ultralcd.cpp:7172 +#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6615 +#: ../../Firmware/ultralcd.cpp:6619 ../../Firmware/ultralcd.cpp:6623 +#: ../../Firmware/ultralcd.cpp:6850 msgid "Filament sensor" msgstr "Filament sensor" @@ -748,42 +740,42 @@ msgstr "" "extruder.Kontrollera PFFE-slang och att sensorn läser korrekt." #. MSG_FILAMENT_USED c=19 -#: ../../Firmware/ultralcd.cpp:2361 +#: ../../Firmware/ultralcd.cpp:2307 msgid "Filament used" msgstr "Använt filament" #. MSG_FILE_INCOMPLETE c=20 r=3 -#: ../../Firmware/ultralcd.cpp:7302 +#: ../../Firmware/ultralcd.cpp:6978 msgid "File incomplete. Continue anyway?" msgstr "Filen är ofullständig. Fortsätta ändå?" #. MSG_FINISHING_MOVEMENTS c=20 #: ../../Firmware/messages.cpp:41 #: ../../Firmware/mmu2_progress_converter.cpp:43 -#: ../../Firmware/ultralcd.cpp:5169 ../../Firmware/ultralcd.cpp:5496 +#: ../../Firmware/ultralcd.cpp:4976 ../../Firmware/ultralcd.cpp:5299 msgid "Finishing movements" msgstr "Avslutar flyttning" #. MSG_V2_CALIBRATION c=18 -#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:4718 -#: ../../Firmware/ultralcd.cpp:5282 +#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4547 +#: ../../Firmware/ultralcd.cpp:5088 msgid "First layer cal." msgstr "Förstalager kalib." #. MSG_WIZARD_SELFTEST c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3933 +#: ../../Firmware/ultralcd.cpp:3835 msgid "First, I will run the selftest to check most common assembly problems." msgstr "" "Först kommer jag att utföra självtestet för att kontrollera de vanligaste " "monteringsproblemen." #. MSG_FLOW c=15 -#: ../../Firmware/ultralcd.cpp:5590 +#: ../../Firmware/ultralcd.cpp:5391 msgid "Flow" msgstr "Flöde" #. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 -#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:985 +#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:954 msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" @@ -792,28 +784,28 @@ msgstr "" " prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 -#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:6845 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6585 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Front print fan?" msgstr "Frontfläkt?" #. MSG_BED_CORRECTION_FRONT c=14 -#: ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:2671 msgid "Front side[µm]" msgstr "Frontsida[µm]" #. MSG_SELFTEST_FANS c=20 -#: ../../Firmware/ultralcd.cpp:6869 +#: ../../Firmware/ultralcd.cpp:6609 msgid "Front/left fans" msgstr "Front/vänster fläkt" #. MSG_GCODE_DIFF_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:403 +#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:386 msgid "G-code sliced for a different level. Continue?" msgstr "G-code genererad för en annan nivå. Fortsätta?" #. MSG_GCODE_DIFF_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:140 ../../Firmware/util.cpp:404 +#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:387 msgid "" "G-code sliced for a different level. Please re-slice the model again. Print " "cancelled." @@ -822,14 +814,14 @@ msgstr "" "Utskriften avbröts." #. MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:135 ../../Firmware/util.cpp:333 -#: ../../Firmware/util.cpp:439 +#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:316 +#: ../../Firmware/util.cpp:422 msgid "G-code sliced for a different printer type. Continue?" msgstr "G-code genererad för en annan skrivartyp. Fortsätta?" #. MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:136 ../../Firmware/util.cpp:334 -#: ../../Firmware/util.cpp:440 +#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:317 +#: ../../Firmware/util.cpp:423 msgid "" "G-code sliced for a different printer type. Please re-slice the model again." " Print cancelled." @@ -838,12 +830,12 @@ msgstr "" "igen. Utskriften avbröts." #. MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:137 ../../Firmware/util.cpp:383 +#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:366 msgid "G-code sliced for a newer firmware. Continue?" msgstr "G-code genererad för en nyare firmware. Fortsätta?" #. MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:138 ../../Firmware/util.cpp:384 +#: ../../Firmware/messages.cpp:139 ../../Firmware/util.cpp:367 msgid "" "G-code sliced for a newer firmware. Please update the firmware. Print " "cancelled." @@ -852,35 +844,35 @@ msgstr "" "Utskriften avbröts." #. MSG_HW_SETUP c=18 -#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:4502 -#: ../../Firmware/ultralcd.cpp:4519 ../../Firmware/ultralcd.cpp:4625 +#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4336 +#: ../../Firmware/ultralcd.cpp:4353 ../../Firmware/ultralcd.cpp:4455 msgid "HW Setup" msgstr "HW inställning" #. MSG_SELFTEST_HEATERTHERMISTOR c=20 -#: ../../Firmware/ultralcd.cpp:6817 +#: ../../Firmware/ultralcd.cpp:6557 msgid "Heater/Thermistor" msgstr "Värmare/Termistor" #. MSG_HEATING c=20 -#: ../../Firmware/Marlin_main.cpp:6089 ../../Firmware/messages.cpp:48 -#: ../../Firmware/ultralcd.cpp:532 +#: ../../Firmware/Marlin_main.cpp:6052 ../../Firmware/messages.cpp:48 +#: ../../Firmware/ultralcd.cpp:523 msgid "Heating" msgstr "Uppvärmning" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9370 +#: ../../Firmware/Marlin_main.cpp:9272 msgid "Heating disabled by safety timer." msgstr "Uppvärmning avaktiverad av säkerhetstimer." #. MSG_HEATING_COMPLETE c=20 -#: ../../Firmware/Marlin_main.cpp:6120 ../../Firmware/messages.cpp:49 -#: ../../Firmware/ultralcd.cpp:535 +#: ../../Firmware/Marlin_main.cpp:6083 ../../Firmware/messages.cpp:49 +#: ../../Firmware/ultralcd.cpp:526 msgid "Heating done." msgstr "Uppvärmning klar." #. MSG_WIZARD_WELCOME_SHIPPING c=20 r=12 -#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3893 +#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:3795 msgid "" "Hi, I am your Original Prusa i3 printer. I will guide you through a short " "setup process, in which the Z-axis will be calibrated. Then, you will be " @@ -891,7 +883,7 @@ msgstr "" "att skriva ut." #. MSG_WIZARD_WELCOME c=20 r=7 -#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3897 +#: ../../Firmware/messages.cpp:124 ../../Firmware/ultralcd.cpp:3799 msgid "" "Hi, I am your Original Prusa i3 printer. Would you like me to guide you " "through the setup process?" @@ -900,9 +892,8 @@ msgstr "" "installationsprocessen?" #. MSG_HIGH_POWER c=10 -#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5633 +#: ../../Firmware/messages.cpp:107 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4131 msgid "High power" msgstr "Hög kraft" @@ -913,23 +904,23 @@ msgid "Homing" msgstr "Flyttar till hempos" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 -#: ../../Firmware/messages.cpp:183 ../../Firmware/ultralcd.cpp:1005 +#: ../../Firmware/messages.cpp:184 ../../Firmware/ultralcd.cpp:974 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" msgstr "Hotend temperatur är 280C! Är munstycket bytt och spänt enligt specs?" #. MSG_HOTEND_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7163 +#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6841 msgid "Hotend fan:" msgstr "Hotend-fläkt:" #. MSG_WIZARD_XYZ_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3938 +#: ../../Firmware/ultralcd.cpp:3840 msgid "I will run xyz calibration now. It will take up to 24 mins." msgstr "Jag kommer att utföra en xyz-kalibrering nu. Det tar upp till 24 min." #. MSG_WIZARD_Z_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3949 +#: ../../Firmware/ultralcd.cpp:3851 msgid "I will run z calibration now." msgstr "Jag kommer att utföra z-kalibrering nu." @@ -954,7 +945,7 @@ msgid "INVALID TOOL" msgstr "OGILTIGT VERKTYG" #. MSG_ADDITIONAL_SHEETS c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4020 +#: ../../Firmware/ultralcd.cpp:3920 msgid "" "If you have additional steel sheets, calibrate their presets in Settings - " "HW Setup - Steel sheets." @@ -968,22 +959,22 @@ msgid "Improving bed calibration point" msgstr "Förbättrar bäddens kalibreringspunkt" #. MSG_INFO_SCREEN c=18 -#: ../../Firmware/messages.cpp:118 ../../Firmware/ultralcd.cpp:5336 +#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:5142 msgid "Info screen" msgstr "Infoskärm" #. MSG_INIT_SDCARD c=18 -#: ../../Firmware/ultralcd.cpp:5408 +#: ../../Firmware/ultralcd.cpp:5214 msgid "Init. SD card" msgstr "Init. SD-kort" #. MSG_INSERT_FILAMENT c=20 -#: ../../Firmware/ultralcd.cpp:2163 +#: ../../Firmware/ultralcd.cpp:2103 msgid "Insert filament" msgstr "Sätt i filament" #. MSG_INSERT_FIL c=20 r=6 -#: ../../Firmware/ultralcd.cpp:6082 +#: ../../Firmware/ultralcd.cpp:5836 msgid "" "Insert the filament (do not load it) into the extruder and then press the " "knob." @@ -998,14 +989,14 @@ msgid "" msgstr "Internt körtidsfel. Prova återställa MMU eller uppdatera firmware." #. MSG_FILAMENT_LOADED c=20 r=3 -#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3712 -#: ../../Firmware/ultralcd.cpp:3979 +#: ../../Firmware/messages.cpp:38 ../../Firmware/ultralcd.cpp:3616 +#: ../../Firmware/ultralcd.cpp:3879 msgid "Is filament loaded?" msgstr "Är filament laddat?" #. MSG_STEEL_SHEET_CHECK c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3278 ../../Firmware/Marlin_main.cpp:4744 -#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:3945 +#: ../../Firmware/Marlin_main.cpp:3258 ../../Firmware/Marlin_main.cpp:4717 +#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:3847 msgid "Is steel sheet on heatbed?" msgstr "Ligger metallskiva på värmebädden?" @@ -1015,98 +1006,98 @@ msgid "Iteration" msgstr "Iteration" #. MSG_LAST_PRINT c=18 -#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1124 -#: ../../Firmware/ultralcd.cpp:1283 +#: ../../Firmware/messages.cpp:53 ../../Firmware/ultralcd.cpp:1093 +#: ../../Firmware/ultralcd.cpp:1251 msgid "Last print" msgstr "Senaste utskrift" #. MSG_LAST_PRINT_FAILURES c=20 -#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1148 -#: ../../Firmware/ultralcd.cpp:1257 ../../Firmware/ultralcd.cpp:1312 +#: ../../Firmware/messages.cpp:54 ../../Firmware/ultralcd.cpp:1117 +#: ../../Firmware/ultralcd.cpp:1225 ../../Firmware/ultralcd.cpp:1280 msgid "Last print failures" msgstr "Senaste utskriftsfel" #. MSG_LEFT c=10 -#: ../../Firmware/ultralcd.cpp:2492 +#: ../../Firmware/ultralcd.cpp:2438 msgid "Left" msgstr "Vänster" #. MSG_SELFTEST_HOTEND_FAN c=20 -#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6851 -#: ../../Firmware/ultralcd.cpp:6995 ../../Firmware/ultralcd.cpp:7000 +#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6591 +#: ../../Firmware/ultralcd.cpp:6702 ../../Firmware/ultralcd.cpp:6707 msgid "Left hotend fan?" msgstr "Vänst hotend fläkt?" #. MSG_BED_CORRECTION_LEFT c=14 -#: ../../Firmware/ultralcd.cpp:2730 +#: ../../Firmware/ultralcd.cpp:2669 msgid "Left side [µm]" msgstr "Vänstsida [µm]" #. MSG_BL_HIGH c=12 -#: ../../Firmware/messages.cpp:162 ../../Firmware/ultralcd.cpp:5715 +#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5487 msgid "Level Bright" msgstr "Ljusnivå" #. MSG_BL_LOW c=12 -#: ../../Firmware/messages.cpp:163 ../../Firmware/ultralcd.cpp:5716 +#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5488 msgid "Level Dimmed" msgstr "Nivå dämpad" #. MSG_LIN_CORRECTION c=18 -#: ../../Firmware/ultralcd.cpp:4631 +#: ../../Firmware/ultralcd.cpp:4461 msgid "Lin. correction" msgstr "Linjär korrektion" #. MSG_BABYSTEP_Z c=18 -#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4642 -#: ../../Firmware/ultralcd.cpp:5351 +#: ../../Firmware/messages.cpp:10 ../../Firmware/ultralcd.cpp:4471 +#: ../../Firmware/ultralcd.cpp:5158 msgid "Live adjust Z" msgstr "Live justera Z" #. MSG_LOAD_ALL c=18 -#: ../../Firmware/messages.cpp:180 ../../Firmware/ultralcd.cpp:4950 -#: ../../Firmware/ultralcd.cpp:5030 +#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4766 +#: ../../Firmware/ultralcd.cpp:4835 msgid "Load All" msgstr "Ladda alla" #. MSG_LOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 -#: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 -#: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 +#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4768 +#: ../../Firmware/ultralcd.cpp:4791 ../../Firmware/ultralcd.cpp:4837 +#: ../../Firmware/ultralcd.cpp:5248 msgid "Load filament" msgstr "Ladda filament" #. MSG_LOAD_TO_NOZZLE c=18 -#: ../../Firmware/ultralcd.cpp:5426 +#: ../../Firmware/ultralcd.cpp:5232 msgid "Load to nozzle" msgstr "Ladd till munstyck" #. MSG_LOADING_TEST c=18 -#: ../../Firmware/messages.cpp:56 ../../Firmware/ultralcd.cpp:4313 +#: ../../Firmware/messages.cpp:57 ../../Firmware/ultralcd.cpp:4446 msgid "Loading Test" msgstr "Laddningstest" #. MSG_LOADING_COLOR c=20 -#: ../../Firmware/ultralcd.cpp:2199 +#: ../../Firmware/ultralcd.cpp:2139 msgid "Loading color" msgstr "Laddar färg" #. MSG_LOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3606 ../../Firmware/messages.cpp:57 +#: ../../Firmware/Marlin_main.cpp:3579 ../../Firmware/messages.cpp:58 #: ../../Firmware/mmu2_progress_converter.cpp:51 -#: ../../Firmware/mmu2_reporting.cpp:339 ../../Firmware/ultralcd.cpp:2210 -#: ../../Firmware/ultralcd.cpp:3803 +#: ../../Firmware/mmu2_reporting.cpp:333 ../../Firmware/ultralcd.cpp:2150 +#: ../../Firmware/ultralcd.cpp:3704 msgid "Loading filament" msgstr "Laddar filament" #. MSG_LOOSE_PULLEY c=20 -#: ../../Firmware/ultralcd.cpp:6857 +#: ../../Firmware/ultralcd.cpp:6597 msgid "Loose pulley" msgstr "Lös pulley" #. MSG_SOUND_LOUD c=7 -#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4170 msgid "Loud" msgstr "Högt" @@ -1121,8 +1112,7 @@ msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware internt fel, vänligen återställ MMU." #. MSG_MMU_MODE c=8 -#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4278 -#: ../../Firmware/ultralcd.cpp:4279 +#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "MMU-läge" @@ -1132,7 +1122,7 @@ msgid "MMU NOT RESPONDING" msgstr "MMU SVARAR INTE" #. MSG_MMU_RESTORE_TEMP c=20 r=4 -#: ../../Firmware/mmu2_reporting.cpp:343 +#: ../../Firmware/mmu2_reporting.cpp:337 msgid "MMU Retry: Restoring temperature..." msgstr "MMU försök igen: Återställer temperatur..." @@ -1143,14 +1133,14 @@ msgid "MMU SELFTEST FAILED" msgstr "MMU SJÄLVTEST FELADE" #. MSG_MMU_FAILS c=15 -#: ../../Firmware/messages.cpp:67 ../../Firmware/ultralcd.cpp:1149 -#: ../../Firmware/ultralcd.cpp:1174 +#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 +#: ../../Firmware/ultralcd.cpp:1143 msgid "MMU fails" msgstr "MMU felar" #. MSG_MMU_LOAD_FAILS c=15 -#: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1150 -#: ../../Firmware/ultralcd.cpp:1175 +#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1119 +#: ../../Firmware/ultralcd.cpp:1144 msgid "MMU load fails" msgstr "MMU-laddn felar" @@ -1165,68 +1155,65 @@ msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU svarar inte. Kontrollera kablarna och kontakterna." #. MSG_MMU_CONNECTED c=18 -#: ../../Firmware/ultralcd.cpp:1663 +#: ../../Firmware/ultralcd.cpp:1624 msgid "MMU connected" msgstr "MMU ansluten" #. MSG_MAGNETS_COMP c=13 -#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/messages.cpp:158 ../../Firmware/ultralcd.cpp:5462 msgid "Magnets comp." msgstr "Magnets komp." #. MSG_MAIN c=18 -#: ../../Firmware/messages.cpp:61 ../../Firmware/ultralcd.cpp:1123 -#: ../../Firmware/ultralcd.cpp:1282 ../../Firmware/ultralcd.cpp:1324 -#: ../../Firmware/ultralcd.cpp:1628 ../../Firmware/ultralcd.cpp:4589 -#: ../../Firmware/ultralcd.cpp:4712 ../../Firmware/ultralcd.cpp:4949 -#: ../../Firmware/ultralcd.cpp:4969 ../../Firmware/ultralcd.cpp:4987 -#: ../../Firmware/ultralcd.cpp:5005 ../../Firmware/ultralcd.cpp:5029 -#: ../../Firmware/ultralcd.cpp:5583 +#: ../../Firmware/messages.cpp:62 ../../Firmware/ultralcd.cpp:1092 +#: ../../Firmware/ultralcd.cpp:1250 ../../Firmware/ultralcd.cpp:1292 +#: ../../Firmware/ultralcd.cpp:1596 ../../Firmware/ultralcd.cpp:4423 +#: ../../Firmware/ultralcd.cpp:4541 ../../Firmware/ultralcd.cpp:4765 +#: ../../Firmware/ultralcd.cpp:4789 ../../Firmware/ultralcd.cpp:4802 +#: ../../Firmware/ultralcd.cpp:4815 ../../Firmware/ultralcd.cpp:4834 +#: ../../Firmware/ultralcd.cpp:5386 msgid "Main" msgstr "Huvudmeny" #. MSG_MEASURED_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2533 +#: ../../Firmware/ultralcd.cpp:2479 msgid "Measured skew" msgstr "Mätt skevhet" #. MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3259 -#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:65 +#: ../../Firmware/Marlin_main.cpp:3239 +#: ../../Firmware/mesh_bed_calibration.cpp:2837 ../../Firmware/messages.cpp:66 msgid "Measuring reference height of calibration point" msgstr "Mätning av referenshöjd för kalibreringspunkt" #. MSG_MESH c=12 -#: ../../Firmware/messages.cpp:154 ../../Firmware/ultralcd.cpp:5685 +#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:5458 msgid "Mesh" msgstr "Nätverk" #. MSG_MESH_BED_LEVELING c=18 -#: ../../Firmware/messages.cpp:155 ../../Firmware/ultralcd.cpp:4628 -#: ../../Firmware/ultralcd.cpp:4730 +#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:4458 +#: ../../Firmware/ultralcd.cpp:4559 msgid "Mesh Bed Leveling" msgstr "Bäddytsjustering" #. MSG_MODE c=6 -#: ../../Firmware/messages.cpp:105 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4235 ../../Firmware/ultralcd.cpp:4255 -#: ../../Firmware/ultralcd.cpp:4258 ../../Firmware/ultralcd.cpp:4261 -#: ../../Firmware/ultralcd.cpp:4264 ../../Firmware/ultralcd.cpp:5616 -#: ../../Firmware/ultralcd.cpp:5623 ../../Firmware/ultralcd.cpp:5630 -#: ../../Firmware/ultralcd.cpp:5631 ../../Firmware/ultralcd.cpp:5632 -#: ../../Firmware/ultralcd.cpp:5633 ../../Firmware/ultralcd.cpp:5717 +#: ../../Firmware/messages.cpp:106 ../../Firmware/ultralcd.cpp:4110 +#: ../../Firmware/ultralcd.cpp:4115 ../../Firmware/ultralcd.cpp:4122 +#: ../../Firmware/ultralcd.cpp:4125 ../../Firmware/ultralcd.cpp:4128 +#: ../../Firmware/ultralcd.cpp:4131 ../../Firmware/ultralcd.cpp:5489 msgid "Mode" msgstr "Mode" #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3472 +#: ../../Firmware/ultralcd.cpp:3389 msgid "Mode change in progress..." msgstr "Lägesändring pågår..." #. MSG_MODEL c=8 -#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4452 -#: ../../Firmware/ultralcd.cpp:4455 +#: ../../Firmware/messages.cpp:135 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4286 +#: ../../Firmware/ultralcd.cpp:4289 msgid "Model" msgstr "Modell" @@ -1247,28 +1234,28 @@ msgid "More details online." msgstr "Mera detaljer online." #. MSG_SELFTEST_MOTOR c=18 -#: ../../Firmware/messages.cpp:95 ../../Firmware/ultralcd.cpp:6831 -#: ../../Firmware/ultralcd.cpp:6840 ../../Firmware/ultralcd.cpp:6858 +#: ../../Firmware/messages.cpp:96 ../../Firmware/ultralcd.cpp:6571 +#: ../../Firmware/ultralcd.cpp:6580 ../../Firmware/ultralcd.cpp:6598 msgid "Motor" msgstr "Motor" #. MSG_MOVE_X c=18 -#: ../../Firmware/ultralcd.cpp:3394 +#: ../../Firmware/ultralcd.cpp:3313 msgid "Move X" msgstr "Flytta X" #. MSG_MOVE_Y c=18 -#: ../../Firmware/ultralcd.cpp:3395 +#: ../../Firmware/ultralcd.cpp:3314 msgid "Move Y" msgstr "Flytta Y" #. MSG_MOVE_Z c=18 -#: ../../Firmware/ultralcd.cpp:3396 +#: ../../Firmware/ultralcd.cpp:3315 msgid "Move Z" msgstr "Flytta Z" #. MSG_MOVE_AXIS c=18 -#: ../../Firmware/ultralcd.cpp:4595 +#: ../../Firmware/ultralcd.cpp:4429 msgid "Move axis" msgstr "Flytta axlar" @@ -1279,11 +1266,11 @@ msgid "Moving selector" msgstr "Flyttar väljare" #. MSG_NA c=3 -#: ../../Firmware/menu.cpp:178 ../../Firmware/messages.cpp:129 -#: ../../Firmware/ultralcd.cpp:2498 ../../Firmware/ultralcd.cpp:2542 -#: ../../Firmware/ultralcd.cpp:3319 ../../Firmware/ultralcd.cpp:4134 -#: ../../Firmware/ultralcd.cpp:4135 ../../Firmware/ultralcd.cpp:4137 -#: ../../Firmware/ultralcd.cpp:5689 +#: ../../Firmware/menu.cpp:175 ../../Firmware/messages.cpp:130 +#: ../../Firmware/ultralcd.cpp:2444 ../../Firmware/ultralcd.cpp:2488 +#: ../../Firmware/ultralcd.cpp:3243 ../../Firmware/ultralcd.cpp:4032 +#: ../../Firmware/ultralcd.cpp:4033 ../../Firmware/ultralcd.cpp:4035 +#: ../../Firmware/ultralcd.cpp:5462 msgid "N/A" msgstr "N/A" @@ -1293,83 +1280,81 @@ msgid "New firmware version available:" msgstr "Ny firmware vers tillgänglig:" #. MSG_NO c=4 -#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:3066 -#: ../../Firmware/ultralcd.cpp:4579 ../../Firmware/ultralcd.cpp:4672 -#: ../../Firmware/ultralcd.cpp:5874 +#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:2996 +#: ../../Firmware/ultralcd.cpp:4413 ../../Firmware/ultralcd.cpp:4501 +#: ../../Firmware/ultralcd.cpp:5627 msgid "No" msgstr "Nej" #. MSG_NO_CARD c=18 -#: ../../Firmware/ultralcd.cpp:5406 +#: ../../Firmware/ultralcd.cpp:5212 msgid "No SD card" msgstr "Inget SD-kort" #. MSG_NO_MOVE c=20 -#: ../../Firmware/Marlin_main.cpp:5296 +#: ../../Firmware/Marlin_main.cpp:5262 msgid "No move." msgstr "Ingen rörelse." #. MSG_NONE c=8 -#: ../../Firmware/messages.cpp:131 ../../Firmware/ultralcd.cpp:4366 -#: ../../Firmware/ultralcd.cpp:4375 ../../Firmware/ultralcd.cpp:4446 -#: ../../Firmware/ultralcd.cpp:4455 ../../Firmware/ultralcd.cpp:4485 -#: ../../Firmware/ultralcd.cpp:4494 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4209 ../../Firmware/ultralcd.cpp:4280 +#: ../../Firmware/ultralcd.cpp:4289 ../../Firmware/ultralcd.cpp:4319 +#: ../../Firmware/ultralcd.cpp:4328 ../../Firmware/ultralcd.cpp:4486 msgid "None" msgstr "Ingen" #. MSG_NORMAL c=7 -#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4233 -#: ../../Firmware/ultralcd.cpp:4278 ../../Firmware/ultralcd.cpp:4652 -#: ../../Firmware/ultralcd.cpp:5616 +#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4110 ../../Firmware/ultralcd.cpp:4481 msgid "Normal" msgstr "Normal" #. MSG_SELFTEST_NOTCONNECTED c=20 -#: ../../Firmware/ultralcd.cpp:6818 +#: ../../Firmware/ultralcd.cpp:6558 msgid "Not connected" msgstr "Inte ansluten" #. MSG_SELFTEST_FAN_NO c=19 -#: ../../Firmware/messages.cpp:91 ../../Firmware/ultralcd.cpp:7014 -#: ../../Firmware/ultralcd.cpp:7029 ../../Firmware/ultralcd.cpp:7037 +#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:6715 msgid "Not spinning" msgstr "Roterar inte" #. MSG_WIZARD_V2_CAL c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3813 +#: ../../Firmware/ultralcd.cpp:3715 msgid "" "Now I will calibrate distance between tip of the nozzle and heatbed surface." msgstr "" "Nu ska jag kalibrera avståndet mellan munstyckets spets och värmebäddsytan." #. MSG_WIZARD_WILL_PREHEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3958 +#: ../../Firmware/ultralcd.cpp:3860 msgid "Now I will preheat nozzle for PLA." msgstr "Nu ska jag förvärma munstycket för PLA." #. MSG_REMOVE_TEST_PRINT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3944 +#: ../../Firmware/ultralcd.cpp:3846 msgid "Now remove the test print from steel sheet." msgstr "Ta nu bort testutskriften från metallskivan." #. MSG_NOZZLE c=10 -#: ../../Firmware/messages.cpp:71 ../../Firmware/ultralcd.cpp:1387 -#: ../../Firmware/ultralcd.cpp:4366 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4372 ../../Firmware/ultralcd.cpp:4375 -#: ../../Firmware/ultralcd.cpp:5586 ../../Firmware/ultralcd.cpp:5729 +#: ../../Firmware/messages.cpp:72 ../../Firmware/ultralcd.cpp:1355 +#: ../../Firmware/ultralcd.cpp:4140 ../../Firmware/ultralcd.cpp:4200 +#: ../../Firmware/ultralcd.cpp:4203 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4209 msgid "Nozzle" msgstr "Munstycke" #. MSG_NOZZLE_CNG_MENU c=18 -#: ../../Firmware/messages.cpp:181 ../../Firmware/ultralcd.cpp:4559 -#: ../../Firmware/ultralcd.cpp:4626 +#: ../../Firmware/messages.cpp:182 ../../Firmware/ultralcd.cpp:4393 +#: ../../Firmware/ultralcd.cpp:4456 msgid "Nozzle change" msgstr "Munstycksbyte" #. MSG_NOZZLE_DIAMETER c=10 -#: ../../Firmware/messages.cpp:143 ../../Firmware/ultralcd.cpp:4412 -#: ../../Firmware/ultralcd.cpp:4414 ../../Firmware/ultralcd.cpp:4415 -#: ../../Firmware/ultralcd.cpp:4416 +#: ../../Firmware/messages.cpp:144 ../../Firmware/ultralcd.cpp:4246 +#: ../../Firmware/ultralcd.cpp:4248 ../../Firmware/ultralcd.cpp:4249 +#: ../../Firmware/ultralcd.cpp:4250 msgid "Nozzle d." msgstr "Munst dia." @@ -1380,83 +1365,81 @@ msgid "OK" msgstr "OK" #. MSG_OFF c=3 -#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/menu.cpp:462 -#: ../../Firmware/messages.cpp:127 ../../Firmware/ultralcd.cpp:4130 -#: ../../Firmware/ultralcd.cpp:4141 ../../Firmware/ultralcd.cpp:4142 -#: ../../Firmware/ultralcd.cpp:4144 ../../Firmware/ultralcd.cpp:4167 -#: ../../Firmware/ultralcd.cpp:4192 ../../Firmware/ultralcd.cpp:4239 -#: ../../Firmware/ultralcd.cpp:4603 ../../Firmware/ultralcd.cpp:4618 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4638 -#: ../../Firmware/ultralcd.cpp:5510 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5620 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:25 ../../Firmware/messages.cpp:128 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4080 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5313 +#: ../../Firmware/ultralcd.cpp:5462 ../../Firmware/ultralcd.cpp:7331 +#: ../../Firmware/ultralcd.cpp:7335 msgid "Off" msgstr "Av" #. MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 -#: ../../Firmware/Marlin_main.cpp:1508 +#: ../../Firmware/Marlin_main.cpp:1509 msgid "Old settings found. Default PID, Esteps etc. will be set." msgstr "" "Gamla inställningar funna. Standard PID, Esteps etc. kommer att ställas in." #. MSG_ON c=3 -#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:128 -#: ../../Firmware/ultralcd.cpp:4130 ../../Firmware/ultralcd.cpp:4141 -#: ../../Firmware/ultralcd.cpp:4142 ../../Firmware/ultralcd.cpp:4144 -#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4182 -#: ../../Firmware/ultralcd.cpp:4238 ../../Firmware/ultralcd.cpp:4603 -#: ../../Firmware/ultralcd.cpp:4618 ../../Firmware/ultralcd.cpp:4635 -#: ../../Firmware/ultralcd.cpp:4638 ../../Firmware/ultralcd.cpp:5609 -#: ../../Firmware/ultralcd.cpp:5618 ../../Firmware/ultralcd.cpp:5689 -#: ../../Firmware/ultralcd.cpp:7670 ../../Firmware/ultralcd.cpp:7674 +#: ../../Firmware/SpoolJoin.cpp:23 ../../Firmware/messages.cpp:129 +#: ../../Firmware/ultralcd.cpp:4028 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/ultralcd.cpp:4040 ../../Firmware/ultralcd.cpp:4042 +#: ../../Firmware/ultralcd.cpp:4065 ../../Firmware/ultralcd.cpp:4070 +#: ../../Firmware/ultralcd.cpp:4111 ../../Firmware/ultralcd.cpp:4149 +#: ../../Firmware/ultralcd.cpp:4437 ../../Firmware/ultralcd.cpp:4465 +#: ../../Firmware/ultralcd.cpp:4468 ../../Firmware/ultralcd.cpp:5462 +#: ../../Firmware/ultralcd.cpp:7331 ../../Firmware/ultralcd.cpp:7335 msgid "On" msgstr "På" #. MSG_SOUND_ONCE c=7 -#: ../../Firmware/messages.cpp:152 ../../Firmware/ultralcd.cpp:4326 +#: ../../Firmware/messages.cpp:153 ../../Firmware/ultralcd.cpp:4161 msgid "Once" msgstr "En gång" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9572 ../../Firmware/messages.cpp:174 +#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSAT TERMISKT FEL" #. MSG_PID_RUNNING c=20 -#: ../../Firmware/ultralcd.cpp:909 +#: ../../Firmware/ultralcd.cpp:868 msgid "PID cal." msgstr "PID kalibrering." #. MSG_PID_FINISHED c=20 -#: ../../Firmware/ultralcd.cpp:914 +#: ../../Firmware/ultralcd.cpp:873 msgid "PID cal. finished" msgstr "PID kalibrering klar" #. MSG_PID_EXTRUDER c=17 -#: ../../Firmware/ultralcd.cpp:4733 +#: ../../Firmware/ultralcd.cpp:4562 msgid "PID calibration" msgstr "PID kalibrering" #. MSG_PINDA_PREHEAT c=20 -#: ../../Firmware/ultralcd.cpp:610 +#: ../../Firmware/ultralcd.cpp:603 msgid "PINDA Heating" msgstr "PINDA uppvärmning" #. MSG_PINDA_CALIBRATION c=13 -#: ../../Firmware/Marlin_main.cpp:4789 ../../Firmware/Marlin_main.cpp:4891 -#: ../../Firmware/messages.cpp:114 ../../Firmware/ultralcd.cpp:607 -#: ../../Firmware/ultralcd.cpp:4635 ../../Firmware/ultralcd.cpp:4740 +#: ../../Firmware/Marlin_main.cpp:4762 ../../Firmware/Marlin_main.cpp:4864 +#: ../../Firmware/messages.cpp:115 ../../Firmware/ultralcd.cpp:600 +#: ../../Firmware/ultralcd.cpp:4465 ../../Firmware/ultralcd.cpp:4569 msgid "PINDA cal." msgstr "PINDA kal." #. MSG_PINDA_CAL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3272 +#: ../../Firmware/ultralcd.cpp:3197 msgid "PINDA calibration failed" msgstr "PINDA-kalibrering misslyckades" #. MSG_PINDA_CALIBRATION_DONE c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:4968 ../../Firmware/messages.cpp:115 -#: ../../Firmware/ultralcd.cpp:3266 +#: ../../Firmware/Marlin_main.cpp:4939 ../../Firmware/messages.cpp:116 +#: ../../Firmware/ultralcd.cpp:3194 msgid "" "PINDA calibration is finished and active. It can be disabled in menu " "Settings->PINDA cal." @@ -1476,13 +1459,13 @@ msgid "Parking selector" msgstr "Parkerar väljare" #. MSG_PAUSE c=5 -#: ../../Firmware/messages.cpp:160 ../../Firmware/ultralcd.cpp:4153 +#: ../../Firmware/messages.cpp:161 ../../Firmware/ultralcd.cpp:4051 msgid "Pause" msgstr "Paus" #. MSG_PAUSE_PRINT c=18 -#: ../../Firmware/messages.cpp:73 ../../Firmware/ultralcd.cpp:5365 -#: ../../Firmware/ultralcd.cpp:5367 +#: ../../Firmware/messages.cpp:74 ../../Firmware/ultralcd.cpp:5171 +#: ../../Firmware/ultralcd.cpp:5173 msgid "Pause print" msgstr "Pausa utskrift" @@ -1493,7 +1476,7 @@ msgid "Performing cut" msgstr "Utför skärning" #. MSG_PAPER c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3283 ../../Firmware/messages.cpp:72 +#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/messages.cpp:73 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." @@ -1502,7 +1485,7 @@ msgstr "" "punkterna. Om munstycket fångar papperet, stäng av omedelbart." #. MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:119 ../../Firmware/ultralcd.cpp:4052 +#: ../../Firmware/messages.cpp:120 ../../Firmware/ultralcd.cpp:3952 msgid "" "Please check our handbook and fix the problem. Then resume the Wizard by " "rebooting the printer." @@ -1511,27 +1494,27 @@ msgstr "" "starta om skrivaren." #. MSG_CHECK_IR_CONNECTION c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6107 +#: ../../Firmware/ultralcd.cpp:5861 msgid "Please check the IR sensor connection, unload filament if present." msgstr "Kontrollera IR-sensorns anslutning, mata ut eventuellt filament." #. MSG_SELFTEST_PLEASECHECK c=20 -#: ../../Firmware/ultralcd.cpp:6812 +#: ../../Firmware/ultralcd.cpp:6552 msgid "Please check:" msgstr "Kontrollera:" #. MSG_WIZARD_CLEAN_HEATBED c=20 r=8 -#: ../../Firmware/ultralcd.cpp:4015 +#: ../../Firmware/ultralcd.cpp:3915 msgid "Please clean heatbed and then press the knob." msgstr "Rengör bädden och tryck sedan på knappen." #. MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:3257 ../../Firmware/messages.cpp:24 +#: ../../Firmware/Marlin_main.cpp:3237 ../../Firmware/messages.cpp:24 msgid "Please clean the nozzle for calibration. Click when done." msgstr "Rengör munstycket för kalibrering. Klicka när du är klar." #. MSG_WIZARD_LOAD_FILAMENT c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3800 +#: ../../Firmware/ultralcd.cpp:3701 msgid "" "Please insert filament into the extruder, then press the knob to load it." msgstr "" @@ -1539,7 +1522,7 @@ msgstr "" "inladdning.." #. MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3794 +#: ../../Firmware/ultralcd.cpp:3695 msgid "" "Please insert filament into the first tube of the MMU, then press the knob " "to load it." @@ -1548,50 +1531,50 @@ msgstr "" "knappen för inladdning." #. MSG_PLEASE_LOAD_PLA c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3720 +#: ../../Firmware/ultralcd.cpp:3621 msgid "Please load filament first." msgstr "Vänligen ladda filament först." #. MSG_CHECK_IDLER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3536 +#: ../../Firmware/Marlin_main.cpp:3516 msgid "Please open idler and remove filament manually." msgstr "Öppna idler och ta bort filamentet manuellt." #. MSG_PLACE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:74 -#: ../../Firmware/ultralcd.cpp:3947 +#: ../../Firmware/mesh_bed_calibration.cpp:2796 ../../Firmware/messages.cpp:75 +#: ../../Firmware/ultralcd.cpp:3849 msgid "Please place steel sheet on heatbed." msgstr "Placera metallskiva på värmebädden." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11398 ../../Firmware/Marlin_main.cpp:11428 -#: ../../Firmware/messages.cpp:78 +#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Vänligen tryck på knappen för att mata ut filament" #. MSG_PULL_OUT_FILAMENT c=20 r=4 -#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:5067 +#: ../../Firmware/messages.cpp:81 ../../Firmware/ultralcd.cpp:4887 msgid "Please pull out filament immediately" msgstr "Vänligen ta ut filamentet omedelbart" #. MSG_REMOVE_SHIPPING_HELPERS c=20 r=3 -#: ../../Firmware/ultralcd.cpp:3943 +#: ../../Firmware/ultralcd.cpp:3845 msgid "Please remove shipping helpers first." msgstr "Vänligen ta bort fraktinsatserna först." #. MSG_REMOVE_STEEL_SHEET c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3280 ../../Firmware/Marlin_main.cpp:4754 -#: ../../Firmware/messages.cpp:83 +#: ../../Firmware/Marlin_main.cpp:3260 ../../Firmware/Marlin_main.cpp:4727 +#: ../../Firmware/messages.cpp:84 msgid "Please remove steel sheet from heatbed." msgstr "Ta bort metallskivan från värmebädden." #. MSG_RUN_XYZ c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4730 +#: ../../Firmware/Marlin_main.cpp:4703 msgid "Please run XYZ calibration first." msgstr "Utför XYZ-kalibrering först." #. MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6104 +#: ../../Firmware/ultralcd.cpp:5858 msgid "Please unload the filament first, then repeat this action." msgstr "Vänligen mata ut filamentet först och upprepa sedan denna åtgärd." @@ -1601,51 +1584,51 @@ msgid "Please upgrade." msgstr "Vänligen uppgradera." #. MSG_PLEASE_WAIT c=20 -#: ../../Firmware/Marlin_main.cpp:3532 ../../Firmware/Marlin_main.cpp:3550 -#: ../../Firmware/Marlin_main.cpp:7884 ../../Firmware/messages.cpp:75 -#: ../../Firmware/ultralcd.cpp:2200 ../../Firmware/ultralcd.cpp:2211 +#: ../../Firmware/Marlin_main.cpp:3512 ../../Firmware/Marlin_main.cpp:7799 +#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:2140 +#: ../../Firmware/ultralcd.cpp:2151 msgid "Please wait" msgstr "Vänligen vänta" #. MSG_POWER_FAILURES c=15 -#: ../../Firmware/messages.cpp:76 ../../Firmware/ultralcd.cpp:1229 -#: ../../Firmware/ultralcd.cpp:1258 +#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:1197 +#: ../../Firmware/ultralcd.cpp:1226 msgid "Power failures" msgstr "Strömavbrott" #. MSG_PREHEAT c=18 -#: ../../Firmware/ultralcd.cpp:5360 +#: ../../Firmware/ultralcd.cpp:5166 msgid "Preheat" msgstr "Förvärm" #. MSG_PREHEAT_NOZZLE c=20 -#: ../../Firmware/messages.cpp:77 ../../Firmware/ultralcd.cpp:2281 +#: ../../Firmware/messages.cpp:78 ../../Firmware/ultralcd.cpp:2216 msgid "Preheat the nozzle!" msgstr "Förvärm munstycket!" #. MSG_WIZARD_HEATING c=20 r=3 -#: ../../Firmware/messages.cpp:121 ../../Firmware/ultralcd.cpp:2794 -#: ../../Firmware/ultralcd.cpp:3779 ../../Firmware/ultralcd.cpp:3781 +#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:2732 +#: ../../Firmware/ultralcd.cpp:3680 ../../Firmware/ultralcd.cpp:3682 msgid "Preheating nozzle. Please wait." msgstr "Förvärmer munstycke. Vänta." #. MSG_PREHEATING_TO_CUT c=20 -#: ../../Firmware/ultralcd.cpp:1997 +#: ../../Firmware/ultralcd.cpp:1951 msgid "Preheating to cut" msgstr "Förvärmer för skära" #. MSG_PREHEATING_TO_EJECT c=20 -#: ../../Firmware/ultralcd.cpp:1994 +#: ../../Firmware/ultralcd.cpp:1948 msgid "Preheating to eject" msgstr "Förvämer för utmatn" #. MSG_PREHEATING_TO_LOAD c=20 -#: ../../Firmware/ultralcd.cpp:1985 +#: ../../Firmware/ultralcd.cpp:1939 msgid "Preheating to load" msgstr "Förvärmer för laddn" #. MSG_PREHEATING_TO_UNLOAD c=20 -#: ../../Firmware/ultralcd.cpp:1990 +#: ../../Firmware/ultralcd.cpp:1944 msgid "Preheating to unload" msgstr "Förvärmer for utmatn" @@ -1656,48 +1639,48 @@ msgid "Preparing blade" msgstr "Förbereder blad" #. MSG_PRESS_KNOB c=20 -#: ../../Firmware/ultralcd.cpp:1811 +#: ../../Firmware/ultralcd.cpp:1768 msgid "Press the knob" msgstr "Tryck på knappen" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11410 +#: ../../Firmware/Marlin_main.cpp:11220 msgid "Press the knob to preheat nozzle and continue." msgstr "Tryck på knappen för att förvärma munstycket och fortsätta." #. MSG_PRINT_ABORTED c=20 -#: ../../Firmware/messages.cpp:79 ../../Firmware/ultralcd.cpp:807 +#: ../../Firmware/messages.cpp:80 ../../Firmware/ultralcd.cpp:773 msgid "Print aborted" msgstr "Utskriften avbröts" #. MSG_PRINT_FAN_SPEED c=15 -#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1102 -#: ../../Firmware/ultralcd.cpp:7166 +#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1071 +#: ../../Firmware/ultralcd.cpp:6844 msgid "Print fan:" msgstr "Utskriftsfläkt:" #. MSG_CARD_MENU c=18 -#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5398 +#: ../../Firmware/messages.cpp:20 ../../Firmware/ultralcd.cpp:5204 msgid "Print from SD" msgstr "Skriv ut från SD" #. MSG_PRINT_PAUSED c=20 -#: ../../Firmware/ultralcd.cpp:821 +#: ../../Firmware/ultralcd.cpp:787 msgid "Print paused" msgstr "Utskriften pausad" #. MSG_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2362 +#: ../../Firmware/ultralcd.cpp:2308 msgid "Print time" msgstr "Utskriftstid" #. MSG_PRINTER_IP c=18 -#: ../../Firmware/ultralcd.cpp:1695 +#: ../../Firmware/ultralcd.cpp:1656 msgid "Printer IP Addr:" msgstr "Skrivarens IP adr:" #. MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1548 ../../Firmware/messages.cpp:42 +#: ../../Firmware/Marlin_main.cpp:1549 ../../Firmware/messages.cpp:42 msgid "" "Printer has not been calibrated yet. Please follow the manual, chapter First" " steps, section Calibration flow." @@ -1706,12 +1689,12 @@ msgstr "" "stegen, avsnitt Kalibreringsflöde." #. MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=3 -#: ../../Firmware/messages.cpp:141 ../../Firmware/util.cpp:310 +#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:293 msgid "Nozzle diameter differs from the G-code. Continue?" msgstr "Munstycksdiametern skiljer sig från G-codeen. Fortsätta?" #. MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=8 -#: ../../Firmware/messages.cpp:142 ../../Firmware/util.cpp:311 +#: ../../Firmware/messages.cpp:143 ../../Firmware/util.cpp:294 msgid "" "Nozzle diameter differs from the G-code. Please check the value in settings." " Print cancelled." @@ -1738,27 +1721,27 @@ msgid "QUEUE FULL" msgstr "KÖ FULL" #. MSG_RPI_PORT c=13 -#: ../../Firmware/messages.cpp:149 ../../Firmware/ultralcd.cpp:4638 +#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4468 msgid "RPi port" msgstr "RPi port" #. MSG_BED_CORRECTION_REAR c=14 -#: ../../Firmware/ultralcd.cpp:2733 +#: ../../Firmware/ultralcd.cpp:2672 msgid "Rear side [µm]" msgstr "Baksida [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10762 +#: ../../Firmware/Marlin_main.cpp:10598 msgid "Recovering print" msgstr "Återställer utskrift" #. MSG_REMOVE_OLD_FILAMENT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:3434 +#: ../../Firmware/Marlin_main.cpp:3414 msgid "Remove old filament and press the knob to start loading new filament." msgstr "Ta bort det gamla fil. och tryck på knappen för att börja ladda nytt." #. MSG_RENAME c=18 -#: ../../Firmware/ultralcd.cpp:5284 +#: ../../Firmware/ultralcd.cpp:5090 msgid "Rename" msgstr "Döp om" @@ -1772,24 +1755,24 @@ msgstr "" "G-codeen för verktygsindex utanför intervallet (T0-T4)." #. MSG_RESET c=14 -#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:2734 -#: ../../Firmware/ultralcd.cpp:5285 +#: ../../Firmware/messages.cpp:85 ../../Firmware/ultralcd.cpp:2673 +#: ../../Firmware/ultralcd.cpp:5091 msgid "Reset" msgstr "Återställ" #. MSG_CALIBRATE_BED_RESET c=18 -#: ../../Firmware/ultralcd.cpp:4737 +#: ../../Firmware/ultralcd.cpp:4566 msgid "Reset XYZ calibr." msgstr "Återställ XYZ-kal." #. MSG_RESUME_PRINT c=18 -#: ../../Firmware/Marlin_main.cpp:626 ../../Firmware/messages.cpp:85 -#: ../../Firmware/ultralcd.cpp:5379 ../../Firmware/ultralcd.cpp:5381 +#: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 +#: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 msgid "Resume print" msgstr "Återuppta utskrift" #. MSG_RESUMING_PRINT c=20 -#: ../../Firmware/messages.cpp:86 ../../Firmware/ultralcd.cpp:618 +#: ../../Firmware/messages.cpp:87 ../../Firmware/ultralcd.cpp:611 msgid "Resuming print" msgstr "Återupptar utskrift" @@ -1811,17 +1794,17 @@ msgid "Returning selector" msgstr "Återvändande väljare" #. MSG_RIGHT c=10 -#: ../../Firmware/ultralcd.cpp:2493 +#: ../../Firmware/ultralcd.cpp:2439 msgid "Right" msgstr "Höger" #. MSG_BED_CORRECTION_RIGHT c=14 -#: ../../Firmware/ultralcd.cpp:2731 +#: ../../Firmware/ultralcd.cpp:2670 msgid "Right side[µm]" msgstr "Höger sida[µm]" #. MSG_WIZARD_RERUN c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3743 +#: ../../Firmware/ultralcd.cpp:3644 msgid "" "Running Wizard will delete current calibration results and start from the " "beginning. Continue?" @@ -1830,8 +1813,8 @@ msgstr "" "börja om från början. Fortsätta?" #. MSG_SD_CARD c=8 -#: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4650 -#: ../../Firmware/ultralcd.cpp:4652 +#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4479 +#: ../../Firmware/ultralcd.cpp:4481 msgid "SD card" msgstr "SD-kort" @@ -1846,23 +1829,23 @@ msgid "SELECTOR CANNOT MOVE" msgstr "VÄLJARE FASTNAT" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9598 ../../Firmware/messages.cpp:113 +#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "STOPPAD." #. MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3263 ../../Firmware/Marlin_main.cpp:3285 +#: ../../Firmware/Marlin_main.cpp:3243 ../../Firmware/Marlin_main.cpp:3265 #: ../../Firmware/mesh_bed_calibration.cpp:2234 ../../Firmware/messages.cpp:40 msgid "Searching bed calibration point" msgstr "Söker efter kalibreringspunkt för bädden" #. MSG_SELECT c=18 -#: ../../Firmware/ultralcd.cpp:5277 +#: ../../Firmware/ultralcd.cpp:5083 msgid "Select" msgstr "Välj" #. MSG_SELECT_FIL_1ST_LAYERCAL c=20 r=7 -#: ../../Firmware/ultralcd.cpp:3817 +#: ../../Firmware/ultralcd.cpp:3719 msgid "" "Select a filament for the First Layer Calibration and select it in the on-" "screen menu." @@ -1870,25 +1853,25 @@ msgstr "" "Välj ett filament för första lagrets kalibrering och välj det i skärmmenyn." #. MSG_SELECT_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3472 ../../Firmware/Tcodes.cpp:32 -#: ../../Firmware/Tcodes.cpp:47 ../../Firmware/messages.cpp:52 -#: ../../Firmware/ultralcd.cpp:3690 +#: ../../Firmware/Marlin_main.cpp:3452 ../../Firmware/Tcodes.cpp:31 +#: ../../Firmware/Tcodes.cpp:46 ../../Firmware/messages.cpp:52 +#: ../../Firmware/ultralcd.cpp:3600 ../../Firmware/ultralcd.cpp:6674 msgid "Select filament:" msgstr "Välj filament:" #. MSG_SELECT_LANGUAGE c=18 -#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3535 -#: ../../Firmware/ultralcd.cpp:4645 +#: ../../Firmware/messages.cpp:100 ../../Firmware/ultralcd.cpp:3443 +#: ../../Firmware/ultralcd.cpp:4474 msgid "Select language" msgstr "Välj språk" #. MSG_SEL_PREHEAT_TEMP c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3989 +#: ../../Firmware/ultralcd.cpp:3889 msgid "Select nozzle preheat temperature which matches your material." msgstr "Välj munstycksförvärmningstemperatur som passar ditt material." #. MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3822 +#: ../../Firmware/ultralcd.cpp:3724 msgid "Select temperature which matches your material." msgstr "Välj temperatur som passar ditt material." @@ -1899,73 +1882,73 @@ msgid "Selecting fil. slot" msgstr "Välj fil. spår" #. MSG_SELFTEST_OK c=20 -#: ../../Firmware/ultralcd.cpp:6372 +#: ../../Firmware/ultralcd.cpp:6112 msgid "Self test OK" msgstr "Självtest OK" #. MSG_SELFTEST_START c=20 -#: ../../Firmware/ultralcd.cpp:6144 +#: ../../Firmware/ultralcd.cpp:5895 msgid "Self test start" msgstr "Självteststart" #. MSG_SELFTEST c=18 -#: ../../Firmware/ultralcd.cpp:4724 +#: ../../Firmware/ultralcd.cpp:4553 msgid "Selftest" msgstr "Självtest" #. MSG_SELFTEST_ERROR c=20 -#: ../../Firmware/ultralcd.cpp:6811 +#: ../../Firmware/ultralcd.cpp:6551 msgid "Selftest error!" msgstr "Självtestfel!" #. MSG_SELFTEST_FAILED c=20 -#: ../../Firmware/messages.cpp:89 ../../Firmware/ultralcd.cpp:6377 -#: ../../Firmware/ultralcd.cpp:6898 ../../Firmware/ultralcd.cpp:7156 +#: ../../Firmware/messages.cpp:90 ../../Firmware/ultralcd.cpp:6117 +#: ../../Firmware/ultralcd.cpp:6638 ../../Firmware/ultralcd.cpp:6834 msgid "Selftest failed" msgstr "Självtestet felade" #. MSG_FORCE_SELFTEST c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1523 +#: ../../Firmware/Marlin_main.cpp:1524 msgid "Selftest will be run to calibrate accurate sensorless rehoming." msgstr "" "Självtest kommer att utföras för att kalibrera exakt sensorlös hemposition." #. MSG_INFO_SENSORS c=18 -#: ../../Firmware/ultralcd.cpp:1707 +#: ../../Firmware/ultralcd.cpp:1668 msgid "Sensor info" msgstr "Sensorinfo" #. MSG_FS_VERIFIED c=20 r=3 -#: ../../Firmware/ultralcd.cpp:6111 +#: ../../Firmware/ultralcd.cpp:5865 msgid "Sensor verified, remove the filament now." msgstr "Sensor verifierad, ta bort filamentet nu." #. MSG_SET_TEMPERATURE c=20 -#: ../../Firmware/ultralcd.cpp:2751 +#: ../../Firmware/ultralcd.cpp:2690 msgid "Set temperature:" msgstr "Sätt temperatur:" #. MSG_SETTINGS c=18 -#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:3393 -#: ../../Firmware/ultralcd.cpp:3552 ../../Firmware/ultralcd.cpp:4073 -#: ../../Firmware/ultralcd.cpp:5446 ../../Firmware/ultralcd.cpp:5680 -#: ../../Firmware/ultralcd.cpp:5727 +#: ../../Firmware/messages.cpp:99 ../../Firmware/ultralcd.cpp:3312 +#: ../../Firmware/ultralcd.cpp:3460 ../../Firmware/ultralcd.cpp:3973 +#: ../../Firmware/ultralcd.cpp:5252 ../../Firmware/ultralcd.cpp:5453 +#: ../../Firmware/ultralcd.cpp:5499 msgid "Settings" msgstr "Inställningar" #. MSG_SEVERE_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2536 +#: ../../Firmware/ultralcd.cpp:2482 msgid "Severe skew" msgstr "Hög skevhet" #. MSG_SHEET c=10 -#: ../../Firmware/menu.cpp:200 ../../Firmware/menu.cpp:212 -#: ../../Firmware/messages.cpp:63 +#: ../../Firmware/menu.cpp:196 ../../Firmware/menu.cpp:208 +#: ../../Firmware/messages.cpp:64 msgid "Sheet" msgstr "Skiva" #. MSG_SHEET_OFFSET c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3680 +#: ../../Firmware/ultralcd.cpp:3592 msgid "" "Sheet %.7s\n" "Z offset: %+1.3fmm\n" @@ -1978,23 +1961,23 @@ msgstr "" "%cÅterställ" #. MSG_SHOW_END_STOPS c=18 -#: ../../Firmware/ultralcd.cpp:4735 +#: ../../Firmware/ultralcd.cpp:4564 msgid "Show end stops" msgstr "Visa ändlägen" #. MSG_SILENT c=7 -#: ../../Firmware/messages.cpp:108 ../../Firmware/ultralcd.cpp:4258 -#: ../../Firmware/ultralcd.cpp:4329 ../../Firmware/ultralcd.cpp:5631 +#: ../../Firmware/messages.cpp:109 ../../Firmware/ultralcd.cpp:4125 +#: ../../Firmware/ultralcd.cpp:4164 msgid "Silent" msgstr "Tyst" #. MSG_SLIGHT_SKEW c=14 -#: ../../Firmware/ultralcd.cpp:2535 +#: ../../Firmware/ultralcd.cpp:2481 msgid "Slight skew" msgstr "Låg skevhet" #. MSG_FILE_CNT c=20 r=6 -#: ../../Firmware/cardreader.cpp:816 +#: ../../Firmware/cardreader.cpp:814 msgid "" "Some files will not be sorted. Max. No. of files in 1 folder for sorting is " "100." @@ -2008,54 +1991,53 @@ msgid "Some problem encountered, Z-leveling enforced ..." msgstr "Ett problem har uppstått, Z-nivellering utförs..." #. MSG_SORT c=7 -#: ../../Firmware/messages.cpp:146 ../../Firmware/ultralcd.cpp:4655 -#: ../../Firmware/ultralcd.cpp:4656 ../../Firmware/ultralcd.cpp:4657 +#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4484 +#: ../../Firmware/ultralcd.cpp:4485 ../../Firmware/ultralcd.cpp:4486 msgid "Sort" msgstr "Sortera" #. MSG_SORTING_FILES c=20 -#: ../../Firmware/cardreader.cpp:860 ../../Firmware/cardreader.cpp:927 -#: ../../Firmware/messages.cpp:100 +#: ../../Firmware/cardreader.cpp:858 ../../Firmware/cardreader.cpp:925 +#: ../../Firmware/messages.cpp:101 msgid "Sorting files" msgstr "Sorterar filer" #. MSG_SOUND c=9 -#: ../../Firmware/messages.cpp:150 ../../Firmware/ultralcd.cpp:4323 -#: ../../Firmware/ultralcd.cpp:4326 ../../Firmware/ultralcd.cpp:4329 -#: ../../Firmware/ultralcd.cpp:4332 ../../Firmware/ultralcd.cpp:4335 +#: ../../Firmware/messages.cpp:151 ../../Firmware/ultralcd.cpp:4158 +#: ../../Firmware/ultralcd.cpp:4161 ../../Firmware/ultralcd.cpp:4164 +#: ../../Firmware/ultralcd.cpp:4167 ../../Firmware/ultralcd.cpp:4170 msgid "Sound" msgstr "Ljud" #. MSG_SPEED c=15 -#: ../../Firmware/ultralcd.cpp:5584 +#: ../../Firmware/ultralcd.cpp:5387 msgid "Speed" msgstr "Fart" #. MSG_SELFTEST_FAN_YES c=19 -#: ../../Firmware/messages.cpp:92 ../../Firmware/ultralcd.cpp:7012 -#: ../../Firmware/ultralcd.cpp:7027 ../../Firmware/ultralcd.cpp:7035 +#: ../../Firmware/messages.cpp:93 ../../Firmware/ultralcd.cpp:6713 msgid "Spinning" msgstr "Rotation" #. MSG_TEMP_CAL_WARNING c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:4743 +#: ../../Firmware/Marlin_main.cpp:4716 msgid "Stable ambient temperature 21-26C is needed a rigid stand is required." msgstr "Stabil omgivningstemperatur 21-26C krävs samt ett styvt stativ." #. MSG_STATISTICS c=18 -#: ../../Firmware/ultralcd.cpp:5451 +#: ../../Firmware/ultralcd.cpp:5257 msgid "Statistics" msgstr "Statistik" #. MSG_STEALTH c=7 -#: ../../Firmware/messages.cpp:110 ../../Firmware/ultralcd.cpp:4235 -#: ../../Firmware/ultralcd.cpp:4279 ../../Firmware/ultralcd.cpp:5623 +#: ../../Firmware/messages.cpp:111 ../../Firmware/ultralcd.cpp:4085 +#: ../../Firmware/ultralcd.cpp:4115 msgid "Stealth" msgstr "Tyst" #. MSG_STEEL_SHEETS c=18 -#: ../../Firmware/messages.cpp:64 ../../Firmware/ultralcd.cpp:4557 -#: ../../Firmware/ultralcd.cpp:5274 +#: ../../Firmware/messages.cpp:65 ../../Firmware/ultralcd.cpp:4391 +#: ../../Firmware/ultralcd.cpp:5080 msgid "Steel sheets" msgstr "Metallskivor" @@ -2065,29 +2047,29 @@ msgid "Stop" msgstr "Stopp" #. MSG_STOP_PRINT c=18 -#: ../../Firmware/messages.cpp:112 ../../Firmware/ultralcd.cpp:5386 -#: ../../Firmware/ultralcd.cpp:5866 +#: ../../Firmware/messages.cpp:113 ../../Firmware/ultralcd.cpp:5192 +#: ../../Firmware/ultralcd.cpp:5619 msgid "Stop print" msgstr "Stoppa utskriften" #. MSG_STRICT c=8 -#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4372 -#: ../../Firmware/ultralcd.cpp:4452 ../../Firmware/ultralcd.cpp:4491 +#: ../../Firmware/messages.cpp:134 ../../Firmware/ultralcd.cpp:4206 +#: ../../Firmware/ultralcd.cpp:4286 ../../Firmware/ultralcd.cpp:4325 msgid "Strict" msgstr "Strikt" #. MSG_SUPPORT c=18 -#: ../../Firmware/ultralcd.cpp:5460 +#: ../../Firmware/ultralcd.cpp:5266 msgid "Support" msgstr "Support" #. MSG_SELFTEST_SWAPPED c=16 -#: ../../Firmware/ultralcd.cpp:6870 +#: ../../Firmware/ultralcd.cpp:6610 msgid "Swapped" msgstr "Utbytt" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:176 ../../Firmware/temperature.cpp:2448 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 msgid "THERMAL ANOMALY" msgstr "TERMISK ANOMALI" @@ -2122,7 +2104,7 @@ msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERSPÄNNINGFEL" #. MSG_TM_CAL c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3970 +#: ../../Firmware/ultralcd.cpp:3870 msgid "" "Thermal model cal. takes approx. 12 mins. See\n" "prusa.io/tm-cal" @@ -2131,22 +2113,22 @@ msgstr "" "prusa.io/tm-cal" #. MSG_TM_NOT_CAL c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1559 ../../Firmware/messages.cpp:177 +#: ../../Firmware/Marlin_main.cpp:1560 ../../Firmware/messages.cpp:178 msgid "Thermal model not calibrated yet." msgstr "Termisk-modellen är inte kalibrerad ännu." #. MSG_TEMPERATURE c=18 -#: ../../Firmware/ultralcd.cpp:4591 +#: ../../Firmware/ultralcd.cpp:4425 msgid "Temperature" msgstr "Temperatur" #. MSG_MENU_TEMPERATURES c=18 -#: ../../Firmware/ultralcd.cpp:1713 +#: ../../Firmware/ultralcd.cpp:1674 msgid "Temperatures" msgstr "Temperaturer" #. MSG_TESTING_FILAMENT c=20 -#: ../../Firmware/messages.cpp:58 ../../Firmware/mmu2_reporting.cpp:335 +#: ../../Firmware/messages.cpp:59 ../../Firmware/mmu2_reporting.cpp:329 msgid "Testing filament" msgstr "Testar filament" @@ -2167,7 +2149,7 @@ msgstr "" "blockerar dess rörelse." #. MSG_WIZARD_V2_CAL_2 c=20 r=12 -#: ../../Firmware/ultralcd.cpp:3825 +#: ../../Firmware/ultralcd.cpp:3727 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 " @@ -2177,7 +2159,7 @@ msgstr "" "optimal höjd. Kontrollera med bilderna i handboken (Kalibreringskapitlet)." #. MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=8 -#: ../../Firmware/Marlin_main.cpp:1552 ../../Firmware/messages.cpp:43 +#: ../../Firmware/Marlin_main.cpp:1553 ../../Firmware/messages.cpp:43 msgid "" "There is still a need to make Z calibration. Please follow the manual, " "chapter First steps, section Calibration flow." @@ -2186,39 +2168,39 @@ msgstr "" "kap Första stegen, avs Kalibreringsflöde." #. MSG_SORT_TIME c=8 -#: ../../Firmware/messages.cpp:147 ../../Firmware/ultralcd.cpp:4655 +#: ../../Firmware/messages.cpp:148 ../../Firmware/ultralcd.cpp:4484 msgid "Time" msgstr "Tid" #. MSG_TIMEOUT c=12 -#: ../../Firmware/messages.cpp:164 ../../Firmware/ultralcd.cpp:5718 +#: ../../Firmware/messages.cpp:165 ../../Firmware/ultralcd.cpp:5490 msgid "Timeout" msgstr "Timeout" #. MSG_TOTAL c=6 -#: ../../Firmware/messages.cpp:101 ../../Firmware/ultralcd.cpp:1125 -#: ../../Firmware/ultralcd.cpp:1284 +#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1094 +#: ../../Firmware/ultralcd.cpp:1252 msgid "Total" msgstr "Total" #. MSG_TOTAL_FAILURES c=20 -#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1173 -#: ../../Firmware/ultralcd.cpp:1228 ../../Firmware/ultralcd.cpp:1314 +#: ../../Firmware/messages.cpp:104 ../../Firmware/ultralcd.cpp:1142 +#: ../../Firmware/ultralcd.cpp:1196 ../../Firmware/ultralcd.cpp:1282 msgid "Total failures" msgstr "Totala fel" #. MSG_TOTAL_FILAMENT c=19 -#: ../../Firmware/ultralcd.cpp:2383 +#: ../../Firmware/ultralcd.cpp:2329 msgid "Total filament" msgstr "Total filament" #. MSG_TOTAL_PRINT_TIME c=19 -#: ../../Firmware/ultralcd.cpp:2384 +#: ../../Firmware/ultralcd.cpp:2330 msgid "Total print time" msgstr "Tot utskriftstid" #. MSG_TUNE c=18 -#: ../../Firmware/ultralcd.cpp:5358 +#: ../../Firmware/ultralcd.cpp:5164 msgid "Tune" msgstr "Ställ in" @@ -2233,15 +2215,15 @@ msgid "Unload" msgstr "Ladda ur" #. MSG_UNLOAD_FILAMENT c=16 -#: ../../Firmware/messages.cpp:116 ../../Firmware/ultralcd.cpp:5427 -#: ../../Firmware/ultralcd.cpp:5444 +#: ../../Firmware/messages.cpp:117 ../../Firmware/ultralcd.cpp:5233 +#: ../../Firmware/ultralcd.cpp:5250 msgid "Unload filament" msgstr "Ta bort filament" #. MSG_UNLOADING_FILAMENT c=20 -#: ../../Firmware/Marlin_main.cpp:3455 ../../Firmware/messages.cpp:117 +#: ../../Firmware/Marlin_main.cpp:3435 ../../Firmware/messages.cpp:118 #: ../../Firmware/mmu2_progress_converter.cpp:50 -#: ../../Firmware/ultralcd.cpp:5045 +#: ../../Firmware/ultralcd.cpp:4866 msgid "Unloading filament" msgstr "Tar bort filament" @@ -2258,12 +2240,12 @@ msgid "Unloading to pulley" msgstr "Ladd ur t. remskiva" #. MSG_FIL_FAILED c=20 r=4 -#: ../../Firmware/ultralcd.cpp:6114 +#: ../../Firmware/ultralcd.cpp:5868 msgid "Verification failed, remove the filament and try again." msgstr "Verifieringen felade, ta bort filamentet, försök igen." #. MSG_MENU_VOLTAGES c=18 -#: ../../Firmware/ultralcd.cpp:1716 +#: ../../Firmware/ultralcd.cpp:1677 msgid "Voltages" msgstr "Spänning" @@ -2274,7 +2256,7 @@ msgid "WARNING TMC TOO HOT" msgstr "VARNING TMC FÖR VARM" #. MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 -#: ../../Firmware/ultralcd.cpp:3436 +#: ../../Firmware/ultralcd.cpp:3355 msgid "" "WARNING:\n" "Crash detection\n" @@ -2287,191 +2269,186 @@ msgstr "" "tyst-läge" #. MSG_USERWAIT c=20 -#: ../../Firmware/Marlin_main.cpp:5265 +#: ../../Firmware/Marlin_main.cpp:5231 msgid "Wait for user..." msgstr "Väntar på användare." #. MSG_WAITING_TEMP_PINDA c=20 r=3 -#: ../../Firmware/ultralcd.cpp:2775 +#: ../../Firmware/ultralcd.cpp:2714 msgid "Waiting for PINDA probe cooling" msgstr "Väntar på PINDA-sondens kylning" #. MSG_WAITING_TEMP c=20 r=4 -#: ../../Firmware/ultralcd.cpp:2807 +#: ../../Firmware/ultralcd.cpp:2744 msgid "Waiting for nozzle and bed cooling" msgstr "Väntar på munstycks- och bäddkylning" #. MSG_WARN c=8 -#: ../../Firmware/messages.cpp:132 ../../Firmware/ultralcd.cpp:4369 -#: ../../Firmware/ultralcd.cpp:4449 ../../Firmware/ultralcd.cpp:4488 +#: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4203 +#: ../../Firmware/ultralcd.cpp:4283 ../../Firmware/ultralcd.cpp:4322 msgid "Warn" msgstr "Varna" #. MSG_CHANGED_BOTH c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1500 +#: ../../Firmware/Marlin_main.cpp:1501 msgid "Warning: both printer type and motherboard type changed." msgstr "Varning: både skrivartyp och moderkortstyp har ändrats." #. MSG_CHANGED_MOTHERBOARD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1492 +#: ../../Firmware/Marlin_main.cpp:1493 msgid "Warning: motherboard type changed." msgstr "Varning: moderkortstyp ändrad." #. MSG_CHANGED_PRINTER c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:1496 +#: ../../Firmware/Marlin_main.cpp:1497 msgid "Warning: printer type changed." msgstr "Varning: skrivartyp ändrats." #. MSG_UNLOAD_SUCCESSFUL c=20 r=3 -#: ../../Firmware/Marlin_main.cpp:3529 +#: ../../Firmware/Marlin_main.cpp:3509 msgid "Was filament unload successful?" msgstr "Lyckades filamentutmatningen?" #. MSG_SELFTEST_WIRINGERROR c=18 -#: ../../Firmware/messages.cpp:97 ../../Firmware/ultralcd.cpp:6822 -#: ../../Firmware/ultralcd.cpp:6826 ../../Firmware/ultralcd.cpp:6846 -#: ../../Firmware/ultralcd.cpp:6852 ../../Firmware/ultralcd.cpp:6876 +#: ../../Firmware/messages.cpp:98 ../../Firmware/ultralcd.cpp:6562 +#: ../../Firmware/ultralcd.cpp:6566 ../../Firmware/ultralcd.cpp:6586 +#: ../../Firmware/ultralcd.cpp:6592 ../../Firmware/ultralcd.cpp:6616 msgid "Wiring error" msgstr "Kabelfel" #. MSG_WIZARD c=17 -#: ../../Firmware/ultralcd.cpp:4715 +#: ../../Firmware/ultralcd.cpp:4544 msgid "Wizard" msgstr "Guide" #. MSG_X_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4077 +#: ../../Firmware/ultralcd.cpp:3975 msgid "X-correct" msgstr "X-korrektion" -#. MSG_XFLASH c=18 -#: ../../Firmware/ultralcd.cpp:5462 -msgid "XFLASH init" -msgstr "XFLASH init" - #. MSG_XYZ_DETAILS c=18 -#: ../../Firmware/ultralcd.cpp:1705 +#: ../../Firmware/ultralcd.cpp:1666 msgid "XYZ cal. details" msgstr "XYZ kal. detaljer" #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_EXTREME c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3244 +#: ../../Firmware/ultralcd.cpp:3171 msgid "XYZ calibration all right. Skew will be corrected automatically." msgstr "XYZ-kalibrering ok. Skevhet kommer att korrigeras automatiskt." #. MSG_BED_SKEW_OFFSET_DETECTION_SKEW_MILD c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3241 +#: ../../Firmware/ultralcd.cpp:3168 msgid "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" msgstr "XYZ-kalibrering ok. X/Y-axlarna är mycket lite skeva. Bra jobbat!" #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_BOTH_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3222 +#: ../../Firmware/ultralcd.cpp:3149 msgid "XYZ calibration compromised. Front calibration points not reachable." msgstr "XYZ-kalibrering komprometterad. Främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3225 +#: ../../Firmware/ultralcd.cpp:3152 msgid "" "XYZ calibration compromised. Right front calibration point not reachable." msgstr "" "XYZ-kalibrering komprometterad. Främre hö kalibreringspunkter kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3204 +#: ../../Firmware/ultralcd.cpp:3131 msgid "XYZ calibration failed. Bed calibration point was not found." msgstr "XYZ-kalibrering felade. Kalibreringspunkter ej funna." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3210 +#: ../../Firmware/ultralcd.cpp:3137 msgid "XYZ calibration failed. Front calibration points not reachable." msgstr "XYZ-kalibrering felade. Främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 -#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3207 -#: ../../Firmware/ultralcd.cpp:3235 +#: ../../Firmware/messages.cpp:16 ../../Firmware/ultralcd.cpp:3134 +#: ../../Firmware/ultralcd.cpp:3162 msgid "XYZ calibration failed. Please consult the manual." msgstr "XYZ-kalibrering felade. Se bruksanvisningen." #. MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 -#: ../../Firmware/ultralcd.cpp:3213 +#: ../../Firmware/ultralcd.cpp:3140 msgid "XYZ calibration failed. Right front calibration point not reachable." msgstr "XYZ-kalibrering felade. Höger främre kalibreringspunkt kan ej nås." #. MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 -#: ../../Firmware/ultralcd.cpp:3238 +#: ../../Firmware/ultralcd.cpp:3165 msgid "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" msgstr "XYZ-kalibrering ok. X/Y-axlarna ar vinkelräta. Grattis!" #. MSG_Y_DIST_FROM_MIN c=20 -#: ../../Firmware/ultralcd.cpp:2490 +#: ../../Firmware/ultralcd.cpp:2436 msgid "Y distance from min" msgstr "Y avstånd från min" #. MSG_Y_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4078 +#: ../../Firmware/ultralcd.cpp:3976 msgid "Y-correct" msgstr "Y-korrekt" #. MSG_YES c=4 -#: ../../Firmware/messages.cpp:125 ../../Firmware/ultralcd.cpp:2226 -#: ../../Firmware/ultralcd.cpp:3066 ../../Firmware/ultralcd.cpp:4579 -#: ../../Firmware/ultralcd.cpp:4672 ../../Firmware/ultralcd.cpp:5875 +#: ../../Firmware/messages.cpp:126 ../../Firmware/ultralcd.cpp:2165 +#: ../../Firmware/ultralcd.cpp:2996 ../../Firmware/ultralcd.cpp:4413 +#: ../../Firmware/ultralcd.cpp:4501 ../../Firmware/ultralcd.cpp:5628 msgid "Yes" msgstr "Ja" #. MSG_WIZARD_QUIT c=20 r=8 -#: ../../Firmware/messages.cpp:122 ../../Firmware/ultralcd.cpp:4039 +#: ../../Firmware/messages.cpp:123 ../../Firmware/ultralcd.cpp:3939 msgid "You can always resume the Wizard from Calibration -> Wizard." msgstr "Du kan alltid återuppta guiden från Kalibrering -> Guide." #. MSG_Z_CORRECTION c=13 -#: ../../Firmware/ultralcd.cpp:4079 +#: ../../Firmware/ultralcd.cpp:3977 msgid "Z-correct" msgstr "Z-korrekt" #. MSG_Z_PROBE_NR c=14 -#: ../../Firmware/messages.cpp:156 ../../Firmware/ultralcd.cpp:5688 +#: ../../Firmware/messages.cpp:157 ../../Firmware/ultralcd.cpp:5461 msgid "Z-probe nr." msgstr "Z-sond nr." #. MSG_MEASURED_OFFSET c=20 -#: ../../Firmware/ultralcd.cpp:2560 +#: ../../Firmware/ultralcd.cpp:2506 msgid "[0;0] point offset" msgstr "[0;0] punktförskjutn" #. MSG_PRESS c=20 r=2 -#: ../../Firmware/ultralcd.cpp:2168 +#: ../../Firmware/ultralcd.cpp:2108 msgid "and press the knob" msgstr "och tryck på knapp" #. MSG_TO_LOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1819 +#: ../../Firmware/ultralcd.cpp:1776 msgid "to load filament" msgstr "att ladda filament" #. MSG_TO_UNLOAD_FIL c=20 -#: ../../Firmware/ultralcd.cpp:1823 +#: ../../Firmware/ultralcd.cpp:1780 msgid "to unload filament" msgstr "att ta bort filament" #. MSG_UNKNOWN c=13 -#: ../../Firmware/ultralcd.cpp:1672 +#: ../../Firmware/ultralcd.cpp:1633 msgid "unknown" msgstr "okänd" #. MSG_IR_UNKNOWN c=18 -#: ../../Firmware/Filament_sensor.cpp:293 ../../Firmware/messages.cpp:172 +#: ../../Firmware/Filament_sensor.cpp:282 ../../Firmware/messages.cpp:173 msgid "unknown state" msgstr "okänt stat" #. MSG_REFRESH c=18 -#: ../../Firmware/messages.cpp:82 ../../Firmware/ultralcd.cpp:5943 -#: ../../Firmware/ultralcd.cpp:5946 +#: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:5696 +#: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "🔃Uppdatera" #. MSG_MMU_POWER_FAILS c=15 -#: ../../Firmware/messages.cpp:69 ../../Firmware/ultralcd.cpp:1176 +#: ../../Firmware/messages.cpp:70 ../../Firmware/ultralcd.cpp:1145 msgid "MMU power fails" msgstr "MMU strömavbr." @@ -2509,8 +2486,8 @@ msgid "MCU UNDERVOLTAGE VCC" msgstr "MCU UNDERSPÄNN. VCC" #. MSG_MATERIAL_CHANGES c=18 -#: ../../Firmware/messages.cpp:102 ../../Firmware/ultralcd.cpp:1126 -#: ../../Firmware/ultralcd.cpp:1200 +#: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 +#: ../../Firmware/ultralcd.cpp:1169 msgid "Material changes" msgstr "Materialutbyten" @@ -2543,10 +2520,13 @@ msgstr "" "version 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 -#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 msgid "Preload to MMU" msgstr "Förladdning MMU" +#~ msgid "XFLASH init" +#~ msgstr "XFLASH init" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 0d5f515854d5baedd543b9ec5790aa1f44796ee1 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 10:05:14 +0200 Subject: [PATCH 037/148] Manual fix for ... firmware detected on ... printer --- lang/po/Firmware.pot | 8 ++++++++ lang/po/Firmware_cs.po | 14 ++++++++------ lang/po/Firmware_de.po | 14 ++++++++------ lang/po/Firmware_es.po | 14 ++++++++------ lang/po/Firmware_fr.po | 14 ++++++++------ lang/po/Firmware_hr.po | 14 ++++++++------ lang/po/Firmware_hu.po | 14 ++++++++------ lang/po/Firmware_it.po | 14 ++++++++------ lang/po/Firmware_nl.po | 14 ++++++++------ lang/po/Firmware_no.po | 14 ++++++++------ lang/po/Firmware_pl.po | 14 ++++++++------ lang/po/Firmware_ro.po | 14 ++++++++------ lang/po/Firmware_sk.po | 14 ++++++++------ lang/po/Firmware_sv.po | 14 ++++++++------ 14 files changed, 112 insertions(+), 78 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 3ff03a9a9..06d532d15 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -2417,3 +2417,11 @@ msgstr "" #: ../../Firmware/ultralcd.cpp:5699 msgid "🔃Refresh" msgstr "" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "" + +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index a7f4d74bf..26be95397 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2512,6 +2512,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Zavést do MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 firmware detekovan na MK3S tiskarne" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware detekovan na tiskarne MK3" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2571,12 +2579,6 @@ msgstr "Zavést do MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Kal. prvni vrstvy" -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3 firmware detekovan na MK3S tiskarne" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S firmware detekovan na tiskarne MK3" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Pokracuji v tisku..." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 9290c681d..9d0decb8a 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2540,6 +2540,14 @@ msgstr "" msgid "Preload to MMU" msgstr "In MMU laden" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3-Firmware am MK3S-Drucker erkannt" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-Firmware auf MK3-Drucker erkannt" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2598,12 +2606,6 @@ msgstr "In MMU laden" #~ msgid "M117 First layer cal." #~ msgstr "M117 Erste-Schicht Kal." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3-Firmware am MK3S-Drucker erkannt" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S-Firmware auf MK3-Drucker erkannt" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Position wiederherstellen..." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 70018d08d..437ec7eea 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2536,6 +2536,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Precarga a MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detectado en impresora MK3S" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detectado en impresora MK3" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2592,12 +2600,6 @@ msgstr "Precarga a MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Cal. primera cap." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "Firmware MK3 detectado en impresora MK3S" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "Firmware MK3S detectado en impresora MK3" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Restaurando posicion..." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 10c9eef09..1f54cd7d8 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2550,6 +2550,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Précharge à MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detecte sur imprimante MK3S" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detecte sur imprimante MK3" + #~ msgid "XFLASH init" #~ msgstr "Init XFLASH" @@ -2606,12 +2614,6 @@ msgstr "Précharge à MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Cal. 1ere couche" -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "Firmware MK3 detecte sur imprimante MK3S" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "Firmware MK3S detecte sur imprimante MK3" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Reprise de la position ..." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 7d33ca494..bdb9f5bbc 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2529,6 +2529,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Predpunjenje MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 firmware otkriven na MK3S printeru" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware detektiran na MK3 printeru" + #~ msgid "XFLASH init" #~ msgstr "XFLASH validacija" @@ -2585,12 +2593,6 @@ msgstr "Predpunjenje MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Prvi sloj kal." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3 firmware otkriven na MK3S printeru" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S firmware detektiran na MK3 printeru" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Nastavak pozicije..." diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index e01dd96b9..6be5aacf9 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2533,6 +2533,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Betöltés az MMUba" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 firmver telepitve MK3S nyomtatora" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmver eszlelve MK3 nyomtaton" + #~ msgid "XFLASH init" #~ msgstr "XFLASH inicializal" @@ -2587,12 +2595,6 @@ msgstr "Betöltés az MMUba" #~ msgid "M117 First layer cal." #~ msgstr "M117. Elso reteg kalibr." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3 firmver telepitve MK3S nyomtatora" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S firmver eszlelve MK3 nyomtaton" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Pozicio visszaallitasa..." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index df38deb02..06641d999 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2534,6 +2534,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Precarica MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 rilevato su stampante MK3S" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S rilevato su stampante MK3" + #~ msgid "XFLASH init" #~ msgstr "Inizializza XFLASH" @@ -2589,12 +2597,6 @@ msgstr "Precarica MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Calibr. primo strato" -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "Firmware MK3 rilevato su stampante MK3S" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "Firmware MK3S rilevato su stampante MK3" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. riprendendo la posizione..." diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 393de3378..ae56cf5f2 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2538,6 +2538,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Voorladen in MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3-firmware bij MK3S-printer gedetecteerd" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-firmware op MK3-printer ontdekt" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2594,12 +2602,6 @@ msgstr "Voorladen in MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Eerste laag kal." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3-firmware bij MK3S-printer gedetecteerd" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S-firmware op MK3-printer ontdekt" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Positie hervatten..." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index df19df39c..29cb403d9 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2511,6 +2511,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Forlast til MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 system funnet på MK3S printer" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S systemvare funnet på MK3 printer" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2566,12 +2574,6 @@ msgstr "Forlast til MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Førstelagskal." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3 system funnet på MK3S printer" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S systemvare funnet på MK3 printer" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Gjenopptar posisjon..." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 9ed3e6b5b..30a09b098 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2530,6 +2530,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Załaduj do MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Wykryto firmware MK3 w drukarce MK3S" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Wykryto firmware MK3S w drukarce MK3" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2585,12 +2593,6 @@ msgstr "Załaduj do MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Kal. 1. warstwy" -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "Wykryto firmware MK3 w drukarce MK3S" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "Wykryto firmware MK3S w drukarce MK3" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Wznawianie pozycji." diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 27d0fa3d1..3fff96201 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2534,6 +2534,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Preîncărcare MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "Firmware MK3 detectat pe imprimanta MK3S" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "Firmware MK3S detectat pe imprimanta MK3" + #~ msgid "XFLASH init" #~ msgstr "Init XFLASH" @@ -2589,12 +2597,6 @@ msgstr "Preîncărcare MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Cal. first layer" -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "Firmware MK3 detectat pe imprimanta MK3S" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "Firmware MK3S detectat pe imprimanta MK3" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Se reia pozitia..." diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 531ca0481..dc2ccf23f 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2517,6 +2517,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Predzásobenie MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3 firmware na MK3S tlaciarni" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S firmware na MK3 tlaciarni" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2572,12 +2580,6 @@ msgstr "Predzásobenie MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Kal. prvej vrstvy" -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3 firmware na MK3S tlaciarni" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S firmware na MK3 tlaciarni" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Pokracujem v tlaci..." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 18b09d739..8853fc8bb 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2524,6 +2524,14 @@ msgstr "" msgid "Preload to MMU" msgstr "Förladdning MMU" +#. MSG_FW_MK3_DETECTED c=20 r=4 +msgid "MK3 firmware detected on MK3S printer" +msgstr "MK3-firmware upptäckt på MK3S-skrivare" + +#. MSG_FW_MK3S_DETECTED c=20 r=4 +msgid "MK3S firmware detected on MK3 printer" +msgstr "MK3S-firmware upptäckt på MK3-skrivare" + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" @@ -2578,12 +2586,6 @@ msgstr "Förladdning MMU" #~ msgid "M117 First layer cal." #~ msgstr "M117 Först lager kalibr." -#~ msgid "MK3 firmware detected on MK3S printer" -#~ msgstr "MK3-firmware upptäckt på MK3S-skrivare" - -#~ msgid "MK3S firmware detected on MK3 printer" -#~ msgstr "MK3S-firmware upptäckt på MK3-skrivare" - #~ msgid "MMU OK. Resuming position..." #~ msgstr "MMU OK. Återupptar position..." From cea2a070452303d776c59b89caa90b54d1054029 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 10:07:52 +0200 Subject: [PATCH 038/148] Bump up build number --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 1ea8c4e91..bb817d9ce 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -24,7 +24,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6565 +#define FW_COMMIT_NR 6842 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. From 8078c8eff207b8872d669be97542f6bd48314096 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 26 May 2023 11:06:39 +0200 Subject: [PATCH 039/148] Fix format and bump up build number --- Firmware/Configuration.h | 2 +- Firmware/variants/README.md | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index bb817d9ce..7717cd60c 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -24,7 +24,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6842 +#define FW_COMMIT_NR 6851 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. diff --git a/Firmware/variants/README.md b/Firmware/variants/README.md index 0c7607510..dfaa48d9d 100644 --- a/Firmware/variants/README.md +++ b/Firmware/variants/README.md @@ -10,12 +10,12 @@ There are other 3rd party hotends which the community uses. Steps to add a new 3rd party hotend: 1. Make a copy of the `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3Dv6full.h` with a new name `1_75mm_MK3S-EINSy10a-<3rd party hotend:16>.h` - a. Example for the E3D REVO HF 60W: `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h` + - Example for the E3D REVO HF 60W: `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h` 2. Open the new variant file. 3. Add the 3rd party hotend with new number and the description in the comment part `#define HOTEND 1 //1= E3Dv6 2= E3D REVO` - a. Example: `#define HOTEND 3 //1= E3Dv6 2= E3D REVO 3= E3DREVO_HF_60W` + - Example: `#define HOTEND 3 //1= E3Dv6 2= E3D REVO 3= E3DREVO_HF_60W` 4. Add a new `#elif HOTEND == ` and `#define NOZZLE_TYPE "<3rd party hotend:16>"` - a.Example + - Example ``` ... #elif HOTEND ==2 @@ -26,10 +26,10 @@ Steps to add a new 3rd party hotend: ... ``` 5. Change the `#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-` - a. `CUSTOM_MENDEL_NAME` string cannot exceed 17 chars in total! + - `CUSTOM_MENDEL_NAME` string cannot exceed 17 chars in total! 6. Add new PID values for the new Hotend type. - a. Search for `#else // E3D v6 PID values` - b. Copy, paste (above `#else // E3D v6 PID values`) and update the new hotend PID default values + - Search for `#else // E3D v6 PID values` + - Copy, paste (above `#else // E3D v6 PID values`) and update the new hotend PID default values ``` #elif HOTEND == 2 //E3D REVO PID values #define DEFAULT_Kp 16.13 @@ -51,8 +51,8 @@ Example: ... ``` 7. Prepare for new 3rd party hotend TM value file - a. Search for `#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters` or the last entry - b. Copy the lines starting with `#elif HOTEND == 2` till the search, paste (above next `#endif`) and update this + - Search for `#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters` or the last entry + - Copy the lines starting with `#elif HOTEND == 2` till the search, paste (above next `#endif`) and update this ``` ... #if HOTEND == 1 @@ -82,10 +82,10 @@ Example: ``` 8. Save and close the new variant file 9. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h` - a. Example: `Firmware/temp_model/e3d_REVO_HF_60W.h` + - Example: `Firmware/temp_model/e3d_REVO_HF_60W.h` 10. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h` 11. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT` - a. Example + - Example ``` #pragma once From 3da1ae134428647c5242a1e84f954741237fd1d0 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 29 May 2023 10:22:17 +0200 Subject: [PATCH 040/148] Change new hotend variants --- Firmware/Configuration.h | 2 +- .../variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 30 ++----- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 19 +---- .../variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 28 ++----- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 19 +---- Firmware/variants/README.md | 82 ++++++++++--------- 6 files changed, 62 insertions(+), 118 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 7717cd60c..710549a7b 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -24,7 +24,7 @@ extern const char _sPrinterMmuName[] PROGMEM; #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #endif -#define FW_COMMIT_NR 6851 +#define FW_COMMIT_NR 6853 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index ff171105a..afed016eb 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -15,12 +15,7 @@ #define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define FILAMENT_SIZE "1_75mm_MK3" -#define HOTEND 2 //1= E3Dv6 2= E3D REVO -#if HOTEND == 1 -#define NOZZLE_TYPE "E3Dv6full" -#elif HOTEND ==2 #define NOZZLE_TYPE "E3DREVO" -#endif // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3-R" @@ -331,18 +326,11 @@ #define DEFAULT_Kp 21.70 #define DEFAULT_Ki 1.60 #define DEFAULT_Kd 73.76 -#elif HOTEND == 2 //E3D REVO PID values -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 -#else // E3D v6 PID values -// Define PID constants for extruder -//#define DEFAULT_Kp 40.925 -//#define DEFAULT_Ki 4.875 -//#define DEFAULT_Kd 86.085 -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 +#else +// Define PID constants for E3D REVO +#define DEFAULT_Kp 25.00 +#define DEFAULT_Ki 4.8 +#define DEFAULT_Kd 32.6 #endif // Extrude mintemp @@ -413,13 +401,9 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction -#if HOTEND == 1 -#include "temp_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters -#elif HOTEND == 2 #include "temp_model/e3d_REVO.h" #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters -#endif + /*------------------------------------ MOTOR CURRENT SETTINGS @@ -648,7 +632,7 @@ // we just need to shift to the nearest fullstep, but we need a move which is at least // "dropsegments" steps long. All the above rules still need to apply. #define UVLO_TINY_Z_AXIS_SHIFT 0.16 -// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. +// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. #define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5 #define HEATBED_V2 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 57d581b33..21adab2d1 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -15,12 +15,7 @@ #define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 #define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME #define FILAMENT_SIZE "1_75mm_MK3" -#define HOTEND 1 //1= E3Dv6 2= E3D REVO -#if HOTEND == 1 #define NOZZLE_TYPE "E3Dv6full" -#elif HOTEND ==2 -#define NOZZLE_TYPE "E3DREVO" -#endif // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3" @@ -331,11 +326,7 @@ #define DEFAULT_Kp 21.70 #define DEFAULT_Ki 1.60 #define DEFAULT_Kd 73.76 -#elif HOTEND == 2 //E3D REVO PID values -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 -#else // E3D v6 PID values +#else // Define PID constants for extruder //#define DEFAULT_Kp 40.925 //#define DEFAULT_Ki 4.875 @@ -413,13 +404,9 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction -#if HOTEND == 1 #include "temp_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters -#elif HOTEND == 2 -#include "temp_model/e3d_REVO.h" -#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters -#endif +#define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters + /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index 9d5d0128e..4638cb3fc 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -14,12 +14,7 @@ #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define FILAMENT_SIZE "1_75mm_MK3S" -#define HOTEND 2 //1= E3Dv6 2= E3D REVO -#if HOTEND == 1 -#define NOZZLE_TYPE "E3Dv6full" -#elif HOTEND ==2 #define NOZZLE_TYPE "E3DREVO" -#endif // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-R" @@ -333,18 +328,11 @@ #define DEFAULT_Kp 21.70 #define DEFAULT_Ki 1.60 #define DEFAULT_Kd 73.76 -#elif HOTEND == 2 //E3D REVO PID values -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 -#else // E3D v6 PID values -// Define PID constants for extruder -//#define DEFAULT_Kp 40.925 -//#define DEFAULT_Ki 4.875 -//#define DEFAULT_Kd 86.085 -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 +#else +// Define PID constants for E3D REVO +#define DEFAULT_Kp 25.00 +#define DEFAULT_Ki 4.8 +#define DEFAULT_Kd 32.6 #endif // Extrude mintemp @@ -417,13 +405,9 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction -#if HOTEND == 1 -#include "temp_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters -#elif HOTEND == 2 #include "temp_model/e3d_REVO.h" #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters -#endif + /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 3be525327..ee7550acd 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -14,12 +14,7 @@ #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 #define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME #define FILAMENT_SIZE "1_75mm_MK3S" -#define HOTEND 1 //1= E3Dv6 2= E3D REVO -#if HOTEND == 1 #define NOZZLE_TYPE "E3Dv6full" -#elif HOTEND ==2 -#define NOZZLE_TYPE "E3DREVO" -#endif // Printer name #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S" @@ -333,11 +328,7 @@ #define DEFAULT_Kp 21.70 #define DEFAULT_Ki 1.60 #define DEFAULT_Kd 73.76 -#elif HOTEND == 2 //E3D REVO PID values -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 -#else // E3D v6 PID values +#else // Define PID constants for extruder //#define DEFAULT_Kp 40.925 //#define DEFAULT_Ki 4.875 @@ -417,13 +408,9 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction -#if HOTEND == 1 #include "temp_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters -#elif HOTEND == 2 -#include "temp_model/e3d_REVO.h" -#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters -#endif +#define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters + /*------------------------------------ MOTOR CURRENT SETTINGS diff --git a/Firmware/variants/README.md b/Firmware/variants/README.md index dfaa48d9d..6bb981304 100644 --- a/Firmware/variants/README.md +++ b/Firmware/variants/README.md @@ -12,86 +12,88 @@ Steps to add a new 3rd party hotend: 1. Make a copy of the `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3Dv6full.h` with a new name `1_75mm_MK3S-EINSy10a-<3rd party hotend:16>.h` - Example for the E3D REVO HF 60W: `/Firmware/variant/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h` 2. Open the new variant file. -3. Add the 3rd party hotend with new number and the description in the comment part `#define HOTEND 1 //1= E3Dv6 2= E3D REVO` - - Example: `#define HOTEND 3 //1= E3Dv6 2= E3D REVO 3= E3DREVO_HF_60W` -4. Add a new `#elif HOTEND == ` and `#define NOZZLE_TYPE "<3rd party hotend:16>"` +3. Search for `#define NOZZLE_TYPE` +4. Change `"E3Dv6full"` to `"<3rd party hotend:16>"` + ``` + ... + #define NOZZLE_TYPE "E3Dv6full" + ... + ``` - Example ``` ... - #elif HOTEND ==2 - #define NOZZLE_TYPE "E3DREVO" - #elif HOTEND ==3 #define NOZZLE_TYPE "E3DREVO_HF_60W" - #endif ... ``` -5. Change the `#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-` - - `CUSTOM_MENDEL_NAME` string cannot exceed 17 chars in total! -6. Add new PID values for the new Hotend type. - - Search for `#else // E3D v6 PID values` - - Copy, paste (above `#else // E3D v6 PID values`) and update the new hotend PID default values +5. Search `#define CUSTOM_MENDEL_NAME` +6. Change `"Prusa i3 MK3S"` to `"Prusa i3 MK3S-"` + - `CUSTOM_MENDEL_NAME` string cannot exceed 16 chars in total! ``` - #elif HOTEND == 2 //E3D REVO PID values + ... + #define CUSTOM_MENDEL_NAME "Prusa i3 MK3S" + ... + ``` + - Example + ``` + ... +#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-RH" + ... + ``` + ``` + ... +#define CUSTOM_MENDEL_NAME "Prusa MK3S-RHF60" + ... + ``` +7. Add new PID values for the new Hotend type. + - Search for `// Define PID constants for extruder` + - Change `extruder` to new hotend name ` <3rd party hotend:16>` and update the new hotend PID default values + ``` + // Define PID constants for extruder #define DEFAULT_Kp 16.13 #define DEFAULT_Ki 1.1625 #define DEFAULT_Kd 56.23 + #endif ``` Example: ``` ... - #elif HOTEND == 2 //E3D REVO PID values - #define DEFAULT_Kp 16.13 - #define DEFAULT_Ki 1.1625 - #define DEFAULT_Kd 56.23 - #elif HOTEND == 3 //E3D REVO HF 60W PID values + // Define PID constants for E3D REVO HF 60W #define DEFAULT_Kp 23.23 #define DEFAULT_Ki 1.1 #define DEFAULT_Kd 55.25 - #else // E3D v6 PID values + #endif ... ``` -7. Prepare for new 3rd party hotend TM value file - - Search for `#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters` or the last entry - - Copy the lines starting with `#elif HOTEND == 2` till the search, paste (above next `#endif`) and update this +8. Prepare for new 3rd party hotend TM value file + - Search for `#include "temp_model/e3d_v6.h"` + - Change the `e3d_v6.h` to `<3rd party hotend:16>.h` + - Change below the `E3D_V6` to `<3rd party hotend:16>` ``` ... - #if HOTEND == 1 #include "temp_model/e3d_v6.h" #define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters - #elif HOTEND == 2 - #include "temp_model/e3d_REVO.h" - #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters - #endif ... ``` Example: ``` ... - #if HOTEND == 1 - #include "temp_model/e3d_v6.h" - #define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters - #elif HOTEND == 2 - #include "temp_model/e3d_REVO.h" - #define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters - #elif HOTEND == 3 #include "temp_model/e3d_REVO_HF_60W.h" #define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters - #endif ... ``` -8. Save and close the new variant file -9. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h` +9. Save and close the new variant file +10. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h` - Example: `Firmware/temp_model/e3d_REVO_HF_60W.h` -10. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h` -11. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT` +11. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h` +12. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT` - Example ``` #pragma once #define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version - #define TEMP_MODEL_E3D_REVO_HF_60W_P 40. // heater power (W) + #define TEMP_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W) #define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) #define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) From b0a72f42f146c8e6810490563dab2bbb01632af6 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 30 May 2023 15:54:53 +0200 Subject: [PATCH 041/148] Fix build nr. --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 710549a7b..64df08067 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -39,7 +39,7 @@ extern const char _sPrinterMmuName[] PROGMEM; // The debug build may be a bit slower than the non-debug build, therefore the debug build should // not be shipped to a customer. #define FW_VERSION_DEBUG 6 -// This is a development build. A development build is either built from an unofficial git repository, +// This is a development build. A development build is either built from an unofficial git repository, // or from an unofficial branch, or it does not have a label set. Only the build server should set this build type. #define FW_VERSION_DEVEL 5 // This is an alpha release. Only the build server should set this build type. From bf8fd7ed9051cf794295878575451382c8fa1834 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 7 Jun 2023 12:50:56 +0200 Subject: [PATCH 042/148] Add max_overshoot_pi_autotune value Prepare for REVO 60W --- Firmware/temperature.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 7672d7f2e..4185b31eb 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -390,7 +390,10 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle } } } - if(input > (temp + 20)) { + #ifndef MAX_OVERSHOOT_PID_AUTOTUNE + #define MAX_OVERSHOOT_PID_AUTOTUNE 20 + #endif + if(input > (temp + MAX_OVERSHOOT_PID_AUTOTUNE)) { SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high"); pid_tuning_finished = true; pid_cycle = 0; From a2308aea8b884225d10fb938eb4c26bcb514e3d9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 15 Jun 2023 15:26:12 +0200 Subject: [PATCH 043/148] Update E3DREVO High Flow 60W --- .github/travis/legacy-build.sh | 4 + Firmware/temp_model/e3d_REVO_HF_60W.h | 19 + .../1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h | 669 +++++++++++++++++ .../1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h | 681 ++++++++++++++++++ 4 files changed, 1373 insertions(+) create mode 100644 Firmware/temp_model/e3d_REVO_HF_60W.h create mode 100644 Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h create mode 100644 Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h diff --git a/.github/travis/legacy-build.sh b/.github/travis/legacy-build.sh index d25c70b4a..2368fc298 100755 --- a/.github/travis/legacy-build.sh +++ b/.github/travis/legacy-build.sh @@ -23,4 +23,8 @@ cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h Firmware/Configuration_prusa bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO variant failed" && false; } cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO variant failed" && false; } +cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W variant failed" && false; } +cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h +bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO_HF_60W variant failed" && false; } rm Firmware/Configuration_prusa.h diff --git a/Firmware/temp_model/e3d_REVO_HF_60W.h b/Firmware/temp_model/e3d_REVO_HF_60W.h new file mode 100644 index 000000000..05044413e --- /dev/null +++ b/Firmware/temp_model/e3d_REVO_HF_60W.h @@ -0,0 +1,19 @@ +#pragma once + +#define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version + +#define TEMP_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W) +#define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) +#define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) + +#define TEMP_MODEL_E3D_REVO_HF_60W_C 9.10 // initial guess for heatblock capacitance (J/K) +#define TEMP_MODEL_E3D_REVO_HF_60W_R 30.6 // initial guess for heatblock resistance (K/W) + +#define TEMP_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) +#define TEMP_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) + +#define TEMP_MODEL_E3D_REVO_HF_60W_W 0.75 // Default warning threshold (K/s) +#define TEMP_MODEL_E3D_REVO_HF_60W_E 0.90 // Default error threshold (K/s) + +// fall-back resistance vector (R0-15) +#define TEMP_MODEL_E3D_REVO_HF_60W_Rv {TEMP_MODEL_E3D_REVO_HF_60W_R, 29.0, 27.5, 24.5, 23.4, 22.3, 21.2, 20.2, 19.8, 19.4, 19.0, 18.6, 18.3, 18.1, 17.9, 17.7} diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h new file mode 100644 index 000000000..273c5bb19 --- /dev/null +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h @@ -0,0 +1,669 @@ +#ifndef CONFIGURATION_PRUSA_H +#define CONFIGURATION_PRUSA_H + +#include + +#include "printers.h" +/*------------------------------------ + GENERAL SETTINGS + *------------------------------------*/ + +// Printer revision +#define PRINTER_TYPE PRINTER_MK3 +#define PRINTER_NAME PRINTER_MK3_NAME +#define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define FILAMENT_SIZE "1_75mm_MK3" +#define NOZZLE_TYPE "E3DREVO_HF_60W" + +// Printer name +#define CUSTOM_MENDEL_NAME "Prusa MK3-RHF60" + +// Electronics +#define MOTHERBOARD BOARD_EINSY_1_0a +#define STEEL_SHEET +#define HAS_SECOND_SERIAL_PORT + + +// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) +//#define E3D_PT100_EXTRUDER_WITH_AMP +//#define E3D_PT100_EXTRUDER_NO_AMP +//#define E3D_PT100_BED_WITH_AMP +//#define E3D_PT100_BED_NO_AMP + + +/*------------------------------------ + AXIS SETTINGS + *------------------------------------*/ + +// Steps per unit {X,Y,Z,E} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} + +// Endstop inverting +#define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. + +// Direction inverting +#define INVERT_X_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 +#define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 + +// Home position +#define MANUAL_X_HOME_POS 0 +#define MANUAL_Y_HOME_POS -2.2 +#define MANUAL_Z_HOME_POS 0.2 + +// Travel limits after homing +#define X_MAX_POS 255 +#define X_MIN_POS 0 +#define Y_MAX_POS 212.5 +#define Y_MIN_POS -4 //orig -4 +#define Z_MAX_POS 210 +#define Z_MIN_POS 0.15 + +// Canceled home position +#define X_CANCEL_POS 50 +#define Y_CANCEL_POS 190 +#define Z_CANCEL_LIFT 50 + +//Pause print position +#define X_PAUSE_POS 50 +#define Y_PAUSE_POS 190 +#define Z_PAUSE_LIFT 20 + +#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E +#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) // 3000 is also valid for stallGuard homing. Valid range: 2200 - 3000 + +//#define DEFAULT_Y_OFFSET 4.f // Default distance of Y_MIN_POS point from endstop, when the printer is not calibrated. +/** + * [0,0] steel sheet print area point X coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_X 0.f +/** + * [0,0] steel sheet print area point Y coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_Y -2.f + +#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) +#define DEFAULT_MAX_FEEDRATE_SILENT {100, 100, 12, 120} // (mm/sec) max feedrate (M203), silent mode + +#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_ACCELERATION_SILENT {960, 960, 200, 5000} // (mm/sec^2) max acceleration (M201), silent mode + + +#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204P) +#define DEFAULT_RETRACT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for retracts (M204R) +#define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for travels (M204T) + +#define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) + +//Silent mode limits +#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_FEEDRATE_XY 100 // max feedrate in mm/s + +//Normal mode limits +#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2 +#define NORMAL_MAX_FEEDRATE_XY 200 // max feedrate in mm/s + +//number of bytes from end of the file to start check +#define END_FILE_SECTION 20000 + +#define Z_AXIS_ALWAYS_ON 1 + +//Crash detection +#define CRASHDET_TIMER 45 //seconds +#define CRASHDET_COUNTER_MAX 3 + +// New XYZ calibration +#define NEW_XYZCAL + +// Watchdog support +#define WATCHDOG + +// Power panic +#define UVLO_SUPPORT + +// Fan check +#define FANCHECK + +// Safety timer +#define SAFETYTIMER +#define DEFAULT_SAFETYTIMER_TIME_MINS 30 + +// Offline crash dumper +#define XFLASH_DUMP // enable dump functionality (including D20/D21/D22) +#define MENU_DUMP // enable "Memory dump" in Settings menu +#define EMERGENCY_DUMP // trigger crash on stack corruption and WDR + +// Online crash dumper +//#define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR +//#define MENU_SERIAL_DUMP // Enable "Memory dump" in Settings menu + +// Filament sensor +#define FILAMENT_SENSOR +#define FILAMENT_SENSOR_TYPE FSENSOR_PAT9125 +#define FSENSOR_PROBING + +// Backlash - +//#define BACKLASH_X +//#define BACKLASH_Y + + +// Minimum ambient temperature limit to start triggering MINTEMP errors [C] +// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it, +// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle +// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater) +#define MINTEMP_MINAMBIENT 10 +#define MINTEMP_MINAMBIENT_RAW 1002 + +#define DEBUG_DCODE2 +#define DEBUG_DCODE3 +#define DEBUG_DCODE6 + +//#define DEBUG_PULLUP_CRASH //Test Pullup crash + +//#define DEBUG_BUILD +//#define DEBUG_SEC_LANG //secondary language debug output at startup +//#define DEBUG_XFLASH //debug external spi flash +#ifdef DEBUG_BUILD +//#define _NO_ASM +#define DEBUG_DCODES //D codes +#define DEBUG_STACK_MONITOR //Stack monitor in stepper ISR +//#define DEBUG_CRASHDET_COUNTERS //Display crash-detection counters on LCD +//#define DEBUG_RESUME_PRINT //Resume/save print debug enable +//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output +//#define DEBUG_DISABLE_XMINLIMIT //x min limit ignored +//#define DEBUG_DISABLE_XMAXLIMIT //x max limit ignored +//#define DEBUG_DISABLE_YMINLIMIT //y min limit ignored +//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored +//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored +//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored +#define DEBUG_DISABLE_STARTMSGS //no startup messages +//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored +//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored +//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line +//#define DEBUG_DISABLE_PREVENT_EXTRUDER //cold extrusion and long extrusion allowed +//#define DEBUG_DISABLE_FORCE_SELFTEST //disable force selftest +//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3) +//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3) +//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) +//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) +#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line +#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. +#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. +#define CMD_DIAGNOSTICS //Show cmd queue length on printer display +#endif /* DEBUG_BUILD */ + + +#define LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION_XYZ +#define TMC2130_VARIABLE_RESOLUTION + + + +/*------------------------------------ + TMC2130 default settings + *------------------------------------*/ + +#define TMC2130_FCLK 12000000 // fclk = 12MHz + +#define TMC2130_USTEPS_XY 16 // microstep resolution for XY axes +#define TMC2130_USTEPS_Z 16 // microstep resolution for Z axis +#define TMC2130_USTEPS_E 32 // microstep resolution for E axis +#define TMC2130_INTPOL_XY 1 // extrapolate 256 for XY axes +#define TMC2130_INTPOL_Z 1 // extrapolate 256 for Z axis +#define TMC2130_INTPOL_E 1 // extrapolate 256 for E axis +// #define ALLOW_ALL_MRES + +#define TMC2130_PWM_GRAD_X 2 // PWMCONF +#define TMC2130_PWM_AMPL_X 230 // PWMCONF +#define TMC2130_PWM_AUTO_X 1 // PWMCONF +#define TMC2130_PWM_FREQ_X 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Y 2 // PWMCONF +#define TMC2130_PWM_AMPL_Y 235 // PWMCONF +#define TMC2130_PWM_AUTO_Y 1 // PWMCONF +#define TMC2130_PWM_FREQ_Y 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Z 4 // PWMCONF +#define TMC2130_PWM_AMPL_Z 200 // PWMCONF +#define TMC2130_PWM_AUTO_Z 1 // PWMCONF +#define TMC2130_PWM_FREQ_Z 2 // PWMCONF + +#define TMC2130_PWM_GRAD_E 4 // PWMCONF +#define TMC2130_PWM_AMPL_E 240 // PWMCONF +#define TMC2130_PWM_AUTO_E 1 // PWMCONF +#define TMC2130_PWM_FREQ_E 2 // PWMCONF + +// experimental setting for E-motor cooler operation +#define TMC2130_PWM_GRAD_Ecool 84 // PWMCONF 730mA @ 375mm/min 970mA phase peak at feedrate 900mm/min +#define TMC2130_PWM_AMPL_Ecool 43 // PWMCONF 500mA phase peak at feedrate 10 mm/min +#define TMC2130_PWM_AUTO_Ecool 0 // PWMCONF + +#define TMC2130_TOFF_XYZ 3 // CHOPCONF // fchop = 27.778kHz +#define TMC2130_TOFF_E 3 // CHOPCONF // fchop = 27.778kHz +//#define TMC2130_TOFF_E 4 // CHOPCONF // fchop = 21.429kHz +//#define TMC2130_TOFF_E 5 // CHOPCONF // fchop = 17.442kHz + +//#define TMC2130_STEALTH_E // Extruder stealthChop mode +//#define TMC2130_CNSTOFF_E // Extruder constant-off-time mode (similar to MK2) + +//#define TMC2130_PWM_DIV 683 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_DIV 512 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_CLK (2 * TMC2130_FCLK / TMC2130_PWM_DIV) // PWM frequency (23.4kHz, 35.1kHz, 46.9kHz, 58.5kHz for 12MHz fclk) + +#define TMC2130_TPWMTHRS 0 // TPWMTHRS - Sets the switching speed threshold based on TSTEP from stealthChop to spreadCycle mode +#define TMC2130_TPWMTHRS_E 403 // Switch extruder from StealthChop to SpreadCycle at around 900mm/min +#define TMC2130_THIGH 0 // THIGH - unused + +//#define TMC2130_TCOOLTHRS_X 450 // TCOOLTHRS - coolstep treshold +//#define TMC2130_TCOOLTHRS_Y 450 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_X 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Y 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Z 500 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_E 500 // TCOOLTHRS - coolstep treshold + +#define TMC2130_SG_HOMING 1 // stallguard homing +#define TMC2130_SG_THRS_X 3 // stallguard sensitivity for X axis +#define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis +#define TMC2130_SG_THRS_Z 4 // stallguard sensitivity for Z axis +#define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis +#define TMC2130_SG_THRS_HOME {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E} + +//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) +#define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes +#define TMC2130_CURRENTS_FARM 36 // E 805 mA peak for ECool/farm mode +#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_STEALTH_Z +#define TMC2130_DEDGE_STEPPING + +//#define TMC2130_SERVICE_CODES_M910_M918 + +//#define TMC2130_DEBUG +//#define TMC2130_DEBUG_WR +//#define TMC2130_DEBUG_RD + + +/*------------------------------------ + EXTRUDER SETTINGS + *------------------------------------*/ + +// Mintemps +#define HEATER_0_MINTEMP 10 +#define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if HEATER_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" +#endif +#define BED_MINTEMP 10 +#define BED_MINTEMP_DELAY 50000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if BED_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" +#endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP 10 +//#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) +#define HEATER_0_MAXTEMP 410 +#else +#define HEATER_0_MAXTEMP 305 +#endif +#define BED_MAXTEMP 125 +#define AMBIENT_MAXTEMP 100 + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_Kp 21.70 +#define DEFAULT_Ki 1.60 +#define DEFAULT_Kd 73.76 +#else +// Define PID constants for E3D REVO HF 60W +#define MAX_OVERSHOOT_PID_AUTOTUNE 30 +#define DEFAULT_Kp 15.00 +#define DEFAULT_Ki 2.9 +#define DEFAULT_Kd 19.2 +#endif + +// Extrude mintemp +#define EXTRUDE_MINTEMP 175 + +// Extruder cooling fans +#define EXTRUDER_0_AUTO_FAN_PIN 8 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed + +#define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically +#define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan + +/*------------------------------------ + CHANGE FILAMENT SETTINGS + *------------------------------------*/ + +// Filament change configuration +#define FILAMENTCHANGEENABLE +#ifdef FILAMENTCHANGEENABLE +#define FILAMENTCHANGE_XPOS 211 +#define FILAMENTCHANGE_YPOS 0 +#define FILAMENTCHANGE_ZADD 2 +#define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 + +#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) +#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) +#define FILAMENTCHANGE_RECFEED 5 + +#define FILAMENTCHANGE_XYFEED 50 +#define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600) +#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701) +//#define FILAMENTCHANGE_RFEED 400 +#define FILAMENTCHANGE_RFEED 7000 / 60 +#define FILAMENTCHANGE_EXFEED 2 +#define FILAMENTCHANGE_ZFEED 15 + +#endif + +/*------------------------------------ + ADDITIONAL FEATURES SETTINGS + *------------------------------------*/ + +// temperature runaway +#define TEMP_RUNAWAY_BED_HYSTERESIS 5 +#define TEMP_RUNAWAY_BED_TIMEOUT 360 + +#define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 +#define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 + +// model-based temperature check +#define TEMP_MODEL 1 // enable model-based temperature checks +#define TEMP_MODEL_DEBUG 1 // extended runtime logging + +#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit +#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit +#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit + +#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit +#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit +#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit + +#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) + +#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction + +#include "temp_model/e3d_REVO_HF_60W.h" +#define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters + + +/*------------------------------------ + MOTOR CURRENT SETTINGS + *------------------------------------*/ + +// Motor Current settings for Einsy/tmc = 0..63 +#define MOTOR_CURRENT_PWM_RANGE 63 + +/*------------------------------------ + BED SETTINGS + *------------------------------------*/ + +// Define Mesh Bed Leveling system to enable it +#define MESH_BED_LEVELING +#ifdef MESH_BED_LEVELING + +#define MBL_Z_STEP 0.01 + +// Mesh definitions +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 +#define MESH_MIN_Y 6 +#define MESH_MAX_Y 210 + +// Mesh upsample definition +#define MESH_NUM_X_POINTS 7 +#define MESH_NUM_Y_POINTS 7 +// Mesh measure definition +#define MESH_MEAS_NUM_X_POINTS 3 +#define MESH_MEAS_NUM_Y_POINTS 3 + +// Maximum bed level correction value +#define BED_ADJUSTMENT_UM_MAX 100 + +#define MESH_HOME_Z_CALIB 0.2 +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. + +#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right +#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind +#define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) +#endif + +// Bed Temperature Control +// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis +// +// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. +// If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz, +// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. +// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. +// If your configuration is significantly different than this and you don't understand the issues involved, you probably +// shouldn't use bed PID until someone else verifies your hardware works. +// If this is enabled, find your own PID constants below. +#define PIDTEMPBED +// +//#define BED_LIMIT_SWITCHING + +// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. +// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) +// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, +// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +// Bed temperature compensation settings +#define BED_OFFSET 10 +#define BED_OFFSET_START 40 +#define BED_OFFSET_CENTER 50 + + +#ifdef PIDTEMPBED +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) +#if defined(E3D_PT100_BED_WITH_AMP) || defined(E3D_PT100_BED_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_bedKp 21.70 +#define DEFAULT_bedKi 1.60 +#define DEFAULT_bedKd 73.76 +#else +#define DEFAULT_bedKp 126.13 +#define DEFAULT_bedKi 4.30 +#define DEFAULT_bedKd 924.76 +#endif + +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from pidautotune +// #define DEFAULT_bedKp 97.1 +// #define DEFAULT_bedKi 1.41 +// #define DEFAULT_bedKd 1675.16 + +// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + +/*----------------------------------- + PREHEAT SETTINGS + *------------------------------------*/ + +#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 + +#define PC_PREHEAT_HOTEND_TEMP 275 +#define PC_PREHEAT_HPB_TEMP 110 + +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + +#define ABS_PREHEAT_HOTEND_TEMP 255 +#define ABS_PREHEAT_HPB_TEMP 100 + +#define HIPS_PREHEAT_HOTEND_TEMP 220 +#define HIPS_PREHEAT_HPB_TEMP 100 + +#define PP_PREHEAT_HOTEND_TEMP 254 +#define PP_PREHEAT_HPB_TEMP 100 + +#define PET_PREHEAT_HOTEND_TEMP 230 +#define PET_PREHEAT_HPB_TEMP 85 + +#define FLEX_PREHEAT_HOTEND_TEMP 240 +#define FLEX_PREHEAT_HPB_TEMP 50 + +/*------------------------------------ + THERMISTORS SETTINGS + *------------------------------------*/ + +// +//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table +// +//// Temperature sensor settings: +// -2 is thermocouple with MAX6675 (only for sensor 0) +// -1 is thermocouple with AD595 +// 0 is not used +// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) +// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) +// 3 is Mendel-parts thermistor (4.7k pullup) +// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! +// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) +// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) +// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) +// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) +// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) +// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) +// 10 is 100k RS thermistor 198-961 (4.7k pullup) +// 11 is 100k beta 3950 1% thermistor (4.7k pullup) +// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) +// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" +// 20 is the PT100 circuit found in the Ultimainboard V2.x +// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 +// +// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k +// (but gives greater accuracy and more stable PID) +// 51 is 100k thermistor - EPCOS (1k pullup) +// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) +// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) +// +// 1047 is Pt1000 with 4k7 pullup +// 1010 is Pt1000 with 1k pullup (non standard) +// 147 is Pt100 with 4k7 pullup +// 148 is E3D Pt100 with 4k7 pullup and no PT100 Amplifier on a MiniRambo 1.3a +// 247 is Pt100 with 4k7 pullup and PT100 Amplifier +// 110 is Pt100 with 1k pullup (non standard) + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) +#define TEMP_SENSOR_0 247 +#elif defined(E3D_PT100_EXTRUDER_NO_AMP) +#define TEMP_SENSOR_0 148 +#else +#define TEMP_SENSOR_0 5 +#endif +#if defined(E3D_PT100_BED_WITH_AMP) +#define TEMP_SENSOR_BED 247 +#elif defined(E3D_PT100_BED_NO_AMP) +#define TEMP_SENSOR_BED 148 +#else +#define TEMP_SENSOR_BED 1 +#endif +#define TEMP_SENSOR_PINDA 1 +#define TEMP_SENSOR_AMBIENT 2000 + +#define STACK_GUARD_TEST_VALUE 0xA2A2 +#define STACK_GUARD_MARGIN 32 + +#define MAX_BED_TEMP_CALIBRATION 50 +#define MAX_HOTEND_TEMP_CALIBRATION 50 + +#define MAX_E_STEPS_PER_UNIT 250 +#define MIN_E_STEPS_PER_UNIT 100 + +#define Z_BABYSTEP_MIN -3999 +#define Z_BABYSTEP_MAX 0 + +#define PINDA_PREHEAT_X 20 +#define PINDA_PREHEAT_Y 60 +#define PINDA_PREHEAT_Z 0.15 +/* +#define PINDA_PREHEAT_X 70 +#define PINDA_PREHEAT_Y -3 +#define PINDA_PREHEAT_Z 1*/ +#define PINDA_HEAT_T 120 //time in s + +#define PINDA_MIN_T 50 +#define PINDA_STEP_T 10 +#define PINDA_MAX_T 100 + +#define LONG_PRESS_TIME 1000 //time in ms for button long press +#define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release + +#define DEFAULT_PID_TEMP 210 + +#define MIN_PRINT_FAN_SPEED 75 + + +// How much shall the print head be lifted on power panic? +// Ideally the Z axis will reach a zero phase of the stepper driver on power outage. To simplify this, +// UVLO_Z_AXIS_SHIFT shall be an integer multiply of the stepper driver cycle, that is 4x full step. +// For example, the Prusa i3 MK2 with 16 microsteps per full step has Z stepping of 400 microsteps per mm. +// At 400 microsteps per mm, a full step lifts the Z axis by 0.04mm, and a stepper driver cycle is 0.16mm. +// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm. +//#define UVLO_Z_AXIS_SHIFT 1.92 +#define UVLO_Z_AXIS_SHIFT 0.64 +// When powered off during PP recovery, the Z axis position can still be re-adjusted. In this case +// we just need to shift to the nearest fullstep, but we need a move which is at least +// "dropsegments" steps long. All the above rules still need to apply. +#define UVLO_TINY_Z_AXIS_SHIFT 0.16 +// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. +#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5 + +#define HEATBED_V2 + +#define M600_TIMEOUT 600 //seconds + +//#define SUPPORT_VERBOSITY + +#define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" +#define MMU_FILAMENT_COUNT 5 +//#define MMU_FORCE_STEALTH_MODE +#define MMU_HWRESET +#define MMU_DEBUG //print communication between MMU and printer on serial +#define MMU_HAS_CUTTER + +// MMU Error pause position +#define MMU_ERR_X_PAUSE_POS 125 +#define MMU_ERR_Y_PAUSE_POS 0 +#define MMU_ERR_Z_PAUSE_LIFT 20 + +// Default Arc Interpolation Settings (Now configurable via M214) +#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections. +/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the + cost of performance*/ +#define DEFAULT_MM_PER_ARC_SEGMENT 1.0f // REQUIRED - The enforced maximum length of an arc segment +#define DEFAULT_MIN_MM_PER_ARC_SEGMENT 0.5f //the enforced minimum length of an interpolated segment + /* MIN_MM_PER_ARC_SEGMENT Must be smaller than MM_PER_ARC_SEGMENT. Only has an effect if MIN_ARC_SEGMENTS > 0 + or ARC_SEGMENTS_PER_SEC > 0 . If both MIN_ARC_SEGMENTS and ARC_SEGMENTS_PER_SEC is defined, the minimum + calculated segment length is used. */ +#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable +#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable + +#endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h new file mode 100644 index 000000000..5575431da --- /dev/null +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h @@ -0,0 +1,681 @@ +#ifndef CONFIGURATION_PRUSA_H +#define CONFIGURATION_PRUSA_H + +#include +#include "printers.h" +/*------------------------------------ + GENERAL SETTINGS + *------------------------------------*/ + +// Printer revision +#define PRINTER_TYPE PRINTER_MK3S +#define PRINTER_NAME PRINTER_MK3S_NAME +#define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define FILAMENT_SIZE "1_75mm_MK3S" +#define NOZZLE_TYPE "E3DREVO_HF_60W" + +// Printer name +#define CUSTOM_MENDEL_NAME "Prusa MK3S-RHF60" + +// Electronics +#define MOTHERBOARD BOARD_EINSY_1_0a +#define STEEL_SHEET +#define HAS_SECOND_SERIAL_PORT + +// PSU +// #define PSU_Delta // uncomment if DeltaElectronics PSU installed + + +// Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) +//#define E3D_PT100_EXTRUDER_WITH_AMP +//#define E3D_PT100_EXTRUDER_NO_AMP +//#define E3D_PT100_BED_WITH_AMP +//#define E3D_PT100_BED_NO_AMP + + +/*------------------------------------ + AXIS SETTINGS + *------------------------------------*/ + +// Steps per unit {X,Y,Z,E} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} +//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} + +// Endstop inverting +#define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. + +// Direction inverting +#define INVERT_X_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_Y_DIR 0 // for Mendel set to 1, for Orca set to 0 +#define INVERT_Z_DIR 1 // for Mendel set to 0, for Orca set to 1 +#define INVERT_E0_DIR 0 // for direct drive extruder v9 set to 1, for geared extruder set to 0 + +// Home position +#define MANUAL_X_HOME_POS 0 +#define MANUAL_Y_HOME_POS -2.2 +#define MANUAL_Z_HOME_POS 0.2 + +// Travel limits after homing +#define X_MAX_POS 255 +#define X_MIN_POS 0 +#define Y_MAX_POS 212.5 +#define Y_MIN_POS -4 //orig -4 +#define Z_MAX_POS 210 +#define Z_MIN_POS 0.15 + +// Canceled home position +#define X_CANCEL_POS 50 +#define Y_CANCEL_POS 190 +#define Z_CANCEL_LIFT 50 + +//Pause print position +#define X_PAUSE_POS 50 +#define Y_PAUSE_POS 190 +#define Z_PAUSE_LIFT 20 + +#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E +#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) // 3000 is also valid for stallGuard homing. Valid range: 2200 - 3000 + +//#define DEFAULT_Y_OFFSET 4.f // Default distance of Y_MIN_POS point from endstop, when the printer is not calibrated. +/** + * [0,0] steel sheet print area point X coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_X 0.f +/** + * [0,0] steel sheet print area point Y coordinate in bed print area coordinates + */ +#define SHEET_PRINT_ZERO_REF_Y -2.f + +#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) +#define DEFAULT_MAX_FEEDRATE_SILENT {100, 100, 12, 120} // (mm/sec) max feedrate (M203), silent mode + +#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_ACCELERATION_SILENT {960, 960, 200, 5000} // (mm/sec^2) max acceleration (M201), silent mode + + +#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204P) +#define DEFAULT_RETRACT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for retracts (M204R) +#define DEFAULT_TRAVEL_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for travels (M204T) + +#define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) + +//Silent mode limits +#define SILENT_MAX_ACCEL_XY 960ul // max acceleration in silent mode in mm/s^2 +#define SILENT_MAX_FEEDRATE_XY 100 // max feedrate in mm/s + +//Normal mode limits +#define NORMAL_MAX_ACCEL_XY 2500ul // max acceleration in normal mode in mm/s^2 +#define NORMAL_MAX_FEEDRATE_XY 200 // max feedrate in mm/s + +//number of bytes from end of the file to start check +#define END_FILE_SECTION 20000 + +#define Z_AXIS_ALWAYS_ON 1 + +//Crash detection +#define CRASHDET_TIMER 45 //seconds +#define CRASHDET_COUNTER_MAX 3 + +// New XYZ calibration +#define NEW_XYZCAL + +// Watchdog support +#define WATCHDOG + +// Power panic +#define UVLO_SUPPORT + +// Fan check +#define FANCHECK + +// Safety timer +#define SAFETYTIMER +#define DEFAULT_SAFETYTIMER_TIME_MINS 30 + +// Offline crash dumper +#define XFLASH_DUMP // enable dump functionality (including D20/D21/D22) +#define MENU_DUMP // enable "Memory dump" in Settings menu +#define EMERGENCY_DUMP // trigger crash on stack corruption and WDR + +// Online crash dumper +//#define EMERGENCY_SERIAL_DUMP // Request dump via serial on stack corruption and WDR +//#define MENU_SERIAL_DUMP // Enable "Memory dump" in Settings menu + +// Filament sensor +#define FILAMENT_SENSOR +#define FILAMENT_SENSOR_TYPE FSENSOR_IR_ANALOG +#define FSENSOR_PROBING + +// Backlash - +//#define BACKLASH_X +//#define BACKLASH_Y + + +// Minimum ambient temperature limit to start triggering MINTEMP errors [C] +// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it, +// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle +// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater) +#define MINTEMP_MINAMBIENT 10 +#define MINTEMP_MINAMBIENT_RAW 1002 + +#define DEBUG_DCODE2 +#define DEBUG_DCODE3 +#define DEBUG_DCODE6 + +//#define DEBUG_PULLUP_CRASH //Test Pullup crash + +//#define DEBUG_BUILD +//#define DEBUG_SEC_LANG //secondary language debug output at startup +//#define DEBUG_XFLASH //debug external spi flash +#ifdef DEBUG_BUILD +//#define _NO_ASM +#define DEBUG_DCODES //D codes +#define DEBUG_STACK_MONITOR //Stack monitor in stepper ISR +//#define DEBUG_CRASHDET_COUNTERS //Display crash-detection counters on LCD +//#define DEBUG_RESUME_PRINT //Resume/save print debug enable +//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output +//#define DEBUG_DISABLE_XMINLIMIT //x min limit ignored +//#define DEBUG_DISABLE_XMAXLIMIT //x max limit ignored +//#define DEBUG_DISABLE_YMINLIMIT //y min limit ignored +//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored +//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored +//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored +#define DEBUG_DISABLE_STARTMSGS //no startup messages +//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored +//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored +//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line +//#define DEBUG_DISABLE_PREVENT_EXTRUDER //cold extrusion and long extrusion allowed +//#define DEBUG_DISABLE_FORCE_SELFTEST //disable force selftest +//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3) +//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3) +//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) +//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) +#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line +#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. +#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. +#define CMD_DIAGNOSTICS //Show cmd queue length on printer display +#endif /* DEBUG_BUILD */ + + +#define LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION +#define TMC2130_LINEARITY_CORRECTION_XYZ +#define TMC2130_VARIABLE_RESOLUTION + + + +/*------------------------------------ + TMC2130 default settings + *------------------------------------*/ + +#define TMC2130_FCLK 12000000 // fclk = 12MHz + +#define TMC2130_USTEPS_XY 16 // microstep resolution for XY axes +#define TMC2130_USTEPS_Z 16 // microstep resolution for Z axis +#define TMC2130_USTEPS_E 32 // microstep resolution for E axis +#define TMC2130_INTPOL_XY 1 // extrapolate 256 for XY axes +#define TMC2130_INTPOL_Z 1 // extrapolate 256 for Z axis +#define TMC2130_INTPOL_E 1 // extrapolate 256 for E axis +// #define ALLOW_ALL_MRES + +#define TMC2130_PWM_GRAD_X 2 // PWMCONF +#define TMC2130_PWM_AMPL_X 230 // PWMCONF +#define TMC2130_PWM_AUTO_X 1 // PWMCONF +#define TMC2130_PWM_FREQ_X 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Y 2 // PWMCONF +#define TMC2130_PWM_AMPL_Y 235 // PWMCONF +#define TMC2130_PWM_AUTO_Y 1 // PWMCONF +#define TMC2130_PWM_FREQ_Y 2 // PWMCONF + +#define TMC2130_PWM_GRAD_Z 4 // PWMCONF +#define TMC2130_PWM_AMPL_Z 200 // PWMCONF +#define TMC2130_PWM_AUTO_Z 1 // PWMCONF +#define TMC2130_PWM_FREQ_Z 2 // PWMCONF + +#define TMC2130_PWM_GRAD_E 4 // PWMCONF +#define TMC2130_PWM_AMPL_E 240 // PWMCONF +#define TMC2130_PWM_AUTO_E 1 // PWMCONF +#define TMC2130_PWM_FREQ_E 2 // PWMCONF + +// experimental setting for E-motor cooler operation +#define TMC2130_PWM_GRAD_Ecool 84 // PWMCONF 730mA @ 375mm/min 970mA phase peak at feedrate 900mm/min +#define TMC2130_PWM_AMPL_Ecool 43 // PWMCONF 500mA phase peak at feedrate 10 mm/min +#define TMC2130_PWM_AUTO_Ecool 0 // PWMCONF + +#define TMC2130_TOFF_XYZ 3 // CHOPCONF // fchop = 27.778kHz +#define TMC2130_TOFF_E 3 // CHOPCONF // fchop = 27.778kHz +//#define TMC2130_TOFF_E 4 // CHOPCONF // fchop = 21.429kHz +//#define TMC2130_TOFF_E 5 // CHOPCONF // fchop = 17.442kHz + +//#define TMC2130_STEALTH_E // Extruder stealthChop mode +//#define TMC2130_CNSTOFF_E // Extruder constant-off-time mode (similar to MK2) + +//#define TMC2130_PWM_DIV 683 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_DIV 512 // PWM frequency divider (1024, 683, 512, 410) +#define TMC2130_PWM_CLK (2 * TMC2130_FCLK / TMC2130_PWM_DIV) // PWM frequency (23.4kHz, 35.1kHz, 46.9kHz, 58.5kHz for 12MHz fclk) + +#define TMC2130_TPWMTHRS 0 // TPWMTHRS - Sets the switching speed threshold based on TSTEP from stealthChop to spreadCycle mode +#define TMC2130_TPWMTHRS_E 403 // Switch extruder from StealthChop to SpreadCycle at around 900mm/min +#define TMC2130_THIGH 0 // THIGH - unused + +//#define TMC2130_TCOOLTHRS_X 450 // TCOOLTHRS - coolstep treshold +//#define TMC2130_TCOOLTHRS_Y 450 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_X 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Y 430 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_Z 500 // TCOOLTHRS - coolstep treshold +#define TMC2130_TCOOLTHRS_E 500 // TCOOLTHRS - coolstep treshold + +#define TMC2130_SG_HOMING 1 // stallguard homing +#define TMC2130_SG_THRS_X 3 // stallguard sensitivity for X axis +#define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis +#define TMC2130_SG_THRS_Z 4 // stallguard sensitivity for Z axis +#define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis +#define TMC2130_SG_THRS_HOME {3, 3, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E} + +//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) +#define TMC2130_CURRENTS_H {16, 20, 35, 30} // default holding currents for all axes +#define TMC2130_CURRENTS_FARM 36 // E 805 mA peak for ECool/farm mode +#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_STEALTH_Z +#define TMC2130_DEDGE_STEPPING + +//#define TMC2130_SERVICE_CODES_M910_M918 + +//#define TMC2130_DEBUG +//#define TMC2130_DEBUG_WR +//#define TMC2130_DEBUG_RD + + +/*------------------------------------ + EXTRUDER SETTINGS + *------------------------------------*/ + +// Mintemps +#define HEATER_0_MINTEMP 10 +#define HEATER_MINTEMP_DELAY 15000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if HEATER_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see HEATER_MINTEMP_DELAY definition)" +#endif +#define BED_MINTEMP 10 +#define BED_MINTEMP_DELAY 50000 // [ms] ! if changed, check maximal allowed value @ ShortTimer +#if BED_MINTEMP_DELAY>USHRT_MAX +#error "Check maximal allowed value @ ShortTimer (see BED_MINTEMP_DELAY definition)" +#endif +#define SUPERPINDA_SUPPORT +#define PINDA_MINTEMP 10 +//#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) +#define HEATER_0_MAXTEMP 410 +#else +#define HEATER_0_MAXTEMP 305 +#endif +#define BED_MAXTEMP 125 +#define AMBIENT_MAXTEMP 100 + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_Kp 21.70 +#define DEFAULT_Ki 1.60 +#define DEFAULT_Kd 73.76 +#else +// Define PID constants for E3D REVO HF 60W +#define MAX_OVERSHOOT_PID_AUTOTUNE 30 +#define DEFAULT_Kp 15.00 +#define DEFAULT_Ki 2.9 +#define DEFAULT_Kd 19.2 +#endif + +// Extrude mintemp +#define EXTRUDE_MINTEMP 175 + +// Extruder cooling fans +#define EXTRUDER_0_AUTO_FAN_PIN 8 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed +#define EXTRUDER_ALTFAN_DETECT +#define EXTRUDER_ALTFAN_SPEED_SILENT 128 + +#define FANCHECK_AUTO_PRINT_FAN_THRS 70 //[RPS] - Used during selftest to identify swapped fans automatically +#define FANCHECK_AUTO_FAIL_THRS 20 //[RPS] - Used during selftest to identify a faulty fan + +/*------------------------------------ + CHANGE FILAMENT SETTINGS + *------------------------------------*/ + +// Filament change configuration +#define FILAMENTCHANGEENABLE +#ifdef FILAMENTCHANGEENABLE +#define FILAMENTCHANGE_XPOS 211 +#define FILAMENTCHANGE_YPOS 0 +#define FILAMENTCHANGE_ZADD 2 +#define FILAMENTCHANGE_FIRSTRETRACT -2 +#define FILAMENTCHANGE_FINALRETRACT 0 + +#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) +#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) +#define FILAMENTCHANGE_RECFEED 5 + +#define FILAMENTCHANGE_XYFEED 50 +#define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600) +#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701) +//#define FILAMENTCHANGE_RFEED 400 +#define FILAMENTCHANGE_RFEED 7000 / 60 +#define FILAMENTCHANGE_EXFEED 2 +#define FILAMENTCHANGE_ZFEED 15 + +#endif + +/*------------------------------------ + ADDITIONAL FEATURES SETTINGS + *------------------------------------*/ + +// temperature runaway +#define TEMP_RUNAWAY_BED_HYSTERESIS 5 +#define TEMP_RUNAWAY_BED_TIMEOUT 360 + +#define TEMP_RUNAWAY_EXTRUDER_HYSTERESIS 15 +#define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 + +// model-based temperature check +#define TEMP_MODEL 1 // enable model-based temperature checks +#define TEMP_MODEL_DEBUG 1 // extended runtime logging + +#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit +#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit +#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit + +#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit +#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit +#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit + +#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) + +#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction + +#include "temp_model/e3d_REVO_HF_60W.h" +#define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters + + +/*------------------------------------ + MOTOR CURRENT SETTINGS + *------------------------------------*/ + +// Motor Current settings for Einsy/tmc = 0..63 +#define MOTOR_CURRENT_PWM_RANGE 63 + +/*------------------------------------ + BED SETTINGS + *------------------------------------*/ + +// Define Mesh Bed Leveling system to enable it +#define MESH_BED_LEVELING +#ifdef MESH_BED_LEVELING + +#define MBL_Z_STEP 0.01 + +// Mesh definitions +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 +#define MESH_MIN_Y 6 +#define MESH_MAX_Y 210 + +// Mesh upsample definition +#define MESH_NUM_X_POINTS 7 +#define MESH_NUM_Y_POINTS 7 +// Mesh measure definition +#define MESH_MEAS_NUM_X_POINTS 3 +#define MESH_MEAS_NUM_Y_POINTS 3 + +// Maximum bed level correction value +#define BED_ADJUSTMENT_UM_MAX 100 + +#define MESH_HOME_Z_CALIB 0.2 +#define MESH_HOME_Z_SEARCH 5.0f // Z lift for homing, mesh bed leveling etc. + +#define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right +#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind +#define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) +#endif + +// Bed Temperature Control +// Select PID or bang-bang with PIDTEMPBED. If bang-bang, BED_LIMIT_SWITCHING will enable hysteresis +// +// Uncomment this to enable PID on the bed. It uses the same frequency PWM as the extruder. +// If your PID_dT above is the default, and correct for your hardware/configuration, that means 7.689Hz, +// which is fine for driving a square wave into a resistive load and does not significantly impact you FET heating. +// This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W heater. +// If your configuration is significantly different than this and you don't understand the issues involved, you probably +// shouldn't use bed PID until someone else verifies your hardware works. +// If this is enabled, find your own PID constants below. +#define PIDTEMPBED +// +//#define BED_LIMIT_SWITCHING + +// This sets the max power delivered to the bed, and replaces the HEATER_BED_DUTY_CYCLE_DIVIDER option. +// all forms of bed control obey this (PID, bang-bang, bang-bang with hysteresis) +// setting this to anything other than 255 enables a form of PWM to the bed just like HEATER_BED_DUTY_CYCLE_DIVIDER did, +// so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +// Bed temperature compensation settings +#define BED_OFFSET 10 +#define BED_OFFSET_START 40 +#define BED_OFFSET_CENTER 50 + + +#ifdef PIDTEMPBED +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) +#if defined(E3D_PT100_BED_WITH_AMP) || defined(E3D_PT100_BED_NO_AMP) +// Define PID constants for extruder with PT100 +#define DEFAULT_bedKp 21.70 +#define DEFAULT_bedKi 1.60 +#define DEFAULT_bedKd 73.76 +#else +#define DEFAULT_bedKp 126.13 +#define DEFAULT_bedKi 4.30 +#define DEFAULT_bedKd 924.76 +#endif + +//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) +//from pidautotune +// #define DEFAULT_bedKp 97.1 +// #define DEFAULT_bedKi 1.41 +// #define DEFAULT_bedKd 1675.16 + +// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + +/*----------------------------------- + PREHEAT SETTINGS + *------------------------------------*/ + +#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 + +#define PC_PREHEAT_HOTEND_TEMP 275 +#define PC_PREHEAT_HPB_TEMP 110 + +#define PA_PREHEAT_HOTEND_TEMP 275 +#define PA_PREHEAT_HPB_TEMP 90 + +#define ABS_PREHEAT_HOTEND_TEMP 255 +#define ABS_PREHEAT_HPB_TEMP 100 + +#define HIPS_PREHEAT_HOTEND_TEMP 220 +#define HIPS_PREHEAT_HPB_TEMP 100 + +#define PP_PREHEAT_HOTEND_TEMP 254 +#define PP_PREHEAT_HPB_TEMP 100 + +#define PET_PREHEAT_HOTEND_TEMP 230 +#define PET_PREHEAT_HPB_TEMP 85 + +#define FLEX_PREHEAT_HOTEND_TEMP 240 +#define FLEX_PREHEAT_HPB_TEMP 50 + +/*------------------------------------ + THERMISTORS SETTINGS + *------------------------------------*/ + +// +//--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table +// +//// Temperature sensor settings: +// -2 is thermocouple with MAX6675 (only for sensor 0) +// -1 is thermocouple with AD595 +// 0 is not used +// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) +// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) +// 3 is Mendel-parts thermistor (4.7k pullup) +// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! +// 5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup) +// 6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) +// 7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) +// 71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) +// 8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) +// 9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) +// 10 is 100k RS thermistor 198-961 (4.7k pullup) +// 11 is 100k beta 3950 1% thermistor (4.7k pullup) +// 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) +// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" +// 20 is the PT100 circuit found in the Ultimainboard V2.x +// 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 +// +// 1k ohm pullup tables - This is not normal, you would have to have changed out your 4.7k for 1k +// (but gives greater accuracy and more stable PID) +// 51 is 100k thermistor - EPCOS (1k pullup) +// 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) +// 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) +// +// 1047 is Pt1000 with 4k7 pullup +// 1010 is Pt1000 with 1k pullup (non standard) +// 147 is Pt100 with 4k7 pullup +// 148 is E3D Pt100 with 4k7 pullup and no PT100 Amplifier on a MiniRambo 1.3a +// 247 is Pt100 with 4k7 pullup and PT100 Amplifier +// 110 is Pt100 with 1k pullup (non standard) + +#if defined(E3D_PT100_EXTRUDER_WITH_AMP) +#define TEMP_SENSOR_0 247 +#elif defined(E3D_PT100_EXTRUDER_NO_AMP) +#define TEMP_SENSOR_0 148 +#else +#define TEMP_SENSOR_0 5 +#endif +#if defined(E3D_PT100_BED_WITH_AMP) +#define TEMP_SENSOR_BED 247 +#elif defined(E3D_PT100_BED_NO_AMP) +#define TEMP_SENSOR_BED 148 +#else +#define TEMP_SENSOR_BED 1 +#endif +#define TEMP_SENSOR_PINDA 1 +#define TEMP_SENSOR_AMBIENT 2000 + +#define STACK_GUARD_TEST_VALUE 0xA2A2 +#define STACK_GUARD_MARGIN 32 + +#define MAX_BED_TEMP_CALIBRATION 50 +#define MAX_HOTEND_TEMP_CALIBRATION 50 + +#define MAX_E_STEPS_PER_UNIT 250 +#define MIN_E_STEPS_PER_UNIT 100 + +#define Z_BABYSTEP_MIN -3999 +#define Z_BABYSTEP_MAX 0 + +#define PINDA_PREHEAT_X 20 +#define PINDA_PREHEAT_Y 60 +#define PINDA_PREHEAT_Z 0.15 +/* +#define PINDA_PREHEAT_X 70 +#define PINDA_PREHEAT_Y -3 +#define PINDA_PREHEAT_Z 1*/ +#define PINDA_HEAT_T 120 //time in s + +#define PINDA_MIN_T 50 +#define PINDA_STEP_T 10 +#define PINDA_MAX_T 100 + +#define LONG_PRESS_TIME 1000 //time in ms for button long press +#define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release + +#define DEFAULT_PID_TEMP 210 + +#define MIN_PRINT_FAN_SPEED 75 + + +// How much shall the print head be lifted on power panic? +// Ideally the Z axis will reach a zero phase of the stepper driver on power outage. To simplify this, +// UVLO_Z_AXIS_SHIFT shall be an integer multiply of the stepper driver cycle, that is 4x full step. +// For example, the Prusa i3 MK2 with 16 microsteps per full step has Z stepping of 400 microsteps per mm. +// At 400 microsteps per mm, a full step lifts the Z axis by 0.04mm, and a stepper driver cycle is 0.16mm. +// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm. +//#define UVLO_Z_AXIS_SHIFT 1.92 +#define UVLO_Z_AXIS_SHIFT 0.64 +// When powered off during PP recovery, the Z axis position can still be re-adjusted. In this case +// we just need to shift to the nearest fullstep, but we need a move which is at least +// "dropsegments" steps long. All the above rules still need to apply. +#define UVLO_TINY_Z_AXIS_SHIFT 0.16 +// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. +#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5 + +#define HEATBED_V2 + +#define M600_TIMEOUT 600 //seconds + +//#define SUPPORT_VERBOSITY + +#define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" +#define MMU_FILAMENT_COUNT 5 +//#define MMU_FORCE_STEALTH_MODE +#define MMU_HWRESET +#define MMU_DEBUG //print communication between MMU and printer on serial +#define MMU_HAS_CUTTER + +// This is experimental feature requested by our test department. +// There is no known use for ordinary user. If enabled by this macro +// and enabled from printer menu (not enabled by default). It cuts filament +// every time when switching filament from gcode. MMU_HAS_CUTTER needs to be +// defined. + +//#define MMU_ALWAYS_CUT + +// MMU Error pause position +#define MMU_ERR_X_PAUSE_POS 125 +#define MMU_ERR_Y_PAUSE_POS 0 +#define MMU_ERR_Z_PAUSE_LIFT 20 + +// Default Arc Interpolation Settings (Now configurable via M214) +#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections. +/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the + cost of performance*/ +#define DEFAULT_MM_PER_ARC_SEGMENT 1.0f // REQUIRED - The enforced maximum length of an arc segment +#define DEFAULT_MIN_MM_PER_ARC_SEGMENT 0.5f //the enforced minimum length of an interpolated segment + /* MIN_MM_PER_ARC_SEGMENT Must be smaller than MM_PER_ARC_SEGMENT. Only has an effect if MIN_ARC_SEGMENTS > 0 + or ARC_SEGMENTS_PER_SEC > 0 . If both MIN_ARC_SEGMENTS and ARC_SEGMENTS_PER_SEC is defined, the minimum + calculated segment length is used. */ +#define DEFAULT_MIN_ARC_SEGMENTS 20 // The enforced minimum segments in a full circle of the same radius. Set to 0 to disable +#define DEFAULT_ARC_SEGMENTS_PER_SEC 0 // Use feedrate to choose segment length. Set to 0 to disable + +#endif //__CONFIGURATION_PRUSA_H From b5bd9ebc63219de1cbfa0c473670d23b33628cd8 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 21 Jun 2023 07:34:17 +0200 Subject: [PATCH 044/148] MK3 sync Prusa-Error-Codes (#4238) * Sync PEC `FINDA_DIDNT_GO_OFF` to `FINDA_FILAMENT_STUCK` * Sync PEC `FSENSOR_DIDNT_GO_OFF` to `FSENSOR_FILAMENT_STUCK` * Sync PEC `PULLEY_STALLED` to `PULLEY_CANNOT_MOVE` * Sync PEC `SELECTOR_CANNOT_MOVE` update text * Sync PEC `IDLER_CANNOT_MOVE` update text * Sync PEC `PULLEY_WARNING_TMC_TOO_HOT` to `WARNING_TMC_PULLEY_TOO_HOT` * Snyc PEC `RestartMMU` to `ResetMMU` Also related text * Sync PEC `SELECTOR_WARNING_TMC_TOO_HOT` to `WARNING_TMC_SELECTOR_TOO_HOT` * Sync PEC `IDLER_WARNING_TMC_TOO_HOT` to `WARNING_TMC_IDLER_TOO_HOT` * Sync PEC `PULLEY_TMC_OVERHEAT_ERROR` to `TMC_PULLEY_OVERHEAT_ERROR` * Sync PEC `SELECTOR_TMC_OVERHEAT_ERROR` to `TMC_SELECTOR_OVERHEAT_ERROR` * Sync PEC `IDLER_TMC_OVERHEAT_ERROR` to `TMC_IDLER_OVERHEAT_ERROR` * Sync PEC `PULLEY_TMC_DRIVER_ERROR` to `TMC_PULLEY_DRIVER_ERROR` Also releated text * Sync PEC `SELECTOR_TMC_DRIVER_ERROR` to `TMC_SELECTOR_DRIVER_ERROR` Also related text * Sync PEC `IDLER_TMC_DRIVER_ERROR` to `TMC_IDLER_DRIVER_ERROR` Also related text * Sync PEC `PULLEY_TMC_DRIVER_RESET` to `TMC_PULLEY_DRIVER_RESET` * Sync PEC `SELECTOR_TMC_DRIVER_RESET` to `TMC_SELECTOR_DRIVER_RESET` * Sync PEC `IDLER_TMC_DRIVER_RESET` to `TMC_IDLER_DRIVER_RESET` * Sync PEC `PULLEY_TMC_UNDERVOLTAGE_ERROR` to `TMC_PULLEY_UNDERVOLTAGE_ERROR` * Sync PEC `SELECTOR_TMC_UNDERVOLTAGE_ERROR` to `TMC_SELECTOR_UNDERVOLTAGE_ERROR` * Sync PEC `IDLER_TMC_UNDERVOLTAGE_ERROR` to `TMC_IDLER_UNDERVOLTAGE_ERROR` * Sync PEC `PULLEY_TMC_DRIVER_SHORTED` to `TMC_PULLEY_DRIVER_SHORTED` Also related text * Sync PEC `SELECTOR_TMC_DRIVER_SHORTED` to `TMC_SELECTOR_DRIVER_SHORTED` Also related text * Sync PEC `IDLER_TMC_DRIVER_SHORTED` to `TMC_IDLER_DRIVER_SHORTED` Also related text * Sync PEC `PULLEY_SELFTEST_FAILED` to `MMU_PULLEY_SELFTEST_FAILED` Also related text * Sync PEC `SELECTOR_SELFTEST_FAILED` to `MMU_SELECTOR_SELFTEST_FAILED` Also releated text * Sync PEC `IDLER_SELFTEST_FAILED` to `MMU_IDLER_SELFTEST_FAILED` Also related text * Sync PEC fix MMU_MMU Update MMU MCU UNDERPOWER * Sync PEC `FIL_ALREADY_LOADED` to `FILAMENT_ALREADY_LOADED` Also related text * Add Prusa Error Codes check script * Remove `:` at FINDA and FSENSOR as it is in other tiles * Sync FSENSOR_DIDNT_TRIGGER MSG_DESC_SELECTOR_CANNOT_MOVE MSG_DESC_IDLER_CANNOT_MOVE MSG_DESC_FW_UPDATE_NEEDED FILAMENT_ALREADY_LOADED * Add MMU UNKOWN_ERROR PEC --- Firmware/mmu2.cpp | 2 +- Firmware/mmu2/buttons.h | 4 +- Firmware/mmu2/check-pce.sh | 55 +++++ Firmware/mmu2/errors_list.h | 320 ++++++++++++++++-------------- Firmware/mmu2_error_converter.cpp | 116 +++++------ Firmware/mmu2_protocol_logic.cpp | 2 +- lang/po/Firmware.pot | 213 ++++++++++---------- lang/po/Firmware_cs.po | 191 +++++++++--------- lang/po/Firmware_de.po | 191 +++++++++--------- lang/po/Firmware_es.po | 193 +++++++++--------- lang/po/Firmware_fr.po | 191 +++++++++--------- lang/po/Firmware_hr.po | 191 +++++++++--------- lang/po/Firmware_hu.po | 191 +++++++++--------- lang/po/Firmware_it.po | 193 +++++++++--------- lang/po/Firmware_nl.po | 189 +++++++++--------- lang/po/Firmware_no.po | 193 +++++++++--------- lang/po/Firmware_pl.po | 193 +++++++++--------- lang/po/Firmware_ro.po | 193 +++++++++--------- lang/po/Firmware_sk.po | 197 +++++++++--------- lang/po/Firmware_sv.po | 193 +++++++++--------- 20 files changed, 1705 insertions(+), 1506 deletions(-) create mode 100755 Firmware/mmu2/check-pce.sh diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 6be8d4b4e..2e3f94564 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -722,7 +722,7 @@ void MMU2::CheckUserInput() { break; } break; - case RestartMMU: + case ResetMMU: Reset(ResetPin); // we cannot do power cycle on the MK3 // ... but mmu2_power.cpp knows this and triggers a soft-reset instead. break; diff --git a/Firmware/mmu2/buttons.h b/Firmware/mmu2/buttons.h index e02a6b065..d24d86f11 100644 --- a/Firmware/mmu2/buttons.h +++ b/Firmware/mmu2/buttons.h @@ -13,7 +13,7 @@ enum class ButtonOperations : uint8_t { NoOperation = 0, Retry = 1, Continue = 2, - RestartMMU = 3, + ResetMMU = 3, Unload = 4, StopPrint = 5, DisableMMU = 6, @@ -26,7 +26,7 @@ enum Buttons : uint8_t { Left, // performed on the printer's side - RestartMMU, + ResetMMU, StopPrint, DisableMMU, diff --git a/Firmware/mmu2/check-pce.sh b/Firmware/mmu2/check-pce.sh new file mode 100755 index 000000000..33a97b7ee --- /dev/null +++ b/Firmware/mmu2/check-pce.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +# download Prusa Error Codes for MMU +#wget https://raw.githubusercontent.com/3d-gussner/Prusa-Error-Codes/master/04_MMU/error-codes.yaml --output-document=error-codes.yaml +wget https://raw.githubusercontent.com/prusa3d/Prusa-Error-Codes/master/04_MMU/error-codes.yaml --output-document=error-codes.yaml + +oifs="$IFS" ## save original IFS +IFS=$'\n' ## set IFS to break on newline +codes=($(cat error-codes.yaml |grep "code:" |cut -d '"' -f2)) +titles=($(cat error-codes.yaml |grep 'title:' |cut -d '"' -f2)) +texts=($(cat error-codes.yaml |grep "text:" |cut -d '"' -f2)) +actions=($(cat error-codes.yaml |grep "action:" |cut -d ':' -f2)) +ids=($(cat error-codes.yaml |grep "id:" |cut -d '"' -f2)) +IFS="$oifs" ## restore original IFS + +filename=errors_list.h + +clear +for ((i = 0; i < ${#codes[@]}; i++)) do + code=${codes[i]} + id=$(cat $filename |grep "${code#04*}" | cut -d "=" -f1 | cut -d "_" -f3- |cut -d " " -f1) + title=$(cat $filename |grep "${id}" |grep --max-count=1 "MSG_TITLE" |cut -d '"' -f2) + text=$(cat $filename |grep "${id}" |grep --max-count=1 "MSG_DESC" |cut -d '"' -f2) + action1=$(cat $filename |grep "),//$id"| cut -d "," -f1) + action2=$(cat $filename |grep "),//$id"| cut -d "," -f2) + action1=$(echo $action1 | cut -d ":" -f2- |cut -d ":" -f2) + action2=$(echo $action2 | cut -d ":" -f2- |cut -d ":" -f2 |cut -d ")" -f1) + if [ "$action2" == "NoOperation" ]; then + action=" [$action1]" + else + action=" [$action1,$action2]" + fi + echo -n "code: $code |" + if [ "$id" != "${ids[i]}" ]; then + echo -n "$(tput setaf 1) $id $(tput sgr0) # $(tput setaf 2)${ids[i]}$(tput sgr0)|" + else + echo -n " $id |" + fi + if [ "$title" != "${titles[i]}" ]; then + echo -n "$(tput setaf 1) $title $(tput sgr0) # $(tput setaf 2)${titles[i]}$(tput sgr0)|" + else + echo -n " $title |" + fi + if [ "$text" != "${texts[i]}" ]; then + echo -n "$(tput setaf 1) $text $(tput sgr0) # $(tput setaf 2)${texts[i]}$(tput sgr0)|" + else + echo -n " $text |" + fi + if [ "$action" != "${actions[i]}" ]; then + echo -n "$(tput setaf 1) $action $(tput sgr0) # $(tput setaf 2)${actions[i]}$(tput sgr0)|" + else + echo -n " $action |" + fi + echo +done diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index 44a205666..d39a26042 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -18,9 +18,9 @@ typedef enum : uint16_t { ERR_MECHANICAL = 100, ERR_MECHANICAL_FINDA_DIDNT_TRIGGER = 101, - ERR_MECHANICAL_FINDA_DIDNT_GO_OFF = 102, + ERR_MECHANICAL_FINDA_FILAMENT_STUCK = 102, ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER = 103, - ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF = 104, + ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK = 104, ERR_MECHANICAL_PULLEY_CANNOT_MOVE = 105, ERR_MECHANICAL_FSENSOR_TOO_EARLY = 106, @@ -32,35 +32,35 @@ typedef enum : uint16_t { ERR_MECHANICAL_IDLER_CANNOT_MOVE = 126, ERR_TEMPERATURE = 200, - ERR_TEMPERATURE_PULLEY_WARNING_TMC_TOO_HOT = 201, - ERR_TEMPERATURE_SELECTOR_WARNING_TMC_TOO_HOT = 211, - ERR_TEMPERATURE_IDLER_WARNING_TMC_TOO_HOT = 221, + ERR_TEMPERATURE_WARNING_TMC_PULLEY_TOO_HOT = 201, + ERR_TEMPERATURE_WARNING_TMC_SELECTOR_TOO_HOT = 211, + ERR_TEMPERATURE_WARNING_TMC_IDLER_TOO_HOT = 221, - ERR_TEMPERATURE_PULLEY_TMC_OVERHEAT_ERROR = 202, - ERR_TEMPERATURE_SELECTOR_TMC_OVERHEAT_ERROR = 212, - ERR_TEMPERATURE_IDLER_TMC_OVERHEAT_ERROR = 222, + ERR_TEMPERATURE_TMC_PULLEY_OVERHEAT_ERROR = 202, + ERR_TEMPERATURE_TMC_SELECTOR_OVERHEAT_ERROR = 212, + ERR_TEMPERATURE_TMC_IDLER_OVERHEAT_ERROR = 222, ERR_ELECTRICAL = 300, - ERR_ELECTRICAL_PULLEY_TMC_DRIVER_ERROR = 301, - ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_ERROR = 311, - ERR_ELECTRICAL_IDLER_TMC_DRIVER_ERROR = 321, + ERR_ELECTRICAL_TMC_PULLEY_DRIVER_ERROR = 301, + ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_ERROR = 311, + ERR_ELECTRICAL_TMC_IDLER_DRIVER_ERROR = 321, - ERR_ELECTRICAL_PULLEY_TMC_DRIVER_RESET = 302, - ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_RESET = 312, - ERR_ELECTRICAL_IDLER_TMC_DRIVER_RESET = 322, + ERR_ELECTRICAL_TMC_PULLEY_DRIVER_RESET = 302, + ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_RESET = 312, + ERR_ELECTRICAL_TMC_IDLER_DRIVER_RESET = 322, - ERR_ELECTRICAL_PULLEY_TMC_UNDERVOLTAGE_ERROR = 303, - ERR_ELECTRICAL_SELECTOR_TMC_UNDERVOLTAGE_ERROR = 313, - ERR_ELECTRICAL_IDLER_TMC_UNDERVOLTAGE_ERROR = 323, + ERR_ELECTRICAL_TMC_PULLEY_UNDERVOLTAGE_ERROR = 303, + ERR_ELECTRICAL_TMC_SELECTOR_UNDERVOLTAGE_ERROR = 313, + ERR_ELECTRICAL_TMC_IDLER_UNDERVOLTAGE_ERROR = 323, - ERR_ELECTRICAL_PULLEY_TMC_DRIVER_SHORTED = 304, - ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_SHORTED = 314, - ERR_ELECTRICAL_IDLER_TMC_DRIVER_SHORTED = 324, + ERR_ELECTRICAL_TMC_PULLEY_DRIVER_SHORTED = 304, + ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_SHORTED = 314, + ERR_ELECTRICAL_TMC_IDLER_DRIVER_SHORTED = 324, - ERR_ELECTRICAL_PULLEY_SELFTEST_FAILED = 305, - ERR_ELECTRICAL_SELECTOR_SELFTEST_FAILED = 315, - ERR_ELECTRICAL_IDLER_SELFTEST_FAILED = 325, + ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED = 305, + ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED = 315, + ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED = 325, ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC = 306, @@ -78,7 +78,7 @@ typedef enum : uint16_t { ERR_SYSTEM_UNLOAD_MANUALLY = 506, ERR_SYSTEM_FILAMENT_EJECTED = 507, - ERR_OTHER = 900 + ERR_OTHER_UNKNOWN_ERROR = 900 } err_num_t; // Avr gcc has serious trouble understanding static data structures in PROGMEM @@ -87,9 +87,9 @@ typedef enum : uint16_t { // it really makes no difference if there are "nice" data structures or plain arrays. static const constexpr uint16_t errorCodes[] PROGMEM = { ERR_MECHANICAL_FINDA_DIDNT_TRIGGER, - ERR_MECHANICAL_FINDA_DIDNT_GO_OFF, + ERR_MECHANICAL_FINDA_FILAMENT_STUCK, ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER, - ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF, + ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK, ERR_MECHANICAL_PULLEY_CANNOT_MOVE, ERR_MECHANICAL_FSENSOR_TOO_EARLY, ERR_MECHANICAL_INSPECT_FINDA, @@ -98,27 +98,27 @@ static const constexpr uint16_t errorCodes[] PROGMEM = { ERR_MECHANICAL_SELECTOR_CANNOT_MOVE, ERR_MECHANICAL_IDLER_CANNOT_HOME, ERR_MECHANICAL_IDLER_CANNOT_MOVE, - ERR_TEMPERATURE_PULLEY_WARNING_TMC_TOO_HOT, - ERR_TEMPERATURE_SELECTOR_WARNING_TMC_TOO_HOT, - ERR_TEMPERATURE_IDLER_WARNING_TMC_TOO_HOT, - ERR_TEMPERATURE_PULLEY_TMC_OVERHEAT_ERROR, - ERR_TEMPERATURE_SELECTOR_TMC_OVERHEAT_ERROR, - ERR_TEMPERATURE_IDLER_TMC_OVERHEAT_ERROR, - ERR_ELECTRICAL_PULLEY_TMC_DRIVER_ERROR, - ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_ERROR, - ERR_ELECTRICAL_IDLER_TMC_DRIVER_ERROR, - ERR_ELECTRICAL_PULLEY_TMC_DRIVER_RESET, - ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_RESET, - ERR_ELECTRICAL_IDLER_TMC_DRIVER_RESET, - ERR_ELECTRICAL_PULLEY_TMC_UNDERVOLTAGE_ERROR, - ERR_ELECTRICAL_SELECTOR_TMC_UNDERVOLTAGE_ERROR, - ERR_ELECTRICAL_IDLER_TMC_UNDERVOLTAGE_ERROR, - ERR_ELECTRICAL_PULLEY_TMC_DRIVER_SHORTED, - ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_SHORTED, - ERR_ELECTRICAL_IDLER_TMC_DRIVER_SHORTED, - ERR_ELECTRICAL_PULLEY_SELFTEST_FAILED, - ERR_ELECTRICAL_SELECTOR_SELFTEST_FAILED, - ERR_ELECTRICAL_IDLER_SELFTEST_FAILED, + ERR_TEMPERATURE_WARNING_TMC_PULLEY_TOO_HOT, + ERR_TEMPERATURE_WARNING_TMC_SELECTOR_TOO_HOT, + ERR_TEMPERATURE_WARNING_TMC_IDLER_TOO_HOT, + ERR_TEMPERATURE_TMC_PULLEY_OVERHEAT_ERROR, + ERR_TEMPERATURE_TMC_SELECTOR_OVERHEAT_ERROR, + ERR_TEMPERATURE_TMC_IDLER_OVERHEAT_ERROR, + ERR_ELECTRICAL_TMC_PULLEY_DRIVER_ERROR, + ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_ERROR, + ERR_ELECTRICAL_TMC_IDLER_DRIVER_ERROR, + ERR_ELECTRICAL_TMC_PULLEY_DRIVER_RESET, + ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_RESET, + ERR_ELECTRICAL_TMC_IDLER_DRIVER_RESET, + ERR_ELECTRICAL_TMC_PULLEY_UNDERVOLTAGE_ERROR, + ERR_ELECTRICAL_TMC_SELECTOR_UNDERVOLTAGE_ERROR, + ERR_ELECTRICAL_TMC_IDLER_UNDERVOLTAGE_ERROR, + ERR_ELECTRICAL_TMC_PULLEY_DRIVER_SHORTED, + ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_SHORTED, + ERR_ELECTRICAL_TMC_IDLER_DRIVER_SHORTED, + ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED, + ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED, + ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED, ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC, ERR_CONNECT_MMU_NOT_RESPONDING, ERR_CONNECT_COMMUNICATION_ERROR, @@ -128,14 +128,15 @@ static const constexpr uint16_t errorCodes[] PROGMEM = { ERR_SYSTEM_FW_UPDATE_NEEDED, ERR_SYSTEM_FW_RUNTIME_ERROR, ERR_SYSTEM_UNLOAD_MANUALLY, - ERR_SYSTEM_FILAMENT_EJECTED + ERR_SYSTEM_FILAMENT_EJECTED, + ERR_OTHER_UNKNOWN_ERROR }; // @@TODO some of the strings are duplicates, can be merged into one 01234567890123456789 static const char MSG_TITLE_FINDA_DIDNT_TRIGGER[] PROGMEM_I1 = ISTR("FINDA DIDNT TRIGGER"); ////MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -static const char MSG_TITLE_FINDA_DIDNT_GO_OFF[] PROGMEM_I1 = ISTR("FINDA: FILAM. STUCK"); ////MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 +static const char MSG_TITLE_FINDA_FILAMENT_STUCK[] PROGMEM_I1 = ISTR("FINDA FILAM. STUCK"); ////MSG_TITLE_FINDA_FILAMENT_STUCK c=20 static const char MSG_TITLE_FSENSOR_DIDNT_TRIGGER[] PROGMEM_I1 = ISTR("FSENSOR DIDNT TRIGG."); ////MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -static const char MSG_TITLE_FSENSOR_DIDNT_GO_OFF[] PROGMEM_I1 = ISTR("FSENSOR: FIL. STUCK"); ////MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 +static const char MSG_TITLE_FSENSOR_FILAMENT_STUCK[] PROGMEM_I1 = ISTR("FSENSOR FIL. STUCK"); ////MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 static const char MSG_TITLE_PULLEY_CANNOT_MOVE[] PROGMEM_I1 = ISTR("PULLEY CANNOT MOVE"); ////MSG_TITLE_PULLEY_CANNOT_MOVE c=20 static const char MSG_TITLE_FSENSOR_TOO_EARLY[] PROGMEM_I1 = ISTR("FSENSOR TOO EARLY"); ////MSG_TITLE_FSENSOR_TOO_EARLY c=20 static const char MSG_TITLE_INSPECT_FINDA[] PROGMEM_I1 = ISTR("INSPECT FINDA"); ////MSG_TITLE_INSPECT_FINDA c=20 @@ -145,40 +146,50 @@ static const char MSG_TITLE_SELECTOR_CANNOT_HOME[] PROGMEM_I1 = ISTR("SELECTO static const char MSG_TITLE_IDLER_CANNOT_MOVE[] PROGMEM_I1 = ISTR("IDLER CANNOT MOVE"); ////MSG_TITLE_IDLER_CANNOT_MOVE c=20 static const char MSG_TITLE_IDLER_CANNOT_HOME[] PROGMEM_I1 = ISTR("IDLER CANNOT HOME"); ////MSG_TITLE_IDLER_CANNOT_HOME c=20 static const char MSG_TITLE_TMC_WARNING_TMC_TOO_HOT[] PROGMEM_I1 = ISTR("WARNING TMC TOO HOT"); ////MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -//static const char MSG_TITLE_TMC_WARNING_TMC_TOO_HOT[] PROGMEM_I1 = ISTR("WARNING TMC TOO HOT"); ////MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -//static const char MSG_TITLE_TMC_WARNING_TMC_TOO_HOT[] PROGMEM_I1 = ISTR("WARNING TMC TOO HOT"); +//static const char MSG_TITLE_WARNING_TMC_PULLEY_TOO_HOT[] PROGMEM_I1 = ISTR("WARNING TMC TOO HOT"); +//static const char MSG_TITLE_WARNING_TMC_SELECTOR_TOO_HOT[] PROGMEM_I1 = ISTR("WARNING TMC TOO HOT"); +//static const char MSG_TITLE_WARNING_TMC_IDLER_TOO_HOT[] PROGMEM_I1 = ISTR("WARNING TMC TOO HOT"); static const char MSG_TITLE_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC OVERHEAT ERROR"); ////MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -//static const char MSG_TITLE_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC OVERHEAT ERROR"); -//static const char MSG_TITLE_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC OVERHEAT ERROR"); +//static const char MSG_TITLE_TMC_PULLEY_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC OVERHEAT ERROR"); +//static const char MSG_TITLE_TMC_SELECTOR_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC OVERHEAT ERROR"); +//static const char MSG_TITLE_TMC_IDLER_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC OVERHEAT ERROR"); static const char MSG_TITLE_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC DRIVER ERROR"); ////MSG_TITLE_TMC_DRIVER_ERROR c=20 -//static const char MSG_TITLE_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC DRIVER ERROR"); -//static const char MSG_TITLE_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC DRIVER ERROR"); +//static const char MSG_TITLE_TMC_PULLEY_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC DRIVER ERROR"); +//static const char MSG_TITLE_TMC_SELECTOR_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC DRIVER ERROR"); +//static const char MSG_TITLE_TMC_IDLER_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC DRIVER ERROR"); static const char MSG_TITLE_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC DRIVER RESET"); ////MSG_TITLE_TMC_DRIVER_RESET c=20 -//static const char MSG_TITLE_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC DRIVER RESET"); -//static const char MSG_TITLE_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC DRIVER RESET"); +//static const char MSG_TITLE_TMC_PULLEY_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC DRIVER RESET"); +//static const char MSG_TITLE_TMC_SELECTOR_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC DRIVER RESET"); +//static const char MSG_TITLE_TMC_IDLER_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC DRIVER RESET"); static const char MSG_TITLE_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("TMC UNDERVOLTAGE ERR"); ////MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -//static const char MSG_TITLE_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("TMC UNDERVOLTAGE ERR"); -//static const char MSG_TITLE_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("TMC UNDERVOLTAGE ERR"); +//static const char MSG_TITLE_TMC_PULLEY_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("TMC UNDERVOLTAGE ERR"); +//static const char MSG_TITLE_TMC_SELECTOR_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("TMC UNDERVOLTAGE ERR"); +//static const char MSG_TITLE_TMC_IDLER_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("TMC UNDERVOLTAGE ERR"); static const char MSG_TITLE_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); ////MSG_TITLE_TMC_DRIVER_SHORTED c=20 -//static const char MSG_TITLE_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); -//static const char MSG_TITLE_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); +//static const char MSG_TITLE_TMC_PULLEY_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); +//static const char MSG_TITLE_TMC_SELECTOR_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); +//static const char MSG_TITLE_TMC_IDLER_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("TMC DRIVER SHORTED"); static const char MSG_TITLE_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); ////MSG_TITLE_SELFTEST_FAILED c=20 -static const char MSG_TITLE_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MCU UNDERVOLTAGE VCC"); ////MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +//static const char MSG_TITLE_MMU_PULLEY_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); +//static const char MSG_TITLE_MMU_SELECTOR_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); +//static const char MSG_TITLE_MMU_IDLER_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); +static const char MSG_TITLE_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU UNDERPOWER"); ////MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 static const char MSG_TITLE_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU NOT RESPONDING"); ////MSG_TITLE_MMU_NOT_RESPONDING c=20 static const char MSG_TITLE_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("COMMUNICATION ERROR"); ////MSG_TITLE_COMMUNICATION_ERROR c=20 -static const char MSG_TITLE_FIL_ALREADY_LOADED[] PROGMEM_I1 = ISTR("FILAMENT ALREADY LOA"); ////MSG_TITLE_FIL_ALREADY_LOADED c=20 +static const char MSG_TITLE_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("FIL. ALREADY LOADED"); ////MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 static const char MSG_TITLE_INVALID_TOOL[] PROGMEM_I1 = ISTR("INVALID TOOL"); ////MSG_TITLE_INVALID_TOOL c=20 static const char MSG_TITLE_QUEUE_FULL[] PROGMEM_I1 = ISTR("QUEUE FULL"); ////MSG_TITLE_QUEUE_FULL c=20 static const char MSG_TITLE_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("MMU FW UPDATE NEEDED"); ////MSG_TITLE_FW_UPDATE_NEEDED c=20 static const char MSG_TITLE_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("FW RUNTIME ERROR"); ////MSG_TITLE_FW_RUNTIME_ERROR c=20 static const char MSG_TITLE_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("UNLOAD MANUALLY"); ////MSG_TITLE_UNLOAD_MANUALLY c=20 static const char MSG_TITLE_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("FILAMENT EJECTED"); ////MSG_TITLE_FILAMENT_EJECTED c=20 +static const char MSG_TITLE_UNKNOWN_ERROR[] PROGMEM_I1 = ISTR("UNKNOWN ERROR"); ////MSG_TITLE_UNKNOWN_ERROR c=20 static const char * const errorTitles [] PROGMEM = { _R(MSG_TITLE_FINDA_DIDNT_TRIGGER), - _R(MSG_TITLE_FINDA_DIDNT_GO_OFF), + _R(MSG_TITLE_FINDA_FILAMENT_STUCK), _R(MSG_TITLE_FSENSOR_DIDNT_TRIGGER), - _R(MSG_TITLE_FSENSOR_DIDNT_GO_OFF), + _R(MSG_TITLE_FSENSOR_FILAMENT_STUCK), _R(MSG_TITLE_PULLEY_CANNOT_MOVE), _R(MSG_TITLE_FSENSOR_TOO_EARLY), _R(MSG_TITLE_INSPECT_FINDA), @@ -211,49 +222,53 @@ static const char * const errorTitles [] PROGMEM = { _R(MSG_TITLE_MCU_UNDERVOLTAGE_VCC), _R(MSG_TITLE_MMU_NOT_RESPONDING), _R(MSG_TITLE_COMMUNICATION_ERROR), - _R(MSG_TITLE_FIL_ALREADY_LOADED), + _R(MSG_TITLE_FILAMENT_ALREADY_LOADED), _R(MSG_TITLE_INVALID_TOOL), _R(MSG_TITLE_QUEUE_FULL), _R(MSG_TITLE_FW_UPDATE_NEEDED), _R(MSG_TITLE_FW_RUNTIME_ERROR), _R(MSG_TITLE_UNLOAD_MANUALLY), - _R(MSG_TITLE_FILAMENT_EJECTED) + _R(MSG_TITLE_FILAMENT_EJECTED), + _R(MSG_TITLE_UNKNOWN_ERROR) }; // @@TODO looking at the texts, they can be composed of several parts and/or parametrized (could save a lot of space ;) ) // Moreover, some of them have been disabled in favour of saving some more code size. static const char MSG_DESC_FINDA_DIDNT_TRIGGER[] PROGMEM_I1 = ISTR("FINDA didn't trigger while loading the filament. Ensure the filament can move and FINDA works."); ////MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -static const char MSG_DESC_FINDA_DIDNT_GO_OFF[] PROGMEM_I1 = ISTR("FINDA didn't switch off while unloading filament. Try unloading manually. Ensure filament can move and FINDA works."); ////MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -static const char MSG_DESC_FSENSOR_DIDNT_TRIGGER[] PROGMEM_I1 = ISTR("Filament sensor didn't trigger while loading the filament. Ensure the filament reached the fsensor and the sensor works."); ////MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -static const char MSG_DESC_FSENSOR_DIDNT_GO_OFF[] PROGMEM_I1 = ISTR("Filament sensor didn't switch off while unloading filament. Ensure filament can move and the sensor works."); ////MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -static const char MSG_DESC_PULLEY_STALLED[] PROGMEM_I1 = ISTR("Pulley motor stalled. Ensure the pulley can move and check the wiring."); ////MSG_DESC_PULLEY_STALLED c=20 r=8 +static const char MSG_DESC_FINDA_FILAMENT_STUCK[] PROGMEM_I1 = ISTR("FINDA didn't switch off while unloading filament. Try unloading manually. Ensure filament can move and FINDA works."); ////MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +static const char MSG_DESC_FSENSOR_DIDNT_TRIGGER[] PROGMEM_I1 = ISTR("Filament sensor didn't trigger while loading the filament. Ensure the sensor is calibrated and the filament reached it."); ////MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 +static const char MSG_DESC_FSENSOR_FILAMENT_STUCK[] PROGMEM_I1 = ISTR("Filament sensor didn't switch off while unloading filament. Ensure filament can move and the sensor works."); ////MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +static const char MSG_DESC_PULLEY_CANNOT_MOVE[] PROGMEM_I1 = ISTR("Pulley motor stalled. Ensure the pulley can move and check the wiring."); ////MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 static const char MSG_DESC_FSENSOR_TOO_EARLY[] PROGMEM_I1 = ISTR("Filament sensor triggered too early while loading to extruder. Check there isn't anything stuck in PTFE tube. Check that sensor reads properly."); ////MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 static const char MSG_DESC_INSPECT_FINDA[] PROGMEM_I1 = ISTR("Selector can't move due to FINDA detecting a filament. Make sure no filament is in selector and FINDA works properly."); ////MSG_DESC_INSPECT_FINDA c=20 r=8 static const char MSG_DESC_LOAD_TO_EXTRUDER_FAILED[] PROGMEM_I1 = ISTR("Loading to extruder failed. Inspect the filament tip shape. Refine the sensor calibration, if needed."); ////MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 static const char MSG_DESC_SELECTOR_CANNOT_HOME[] PROGMEM_I1 = ISTR("The Selector cannot home properly. Check for anything blocking its movement."); ////MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 static const char MSG_DESC_CANNOT_MOVE[] PROGMEM_I1 = ISTR("Can't move Selector or Idler."); /////MSG_DESC_CANNOT_MOVE c=20 r=4 -//static const char MSG_DESC_SELECTOR_CANNOT_MOVE[] PROGMEM_I1 = ISTR("The Selector cannot move. Check for anything blocking its movement. Check the wiring is correct."); +//static const char MSG_DESC_SELECTOR_CANNOT_MOVE[] PROGMEM_I1 = ISTR("The Selector cannot move. Check for anything blocking its movement. Check if the wiring is correct."); static const char MSG_DESC_IDLER_CANNOT_HOME[] PROGMEM_I1 = ISTR("The Idler cannot home properly. Check for anything blocking its movement."); ////MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -//static const char MSG_DESC_IDLER_CANNOT_MOVE[] PROGMEM_I1 = ISTR("The Idler cannot move properly. Check for anything blocking its movement. Check the wiring is correct."); +//static const char MSG_DESC_IDLER_CANNOT_MOVE[] PROGMEM_I1 = ISTR("The Idler cannot move properly. Check for anything blocking its movement. Check if the wiring is correct."); static const char MSG_DESC_TMC[] PROGMEM_I1 = ISTR("More details online."); ////MSG_DESC_TMC c=20 r=8 -//static const char MSG_DESC_PULLEY_WARNING_TMC_TOO_HOT[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is almost overheating. Make sure there is sufficient airflow near the MMU board."); -//static const char MSG_DESC_SELECTOR_WARNING_TMC_TOO_HOT[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is almost overheating. Make sure there is sufficient airflow near the MMU board."); -//static const char MSG_DESC_IDLER_WARNING_TMC_TOO_HOT[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is almost overheating. Make sure there is sufficient airflow near the MMU board."); -//static const char MSG_DESC_PULLEY_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is overheated. Cool down the MMU board and reset MMU."); -//static const char MSG_DESC_SELECTOR_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is overheated. Cool down the MMU board and reset MMU."); -//static const char MSG_DESC_IDLER_TMC_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is overheated. Cool down the MMU board and reset MMU."); -//static const char MSG_DESC_PULLEY_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is not responding. Try resetting the MMU."); -//static const char MSG_DESC_SELECTOR_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is not responding. Try resetting the MMU."); -//static const char MSG_DESC_IDLER_TMC_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is not responding. Try resetting the MMU."); -//static const char MSG_DESC_PULLEY_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_SELECTOR_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_IDLER_TMC_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_PULLEY_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Pulley TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_SELECTOR_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Selector TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_IDLER_TMC_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Idler TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); -//static const char MSG_DESC_PULLEY_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Pulley TMC driver. Check the wiring and connectors."); -//static const char MSG_DESC_SELECTOR_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors."); -//static const char MSG_DESC_IDLER_TMC_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors."); +//static const char MSG_DESC_WARNING_TMC_PULLEY_TOO_HOT[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is almost overheating. Make sure there is sufficient airflow near the MMU board."); +//static const char MSG_DESC_WARNING_TMC_SELECTOR_TOO_HOT[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is almost overheating. Make sure there is sufficient airflow near the MMU board."); +//static const char MSG_DESC_WARNING_TMC_IDLER_TOO_HOT[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is almost overheating. Make sure there is sufficient airflow near the MMU board."); +//static const char MSG_DESC_TMC_PULLEY_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is overheated. Cool down the MMU board and reset MMU."); +//static const char MSG_DESC_TMC_SELECTOR_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is overheated. Cool down the MMU board and reset MMU."); +//static const char MSG_DESC_TMC_IDLER_OVERHEAT_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is overheated. Cool down the MMU board and reset MMU."); +//static const char MSG_DESC_TMC_PULLEY_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor is not responding. Try resetting the MMU. If the issue persists contact support."); +//static const char MSG_DESC_TMC_SELECTOR_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor is not responding. Try resetting the MMU. If the issue persists contact support."); +//static const char MSG_DESC_TMC_IDLER_DRIVER_ERROR[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor is not responding. Try resetting the MMU. If the issue persists contact support."); +//static const char MSG_DESC_TMC_PULLEY_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Pulley motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); +//static const char MSG_DESC_TMC_SELECTOR_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Selector motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); +//static const char MSG_DESC_TMC_IDLER_DRIVER_RESET[] PROGMEM_I1 = ISTR("TMC driver for the Idler motor was restarted. There is probably an issue with the electronics. Check the wiring and connectors."); +//static const char MSG_DESC_TMC_PULLEY_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Pulley TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); +//static const char MSG_DESC_TMC_SELECTOR_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Selector TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); +//static const char MSG_DESC_TMC_IDLER_UNDERVOLTAGE_ERROR[] PROGMEM_I1 = ISTR("Not enough current for the Idler TMC driver. There is probably an issue with the electronics. Check the wiring and connectors."); +//static const char MSG_DESC_TMC_PULLEY_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Pulley TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_TMC_SELECTOR_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Selector TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_TMC_IDLER_DRIVER_SHORTED[] PROGMEM_I1 = ISTR("Short circuit on the Idler TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_MMU_PULLEY_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU selftest failed on the Pulley TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_MMU_SELECTOR_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU selftest failed on the Selector TMC driver. Check the wiring and connectors. If the issue persists contact support."); +//static const char MSG_DESC_MMU_IDLER_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU selftest failed on the Idler TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU detected a 5V undervoltage. There might be an issue with the electronics. Check the wiring and connectors"); ////MSG_DESC_MCU_UNDERVOLTAGE_VCC c=20 r=8 static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=4 @@ -263,9 +278,10 @@ static const char MSG_DESC_QUEUE_FULL[] PROGMEM_I1 = ISTR("MMU Firmware internal static const char MSG_DESC_FW_RUNTIME_ERROR[] PROGMEM_I1 = ISTR("Internal runtime error. Try resetting the MMU or updating the firmware."); ////MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 static const char MSG_DESC_UNLOAD_MANUALLY[] PROGMEM_I1 = ISTR("Filament detected unexpectedly. Ensure no filament is loaded. Check the sensors and wiring."); ////MSG_DESC_UNLOAD_MANUALLY c=20 r=8 static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejected filament from the front of the MMU."); ////MSG_DESC_FILAMENT_EJECTED c=20 r=8 +static const char MSG_DESC_UNKNOWN_ERROR[] PROGMEM_I1 = ISTR("Unexpected error occurred."); ////MSG_DESC_UNKNOWN_ERROR c=20 r=8 // Read explanation in mmu2_protocol_logic.cpp -> supportedMmuFWVersion -static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("The MMU firmware version incompatible with the printer's FW. Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 +static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("MMU FW version is incompatible with printer FW.Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 static constexpr uint8_t szFWUN = sizeof(MSG_DESC_FW_UPDATE_NEEDED); // at least check the individual version characters in MSG_DESC_FW_UPDATE_NEEDED static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 7] == ('0' + mmuVersionMajor)); @@ -274,10 +290,10 @@ static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 3] == ('0' + mmuVersionPatch)); static const char * const errorDescs[] PROGMEM = { _R(MSG_DESC_FINDA_DIDNT_TRIGGER), - _R(MSG_DESC_FINDA_DIDNT_GO_OFF), + _R(MSG_DESC_FINDA_FILAMENT_STUCK), _R(MSG_DESC_FSENSOR_DIDNT_TRIGGER), - _R(MSG_DESC_FSENSOR_DIDNT_GO_OFF), - _R(MSG_DESC_PULLEY_STALLED), + _R(MSG_DESC_FSENSOR_FILAMENT_STUCK), + _R(MSG_DESC_PULLEY_CANNOT_MOVE), _R(MSG_DESC_FSENSOR_TOO_EARLY), _R(MSG_DESC_INSPECT_FINDA), _R(MSG_DESC_LOAD_TO_EXTRUDER_FAILED), @@ -285,27 +301,27 @@ static const char * const errorDescs[] PROGMEM = { _R(MSG_DESC_CANNOT_MOVE), _R(MSG_DESC_IDLER_CANNOT_HOME), _R(MSG_DESC_CANNOT_MOVE), - _R(MSG_DESC_TMC), // descPULLEY_WARNING_TMC_TOO_HOT - _R(MSG_DESC_TMC), // descSELECTOR_WARNING_TMC_TOO_HOT - _R(MSG_DESC_TMC), // descIDLER_WARNING_TMC_TOO_HOT - _R(MSG_DESC_TMC), // descPULLEY_TMC_OVERHEAT_ERROR - _R(MSG_DESC_TMC), // descSELECTOR_TMC_OVERHEAT_ERROR - _R(MSG_DESC_TMC), // descIDLER_TMC_OVERHEAT_ERROR - _R(MSG_DESC_TMC), // descPULLEY_TMC_DRIVER_ERROR - _R(MSG_DESC_TMC), // descSELECTOR_TMC_DRIVER_ERROR - _R(MSG_DESC_TMC), // descIDLER_TMC_DRIVER_ERROR - _R(MSG_DESC_TMC), // descPULLEY_TMC_DRIVER_RESET - _R(MSG_DESC_TMC), // descSELECTOR_TMC_DRIVER_RESET - _R(MSG_DESC_TMC), // descIDLER_TMC_DRIVER_RESET - _R(MSG_DESC_TMC), // descPULLEY_TMC_UNDERVOLTAGE_ERROR - _R(MSG_DESC_TMC), // descSELECTOR_TMC_UNDERVOLTAGE_ERROR - _R(MSG_DESC_TMC), // descIDLER_TMC_UNDERVOLTAGE_ERROR - _R(MSG_DESC_TMC), // descPULLEY_TMC_DRIVER_SHORTED - _R(MSG_DESC_TMC), // descSELECTOR_TMC_DRIVER_SHORTED - _R(MSG_DESC_TMC), // descIDLER_TMC_DRIVER_SHORTED - _R(MSG_DESC_TMC), // descPULLEY_SELFTEST_FAILED - _R(MSG_DESC_TMC), // descSELECTOR_SELFTEST_FAILED - _R(MSG_DESC_TMC), // descIDLER_SELFTEST_FAILED + _R(MSG_DESC_TMC), // descWARNING_TMC_PULLEY_TOO_HOT + _R(MSG_DESC_TMC), // descWARNING_TMC_SELECTOR_TOO_HOT + _R(MSG_DESC_TMC), // descWARNING_TMC_IDLER_TOO_HOT + _R(MSG_DESC_TMC), // descTMC_PULLEY_OVERHEAT_ERROR + _R(MSG_DESC_TMC), // descTMC_SELECTOR_OVERHEAT_ERROR + _R(MSG_DESC_TMC), // descTMC_IDLER_OVERHEAT_ERROR + _R(MSG_DESC_TMC), // descTMC_PULLEY_DRIVER_ERROR + _R(MSG_DESC_TMC), // descTMC_SELECTOR_DRIVER_ERROR + _R(MSG_DESC_TMC), // descTMC_IDLER_DRIVER_ERROR + _R(MSG_DESC_TMC), // descTMC_PULLEY_DRIVER_RESET + _R(MSG_DESC_TMC), // descTMC_SELECTOR_DRIVER_RESET + _R(MSG_DESC_TMC), // descTMC_IDLER_DRIVER_RESET + _R(MSG_DESC_TMC), // descTMC_PULLEY_UNDERVOLTAGE_ERROR + _R(MSG_DESC_TMC), // descTMC_SELECTOR_UNDERVOLTAGE_ERROR + _R(MSG_DESC_TMC), // descTMC_IDLER_UNDERVOLTAGE_ERROR + _R(MSG_DESC_TMC), // descTMC_PULLEY_DRIVER_SHORTED + _R(MSG_DESC_TMC), // descTMC_SELECTOR_DRIVER_SHORTED + _R(MSG_DESC_TMC), // descTMC_IDLER_DRIVER_SHORTED + _R(MSG_DESC_TMC), // descMMU_PULLEY_SELFTEST_FAILED + _R(MSG_DESC_TMC), // descMMU_SELECTOR_SELFTEST_FAILED + _R(MSG_DESC_TMC), // descMMU_IDLER_SELFTEST_FAILED _R(MSG_DESC_TMC), // descMSG_DESC_MCU_UNDERVOLTAGE_VCC _R(MSG_DESC_MMU_NOT_RESPONDING), _R(MSG_DESC_COMMUNICATION_ERROR), @@ -315,7 +331,8 @@ static const char * const errorDescs[] PROGMEM = { _R(MSG_DESC_FW_UPDATE_NEEDED), _R(MSG_DESC_FW_RUNTIME_ERROR), _R(MSG_DESC_UNLOAD_MANUALLY), - _R(MSG_DESC_FILAMENT_EJECTED) + _R(MSG_DESC_FILAMENT_EJECTED), + _R(MSG_DESC_UNKNOWN_ERROR) }; // we have max 3 buttons/operations to select from @@ -328,7 +345,7 @@ static const char * const errorDescs[] PROGMEM = { // -> the left button on the MMU is not used/rendered on the LCD (it is also almost unused on the MMU side) static const char MSG_BTN_RETRY[] PROGMEM_I1 = ISTR("Retry"); ////MSG_BTN_RETRY c=8 static const char MSG_BTN_CONTINUE[] PROGMEM_I1 = ISTR("Done"); ////MSG_BTN_CONTINUE c=8 -static const char MSG_BTN_RESTART_MMU[] PROGMEM_I1 = ISTR("RstMMU"); ////MSG_BTN_RESTART_MMU c=8 +static const char MSG_BTN_RESET_MMU[] PROGMEM_I1 = ISTR("ResetMMU"); ////MSG_BTN_RESET_MMU c=8 static const char MSG_BTN_UNLOAD[] PROGMEM_I1 = ISTR("Unload"); ////MSG_BTN_UNLOAD c=8 static const char MSG_BTN_STOP[] PROGMEM_I1 = ISTR("Stop"); ////MSG_BTN_STOP c=8 static const char MSG_BTN_DISABLE_MMU[] PROGMEM_I1 = ISTR("Disable"); ////MSG_BTN_DISABLE_MMU c=8 @@ -338,7 +355,7 @@ static const char MSG_BTN_MORE[] PROGMEM_N1 = "\x06"; static const char * const btnOperation[] PROGMEM = { _R(MSG_BTN_RETRY), _R(MSG_BTN_CONTINUE), - _R(MSG_BTN_RESTART_MMU), + _R(MSG_BTN_RESET_MMU), _R(MSG_BTN_UNLOAD), _R(MSG_BTN_STOP), _R(MSG_BTN_DISABLE_MMU), @@ -353,11 +370,11 @@ uint8_t constexpr Btns(ButtonOperations bMiddle, ButtonOperations bRight){ static const uint8_t errorButtons[] PROGMEM = { Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FINDA_DIDNT_TRIGGER - Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FINDA_DIDNT_GO_OFF + Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FINDA_FILAMENT_STUCK Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_DIDNT_TRIGGER - Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_DIDNT_GO_OFF + Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_FILAMENT_STUCK - Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//PULLEY_STALLED + Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//PULLEY_CANNOT_MOVE Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//FSENSOR_TOO_EARLY Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//INSPECT_FINDA Btns(ButtonOperations::Continue, ButtonOperations::NoOperation),//LOAD_TO_EXTRUDER_FAILED @@ -366,39 +383,40 @@ static const uint8_t errorButtons[] PROGMEM = { Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//IDLER_CANNOT_HOME Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//IDLER_CANNOT_MOVE - Btns(ButtonOperations::Continue, ButtonOperations::RestartMMU),//PULLEY_WARNING_TMC_TOO_HOT - Btns(ButtonOperations::Continue, ButtonOperations::RestartMMU),//SELECTOR_WARNING_TMC_TOO_HOT - Btns(ButtonOperations::Continue, ButtonOperations::RestartMMU),//IDLER_WARNING_TMC_TOO_HOT + Btns(ButtonOperations::Continue, ButtonOperations::ResetMMU),//WARNING_TMC_PULLEY_TOO_HOT + Btns(ButtonOperations::Continue, ButtonOperations::ResetMMU),//WARNING_TMC_SELECTOR_TOO_HOT + Btns(ButtonOperations::Continue, ButtonOperations::ResetMMU),//WARNING_TMC_IDLER_TOO_HOT - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_TMC_OVERHEAT_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_TMC_OVERHEAT_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_TMC_OVERHEAT_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_TMC_DRIVER_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_TMC_DRIVER_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_TMC_DRIVER_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_TMC_DRIVER_RESET - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_TMC_DRIVER_RESET - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_TMC_DRIVER_RESET - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_TMC_UNDERVOLTAGE_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_TMC_UNDERVOLTAGE_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_TMC_UNDERVOLTAGE_ERROR - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_TMC_DRIVER_SHORTED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_TMC_DRIVER_SHORTED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_TMC_DRIVER_SHORTED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//PULLEY_SELFTEST_FAILED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//SELECTOR_SELFTEST_FAILED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//IDLER_SELFTEST_FAILED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//MCU_UNDERVOLTAGE_VCC - Btns(ButtonOperations::RestartMMU, ButtonOperations::DisableMMU),//MMU_NOT_RESPONDING - Btns(ButtonOperations::RestartMMU, ButtonOperations::DisableMMU),//COMMUNICATION_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_PULLEY_OVERHEAT_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_SELECTOR_OVERHEAT_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_IDLER_OVERHEAT_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_PULLEY_DRIVER_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_SELECTOR_DRIVER_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_IDLER_DRIVER_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_PULLEY_DRIVER_RESET + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_SELECTOR_DRIVER_RESET + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_IDLER_DRIVER_RESET + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_PULLEY_UNDERVOLTAGE_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_SELECTOR_UNDERVOLTAGE_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_IDLER_UNDERVOLTAGE_ERROR + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_PULLEY_DRIVER_SHORTED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_SELECTOR_DRIVER_SHORTED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//TMC_IDLER_DRIVER_SHORTED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_PULLEY_SELFTEST_FAILED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_SELECTOR_SELFTEST_FAILED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_IDLER_SELFTEST_FAILED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MCU_UNDERVOLTAGE_VCC + Btns(ButtonOperations::ResetMMU, ButtonOperations::DisableMMU),//MMU_NOT_RESPONDING + Btns(ButtonOperations::ResetMMU, ButtonOperations::DisableMMU),//COMMUNICATION_ERROR Btns(ButtonOperations::Unload, ButtonOperations::Continue),//FILAMENT_ALREADY_LOADED - Btns(ButtonOperations::StopPrint, ButtonOperations::RestartMMU),//INVALID_TOOL - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//QUEUE_FULL - Btns(ButtonOperations::RestartMMU, ButtonOperations::DisableMMU),//FW_UPDATE_NEEDED - Btns(ButtonOperations::RestartMMU, ButtonOperations::NoOperation),//FW_RUNTIME_ERROR + Btns(ButtonOperations::StopPrint, ButtonOperations::ResetMMU),//INVALID_TOOL + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//QUEUE_FULL + Btns(ButtonOperations::ResetMMU, ButtonOperations::DisableMMU),//FW_UPDATE_NEEDED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//FW_RUNTIME_ERROR Btns(ButtonOperations::Retry, ButtonOperations::NoOperation),//UNLOAD_MANUALLY Btns(ButtonOperations::Continue, ButtonOperations::NoOperation),//FILAMENT_EJECTED + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//UNKOWN_ERROR }; static_assert( sizeof(errorCodes) / sizeof(errorCodes[0]) == sizeof(errorDescs) / sizeof (errorDescs[0])); diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 0f9975026..510e38bd4 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -31,20 +31,20 @@ static constexpr uint8_t FindErrorIndex(uint16_t pec) { // check that the searching algoritm works static_assert( FindErrorIndex(ERR_MECHANICAL_FINDA_DIDNT_TRIGGER) == 0); -static_assert( FindErrorIndex(ERR_MECHANICAL_FINDA_DIDNT_GO_OFF) == 1); +static_assert( FindErrorIndex(ERR_MECHANICAL_FINDA_FILAMENT_STUCK) == 1); static_assert( FindErrorIndex(ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER) == 2); -static_assert( FindErrorIndex(ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF) == 3); +static_assert( FindErrorIndex(ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK) == 3); uint8_t PrusaErrorCodeIndex(uint16_t ec) { switch (ec) { case (uint16_t)ErrorCode::FINDA_DIDNT_SWITCH_ON: return FindErrorIndex(ERR_MECHANICAL_FINDA_DIDNT_TRIGGER); case (uint16_t)ErrorCode::FINDA_DIDNT_SWITCH_OFF: - return FindErrorIndex(ERR_MECHANICAL_FINDA_DIDNT_GO_OFF); + return FindErrorIndex(ERR_MECHANICAL_FINDA_FILAMENT_STUCK); case (uint16_t)ErrorCode::FSENSOR_DIDNT_SWITCH_ON: return FindErrorIndex(ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER); case (uint16_t)ErrorCode::FSENSOR_DIDNT_SWITCH_OFF: - return FindErrorIndex(ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF); + return FindErrorIndex(ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK); case (uint16_t)ErrorCode::FSENSOR_TOO_EARLY: return FindErrorIndex(ERR_MECHANICAL_FSENSOR_TOO_EARLY); case (uint16_t)ErrorCode::FINDA_FLICKERS: @@ -93,13 +93,13 @@ uint8_t PrusaErrorCodeIndex(uint16_t ec) { // and to keep the code size down. if (ec & (uint16_t)ErrorCode::TMC_PULLEY_BIT) { if ((ec & (uint16_t)ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) == (uint16_t)ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) - return FindErrorIndex(ERR_ELECTRICAL_PULLEY_SELFTEST_FAILED); + return FindErrorIndex(ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED); } else if (ec & (uint16_t)ErrorCode::TMC_SELECTOR_BIT) { if ((ec & (uint16_t)ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) == (uint16_t)ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) - return FindErrorIndex(ERR_ELECTRICAL_SELECTOR_SELFTEST_FAILED); + return FindErrorIndex(ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED); } else if (ec & (uint16_t)ErrorCode::TMC_IDLER_BIT) { if ((ec & (uint16_t)ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) == (uint16_t)ErrorCode::MMU_SOLDERING_NEEDS_ATTENTION) - return FindErrorIndex(ERR_ELECTRICAL_IDLER_SELFTEST_FAILED); + return FindErrorIndex(ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED); } // TMC-related errors - multiple of these can occur at once @@ -107,47 +107,47 @@ uint8_t PrusaErrorCodeIndex(uint16_t ec) { // By carefully ordering the checks here we can prioritize the errors being reported to the user. if (ec & (uint16_t)ErrorCode::TMC_PULLEY_BIT) { if (ec & (uint16_t)ErrorCode::TMC_IOIN_MISMATCH) - return FindErrorIndex(ERR_ELECTRICAL_PULLEY_TMC_DRIVER_ERROR); + return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_DRIVER_ERROR); if (ec & (uint16_t)ErrorCode::TMC_RESET) - return FindErrorIndex(ERR_ELECTRICAL_PULLEY_TMC_DRIVER_RESET); + return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_DRIVER_RESET); if (ec & (uint16_t)ErrorCode::TMC_UNDERVOLTAGE_ON_CHARGE_PUMP) - return FindErrorIndex(ERR_ELECTRICAL_PULLEY_TMC_UNDERVOLTAGE_ERROR); + return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_UNDERVOLTAGE_ERROR); if (ec & (uint16_t)ErrorCode::TMC_SHORT_TO_GROUND) - return FindErrorIndex(ERR_ELECTRICAL_PULLEY_TMC_DRIVER_SHORTED); + return FindErrorIndex(ERR_ELECTRICAL_TMC_PULLEY_DRIVER_SHORTED); if (ec & (uint16_t)ErrorCode::TMC_OVER_TEMPERATURE_WARN) - return FindErrorIndex(ERR_TEMPERATURE_PULLEY_WARNING_TMC_TOO_HOT); + return FindErrorIndex(ERR_TEMPERATURE_WARNING_TMC_PULLEY_TOO_HOT); if (ec & (uint16_t)ErrorCode::TMC_OVER_TEMPERATURE_ERROR) - return FindErrorIndex(ERR_TEMPERATURE_PULLEY_TMC_OVERHEAT_ERROR); + return FindErrorIndex(ERR_TEMPERATURE_TMC_PULLEY_OVERHEAT_ERROR); } else if (ec & (uint16_t)ErrorCode::TMC_SELECTOR_BIT) { if (ec & (uint16_t)ErrorCode::TMC_IOIN_MISMATCH) - return FindErrorIndex(ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_ERROR); + return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_ERROR); if (ec & (uint16_t)ErrorCode::TMC_RESET) - return FindErrorIndex(ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_RESET); + return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_RESET); if (ec & (uint16_t)ErrorCode::TMC_UNDERVOLTAGE_ON_CHARGE_PUMP) - return FindErrorIndex(ERR_ELECTRICAL_SELECTOR_TMC_UNDERVOLTAGE_ERROR); + return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_UNDERVOLTAGE_ERROR); if (ec & (uint16_t)ErrorCode::TMC_SHORT_TO_GROUND) - return FindErrorIndex(ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_SHORTED); + return FindErrorIndex(ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_SHORTED); if (ec & (uint16_t)ErrorCode::TMC_OVER_TEMPERATURE_WARN) - return FindErrorIndex(ERR_TEMPERATURE_SELECTOR_WARNING_TMC_TOO_HOT); + return FindErrorIndex(ERR_TEMPERATURE_WARNING_TMC_SELECTOR_TOO_HOT); if (ec & (uint16_t)ErrorCode::TMC_OVER_TEMPERATURE_ERROR) - return FindErrorIndex(ERR_TEMPERATURE_SELECTOR_TMC_OVERHEAT_ERROR); + return FindErrorIndex(ERR_TEMPERATURE_TMC_SELECTOR_OVERHEAT_ERROR); } else if (ec & (uint16_t)ErrorCode::TMC_IDLER_BIT) { if (ec & (uint16_t)ErrorCode::TMC_IOIN_MISMATCH) - return FindErrorIndex(ERR_ELECTRICAL_IDLER_TMC_DRIVER_ERROR); + return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_DRIVER_ERROR); if (ec & (uint16_t)ErrorCode::TMC_RESET) - return FindErrorIndex(ERR_ELECTRICAL_IDLER_TMC_DRIVER_RESET); + return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_DRIVER_RESET); if (ec & (uint16_t)ErrorCode::TMC_UNDERVOLTAGE_ON_CHARGE_PUMP) - return FindErrorIndex(ERR_ELECTRICAL_IDLER_TMC_UNDERVOLTAGE_ERROR); + return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_UNDERVOLTAGE_ERROR); if (ec & (uint16_t)ErrorCode::TMC_SHORT_TO_GROUND) - return FindErrorIndex(ERR_ELECTRICAL_IDLER_TMC_DRIVER_SHORTED); + return FindErrorIndex(ERR_ELECTRICAL_TMC_IDLER_DRIVER_SHORTED); if (ec & (uint16_t)ErrorCode::TMC_OVER_TEMPERATURE_WARN) - return FindErrorIndex(ERR_TEMPERATURE_IDLER_WARNING_TMC_TOO_HOT); + return FindErrorIndex(ERR_TEMPERATURE_WARNING_TMC_IDLER_TOO_HOT); if (ec & (uint16_t)ErrorCode::TMC_OVER_TEMPERATURE_ERROR) - return FindErrorIndex(ERR_TEMPERATURE_IDLER_TMC_OVERHEAT_ERROR); + return FindErrorIndex(ERR_TEMPERATURE_TMC_IDLER_OVERHEAT_ERROR); } // if nothing got caught, return a generic runtime error - return FindErrorIndex(ERR_SYSTEM_FW_RUNTIME_ERROR); + return FindErrorIndex(ERR_OTHER_UNKNOWN_ERROR); } uint16_t PrusaErrorCode(uint8_t i){ @@ -195,14 +195,14 @@ Buttons ButtonAvailable(uint16_t ec) { uint8_t ei = PrusaErrorCodeIndex(ec); // The list of responses which occur in mmu error dialogs - // Return button index or perform some action on the MK3 by itself (like restart MMU) + // Return button index or perform some action on the MK3 by itself (like Reset MMU) // Based on Prusa-Error-Codes errors_list.h // So far hardcoded, but shall be generated in the future switch ( PrusaErrorCode(ei) ) { case ERR_MECHANICAL_FINDA_DIDNT_TRIGGER: - case ERR_MECHANICAL_FINDA_DIDNT_GO_OFF: + case ERR_MECHANICAL_FINDA_FILAMENT_STUCK: case ERR_MECHANICAL_FSENSOR_DIDNT_TRIGGER: - case ERR_MECHANICAL_FSENSOR_DIDNT_GO_OFF: + case ERR_MECHANICAL_FSENSOR_FILAMENT_STUCK: case ERR_MECHANICAL_FSENSOR_TOO_EARLY: case ERR_MECHANICAL_INSPECT_FINDA: case ERR_MECHANICAL_SELECTOR_CANNOT_HOME: @@ -228,49 +228,49 @@ Buttons ButtonAvailable(uint16_t ec) { break; } break; - case ERR_TEMPERATURE_PULLEY_WARNING_TMC_TOO_HOT: - case ERR_TEMPERATURE_SELECTOR_WARNING_TMC_TOO_HOT: - case ERR_TEMPERATURE_IDLER_WARNING_TMC_TOO_HOT: + case ERR_TEMPERATURE_WARNING_TMC_PULLEY_TOO_HOT: + case ERR_TEMPERATURE_WARNING_TMC_SELECTOR_TOO_HOT: + case ERR_TEMPERATURE_WARNING_TMC_IDLER_TOO_HOT: switch (buttonSelectedOperation) { case ButtonOperations::Continue: // "Continue" return Left; - case ButtonOperations::RestartMMU: // "Restart MMU" - return RestartMMU; + case ButtonOperations::ResetMMU: // "Reset MMU" + return ResetMMU; default: break; } break; - case ERR_TEMPERATURE_PULLEY_TMC_OVERHEAT_ERROR: - case ERR_TEMPERATURE_SELECTOR_TMC_OVERHEAT_ERROR: - case ERR_TEMPERATURE_IDLER_TMC_OVERHEAT_ERROR: + case ERR_TEMPERATURE_TMC_PULLEY_OVERHEAT_ERROR: + case ERR_TEMPERATURE_TMC_SELECTOR_OVERHEAT_ERROR: + case ERR_TEMPERATURE_TMC_IDLER_OVERHEAT_ERROR: - case ERR_ELECTRICAL_PULLEY_TMC_DRIVER_ERROR: - case ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_ERROR: - case ERR_ELECTRICAL_IDLER_TMC_DRIVER_ERROR: + case ERR_ELECTRICAL_TMC_PULLEY_DRIVER_ERROR: + case ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_ERROR: + case ERR_ELECTRICAL_TMC_IDLER_DRIVER_ERROR: - case ERR_ELECTRICAL_PULLEY_TMC_DRIVER_RESET: - case ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_RESET: - case ERR_ELECTRICAL_IDLER_TMC_DRIVER_RESET: + case ERR_ELECTRICAL_TMC_PULLEY_DRIVER_RESET: + case ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_RESET: + case ERR_ELECTRICAL_TMC_IDLER_DRIVER_RESET: - case ERR_ELECTRICAL_PULLEY_TMC_UNDERVOLTAGE_ERROR: - case ERR_ELECTRICAL_SELECTOR_TMC_UNDERVOLTAGE_ERROR: - case ERR_ELECTRICAL_IDLER_TMC_UNDERVOLTAGE_ERROR: + case ERR_ELECTRICAL_TMC_PULLEY_UNDERVOLTAGE_ERROR: + case ERR_ELECTRICAL_TMC_SELECTOR_UNDERVOLTAGE_ERROR: + case ERR_ELECTRICAL_TMC_IDLER_UNDERVOLTAGE_ERROR: - case ERR_ELECTRICAL_PULLEY_TMC_DRIVER_SHORTED: - case ERR_ELECTRICAL_SELECTOR_TMC_DRIVER_SHORTED: - case ERR_ELECTRICAL_IDLER_TMC_DRIVER_SHORTED: + case ERR_ELECTRICAL_TMC_PULLEY_DRIVER_SHORTED: + case ERR_ELECTRICAL_TMC_SELECTOR_DRIVER_SHORTED: + case ERR_ELECTRICAL_TMC_IDLER_DRIVER_SHORTED: - case ERR_ELECTRICAL_PULLEY_SELFTEST_FAILED: - case ERR_ELECTRICAL_SELECTOR_SELFTEST_FAILED: - case ERR_ELECTRICAL_IDLER_SELFTEST_FAILED: + case ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED: + case ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED: + case ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED: case ERR_SYSTEM_QUEUE_FULL: case ERR_SYSTEM_FW_RUNTIME_ERROR: case ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC: switch (buttonSelectedOperation) { - case ButtonOperations::RestartMMU: // "Restart MMU" - return RestartMMU; + case ButtonOperations::ResetMMU: // "Reset MMU" + return ResetMMU; default: break; } @@ -281,8 +281,8 @@ Buttons ButtonAvailable(uint16_t ec) { switch (buttonSelectedOperation) { case ButtonOperations::DisableMMU: // "Disable" return DisableMMU; - case ButtonOperations::RestartMMU: // "RestartMMU" - return RestartMMU; + case ButtonOperations::ResetMMU: // "ResetMMU" + return ResetMMU; default: break; } @@ -302,8 +302,8 @@ Buttons ButtonAvailable(uint16_t ec) { switch (buttonSelectedOperation) { case ButtonOperations::StopPrint: // "Stop print" return StopPrint; - case ButtonOperations::RestartMMU: // "Restart MMU" - return RestartMMU; + case ButtonOperations::ResetMMU: // "Reset MMU" + return ResetMMU; default: break; } diff --git a/Firmware/mmu2_protocol_logic.cpp b/Firmware/mmu2_protocol_logic.cpp index 746ef43f9..d7be95648 100644 --- a/Firmware/mmu2_protocol_logic.cpp +++ b/Firmware/mmu2_protocol_logic.cpp @@ -20,7 +20,7 @@ namespace MMU2 { /// Changing the supportedMmuVersion numbers requires patching MSG_DESC_FW_UPDATE_NEEDED and all its related translations by hand. /// /// The message reads: -/// "The MMU firmware version incompatible with the printer's FW. Update to version 2.1.6." +/// "MMU FW version is incompatible with printer FW.Update to version 2.1.9." /// /// Currently, this is not possible to perform automatically at compile time with the existing languages/translations infrastructure. /// To save space a "dumb" solution was chosen + a few static_assert checks in errors_list.h preventing the code from compiling when the string doesn't match. diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 06d532d15..2fffa1bc5 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -187,7 +187,7 @@ msgid "Brightness" msgstr "" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "" @@ -237,13 +237,13 @@ msgid "Calibration done" msgstr "" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -400,7 +400,7 @@ msgid "Dim" msgstr "" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "" @@ -433,7 +433,7 @@ msgid "" msgstr "" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "" @@ -534,40 +534,40 @@ msgstr "" msgid "F. runout" msgstr "" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "" + +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." msgstr "" #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." msgstr "" -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "" - #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 #: ../../Firmware/ultralcd.cpp:4051 @@ -575,22 +575,22 @@ msgid "FS Action" msgstr "" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "" + #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "" - #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "" @@ -672,7 +672,7 @@ msgid "Filament" msgstr "" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -696,22 +696,22 @@ msgstr "" msgid "Filament sensor" msgstr "" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." msgstr "" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -888,22 +888,22 @@ msgid "I will run z calibration now." msgstr "" #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "" @@ -942,7 +942,7 @@ msgid "" msgstr "" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -965,7 +965,7 @@ msgid "Iteration" msgstr "" #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "" @@ -1055,7 +1055,7 @@ msgid "Loading filament" msgstr "" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -1072,28 +1072,34 @@ msgstr "" msgid "Loud" msgstr "" -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" -msgstr "" - #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "" +#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 +msgid "" +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +msgstr "" + #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "" +#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" +msgstr "" + #. MSG_MMU_MODE c=8 #: ../../Firmware/messages.cpp:145 ../../Firmware/ultralcd.cpp:4085 msgid "MMU Mode" msgstr "" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "" @@ -1103,8 +1109,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "" #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "" @@ -1126,12 +1132,12 @@ msgid "MMU load fails" msgstr "" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "" @@ -1205,18 +1211,18 @@ msgid "Model" msgstr "" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "" @@ -1443,7 +1449,7 @@ msgid "" msgstr "" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "" @@ -1678,8 +1684,8 @@ msgid "" " steps, section Calibration flow." msgstr "" -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" @@ -1690,7 +1696,7 @@ msgid "Pushing filament" msgstr "" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "" @@ -1715,7 +1721,7 @@ msgid "Remove old filament and press the knob to start loading new filament." msgstr "" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "" @@ -1725,7 +1731,7 @@ msgid "Rename" msgstr "" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1742,6 +1748,11 @@ msgstr "" msgid "Reset XYZ calibr." msgstr "" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "" + #. MSG_RESUME_PRINT c=18 #: ../../Firmware/Marlin_main.cpp:623 ../../Firmware/messages.cpp:86 #: ../../Firmware/ultralcd.cpp:5185 ../../Firmware/ultralcd.cpp:5187 @@ -1760,7 +1771,7 @@ msgid "Retract from FINDA" msgstr "" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "" @@ -1780,11 +1791,6 @@ msgstr "" msgid "Right side[µm]" msgstr "" -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "" - #. MSG_WIZARD_RERUN c=20 r=7 #: ../../Firmware/ultralcd.cpp:3644 msgid "" @@ -1799,12 +1805,12 @@ msgid "SD card" msgstr "" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "" @@ -1861,7 +1867,7 @@ msgid "Selecting fil. slot" msgstr "" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2021,7 +2027,7 @@ msgid "Steel sheets" msgstr "" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "" @@ -2053,32 +2059,32 @@ msgid "THERMAL ANOMALY" msgstr "" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "" @@ -2098,20 +2104,13 @@ msgid "Testing filament" msgstr "" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" -#. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 -msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." -msgstr "" - #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2180,13 +2179,23 @@ msgstr "" msgid "Tune" msgstr "" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "" + #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "" +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "" + #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "" @@ -2226,8 +2235,8 @@ msgid "Voltages" msgstr "" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 26be95397..fda61b24e 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Podsviceni" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "CHYBA KOMUNIKACE" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Kalibrace OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Chyba pohybu selektoru nebo idleru" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "Nelze provest akci, filament je zaveden. Nejprve jej vyjmete." @@ -419,7 +419,7 @@ msgid "Dim" msgstr "Temny" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Vypnout" @@ -456,7 +456,7 @@ msgstr "" "podlozkou?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Konec" @@ -551,18 +551,18 @@ msgstr "Det. zaseku" msgid "F. runout" msgstr "F. runout" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT JE ZAVEDEN" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NESEPNULA" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -571,7 +571,7 @@ msgstr "" " ze se filament nezasekl a FINDA funguje." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -579,10 +579,10 @@ msgstr "" "FINDA se nesepnula pri zavadeni filamentu. Neni pohyb filamentu blokovan? Je" " senzor ok?" -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: ZASEK. FILAM." +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA ZASEK. FILAM." #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -591,22 +591,22 @@ msgid "FS Action" msgstr "FS reakce" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "F. SENZOR NESEPNUL" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "F.SENZOR MOC BRZY" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" msgstr "FSENZOR ZASEK FILAM." #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME CHYBA" @@ -705,8 +705,8 @@ msgstr "Filament nezaveden" msgid "Filament sensor" msgstr "Senzor filamentu" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -715,16 +715,16 @@ msgstr "" "filament muze pohybovat a senzor funguje." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Senzor filamentu nesepnul pri zavadeni filamentu. Ujistete se, ze se k nemu " "filament dostal a ze senzor funguje." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -914,22 +914,22 @@ msgid "I will run z calibration now." msgstr "Nyni provedu z kalibraci." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "IDLER: CHYBA HOMINGU" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "CHYBA POHYBU IDLERU" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "KONTROLA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "NEPLATNY NASTROJ" @@ -970,7 +970,7 @@ msgid "" msgstr "Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "Interní chyba. Zkuste resetovat MMU ci aktualizujte FW." @@ -1089,12 +1089,12 @@ msgid "Loud" msgstr "Hlasity" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "AKTUALIZUJTE MMU FW" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interni chyba MMU FW, resetujte MMU" @@ -1104,7 +1104,7 @@ msgid "MMU Mode" msgstr "MMU mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NEODPOVIDA" @@ -1114,8 +1114,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU opakovani: Obnova teploty..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST SELAHL" @@ -1132,12 +1132,12 @@ msgid "MMU load fails" msgstr "MMU selhani zav" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU neodpovida spravne. Zkontrolujte zapojeni kabelu." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU neodpovida. Zkontrolujte kabely a jejich zapojeni." @@ -1205,18 +1205,18 @@ msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Vice info na webu" @@ -1433,7 +1433,7 @@ msgstr "" "menu Nastaveni->Tepl. kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "KLADKA SE NEOTACI" @@ -1684,8 +1684,8 @@ msgstr "" "Prumer trysky tiskarny se lisi od G-code. Zkontrolujte nastaveni. Tisk " "zrusen." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Kladkový motor se zastavil. Ujistete se, ze neni pohyb blokovan a " @@ -1698,7 +1698,7 @@ msgid "Pushing filament" msgstr "Posun filamentu" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "FRONTA PLNA" @@ -1728,7 +1728,7 @@ msgid "Rename" msgstr "Prejmenovat" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1765,7 +1765,7 @@ msgid "Retract from FINDA" msgstr "Vysouvani od FINDy" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Znovu" @@ -1801,12 +1801,12 @@ msgid "SD card" msgstr "SD karta" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELEKTOR: HOMING ERR" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SE NEHYBE" @@ -2022,7 +2022,7 @@ msgid "Steel sheets" msgstr "Tiskove platy" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2054,32 +2054,32 @@ msgid "THERMAL ANOMALY" msgstr "TEPLOTNI VYJIMKA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "CHYBA TMC DRIVER" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC RESET DRIVERU" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER: ZKRAT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC CHYBA: PREHRATI" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC CHYBA NIZKE NAP." @@ -2113,7 +2113,7 @@ msgid "Testing filament" msgstr "Testovani filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2121,7 +2121,7 @@ msgstr "" "pohyb." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2184,12 +2184,12 @@ msgid "Tune" msgstr "Ladit" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "MANUALNI VYJMUTI" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Vyjmout" @@ -2229,8 +2229,8 @@ msgid "Voltages" msgstr "Napeti" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "TMC: VYSOKA TEPLOTA!" @@ -2441,12 +2441,12 @@ msgid "Eject from MMU" msgstr "Vysunutí z MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT VLÁKNO" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2455,12 +2455,12 @@ msgstr "" " Zkontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "NAČÍST DO EXTR. SEL." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2469,8 +2469,8 @@ msgstr "" "případě potřeby upřesněte kalibraci snímače." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU PODPĚTÍ VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2480,17 +2480,17 @@ msgid "Material changes" msgstr "Výměn materiálů" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Odstraňte vysunuté filament z přední části MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2499,10 +2499,9 @@ msgstr "" " ve voliči není žádné vlákno a FINDA funguje správně." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "2.1.9." @@ -2520,6 +2519,16 @@ msgstr "MK3 firmware detekovan na MK3S tiskarne" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detekovan na tiskarne MK3" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "NEZNÁMÁ CHYBA" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Došlo k neočekávané chybě." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 9d0decb8a..afc8ecfbb 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -200,7 +200,7 @@ msgid "Brightness" msgstr "Helligkeit" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEHLER" @@ -254,13 +254,13 @@ msgid "Calibration done" msgstr "Kalibrierung OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Kann Selektor oder Riemenscheibe nicht bewegen." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -422,7 +422,7 @@ msgid "Dim" msgstr "Dimm" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Deaktiv." @@ -458,7 +458,7 @@ msgstr "" "Willst du den letzten Schritt wiederholen, um den Abstand neu einzustellen?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Klar" @@ -553,18 +553,18 @@ msgstr "F. Stau entd." msgid "F. runout" msgstr "FS. Auslauf" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FIL. BEREITS GELADEN" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA N. AUSGELÖST" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -573,7 +573,7 @@ msgstr "" "sich? FINDA funktioniert?" #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -581,9 +581,9 @@ msgstr "" "FINDA hat beim Laden des Filaments nicht ausgelöst. Stellen Sie sicher, dass" " sich das Filament bewegen kann und FINDA funktioniert." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" msgstr "FINDA NICHT FIL.FREI" #. MSG_FS_ACTION c=10 @@ -593,22 +593,22 @@ msgid "FS Action" msgstr "FS Aktion" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR N. AUSGELÖST" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR ZU FRÜH" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" msgstr "FSENSOR N. FIL.FREI" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW-LAUFZEITFEHLER" @@ -707,8 +707,8 @@ msgstr "Fil. nicht geladen" msgid "Filament sensor" msgstr "Filamentsensor" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -717,17 +717,17 @@ msgstr "" "Sensor funktioniert?" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Der FSensor hat beim Laden des Filaments nicht ausgelöst. Stellen Sie " "sicher, dass das Filament den Sensor erreicht hat und der Sensor " "funktioniert." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -923,22 +923,22 @@ msgid "I will run z calibration now." msgstr "Ich werde jetzt die Z Kalibrierung durchführen." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "SPANNRO. STARTP.FEH." #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "SPANNROL. SITZT FEST" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "INSPIZIERE FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "UNGÜLTIGER FIL.PLATZ" @@ -981,7 +981,7 @@ msgstr "" "den Knopf." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1101,12 +1101,12 @@ msgid "Loud" msgstr "Laut" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE NÖTIG" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware Fehler, setzen Sie die MMU zurück." @@ -1116,7 +1116,7 @@ msgid "MMU Mode" msgstr "MMU Mod." #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU REAGIERT NICHT" @@ -1126,8 +1126,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU-Neuversuch: Wiederherstelle die Temperatur..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SELBSTTEST FEHL." @@ -1144,14 +1144,14 @@ msgid "MMU load fails" msgstr "MMU Ladefehler" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" "MMU antwortet nicht korrekt. Überprüfen Sie die Verkabelung und die " "Anschlüsse." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "" "MMU antwortet nicht. Überprüfen Sie die Verkabelung und die Anschlüsse." @@ -1220,18 +1220,18 @@ msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Weiter Details online." @@ -1449,7 +1449,7 @@ msgstr "" "Menü Einstellungen -> PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "RIEHMENS. SITZT FEST" @@ -1704,8 +1704,8 @@ msgstr "" "Der Durchmesser der Druckerdüse weicht vom G-Code ab. Bitte überprüfen Sie " "den Wert in den Einstellungen. Druck abgebrochen." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Der Riemenscheiben- motor ist blockiert. Sicherstellen, dass sich die " @@ -1718,7 +1718,7 @@ msgid "Pushing filament" msgstr "Schiebe Filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "QUEUE VOLL" @@ -1748,7 +1748,7 @@ msgid "Rename" msgstr "Umbenennen" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1785,7 +1785,7 @@ msgid "Retract from FINDA" msgstr "Einziehen von FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Wdh." @@ -1821,12 +1821,12 @@ msgid "SD card" msgstr "SD Karte" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELEK. STARTPOSFEHL." #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SITZT FEST" @@ -2044,7 +2044,7 @@ msgid "Steel sheets" msgstr "Stahlbleche" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2076,32 +2076,32 @@ msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC TREIBER FEHLER" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC TREIBER RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC KURZSCHLUSS" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC ÜBERHITZ.FEHL." #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNTERSPANN.FEHL." @@ -2135,7 +2135,7 @@ msgid "Testing filament" msgstr "Teste filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2143,7 +2143,7 @@ msgstr "" "ob irgendetwas seine Bewegung blockiert." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "Selektor erreicht Startpos. nicht. Prüf, ob etwas blockiert." @@ -2206,12 +2206,12 @@ msgid "Tune" msgstr "Feineinstellung" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "ENTLADE MANUELL" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Entla." @@ -2253,8 +2253,8 @@ msgid "Voltages" msgstr "Spannungen" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "WARNUNG TMC ZU HEISS" @@ -2469,12 +2469,12 @@ msgid "Eject from MMU" msgstr "Aus MMU auswerf." #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT AUSGEWORFEN" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2483,12 +2483,12 @@ msgstr "" "ist. Überprüfen Sie die Sensoren und die Verkabelung." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "FEHL LADEN ZUM EXTR:" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2497,8 +2497,8 @@ msgstr "" " Verfeiner die Sensorkalibrierung, falls erforderlich." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU-UNTERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2508,17 +2508,17 @@ msgid "Material changes" msgstr "Materialwechsel" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Entfernen Sie das ausgeworfene Filament von der Vorderseite der MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2527,12 +2527,11 @@ msgstr "" " dass sich kein Fil. im Selektor befindet und FINDA ricchtig funktioniert." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" -"Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " +"MMU FW ist inkompatibel mit Drucker FW. " "Update auf Version 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 @@ -2548,6 +2547,16 @@ msgstr "MK3-Firmware am MK3S-Drucker erkannt" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-Firmware auf MK3-Drucker erkannt" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "UNBEKANNTER FEHLER" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Ein unerwarteter Fehler ist aufgetreten." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 437ec7eea..fe2c82f34 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -198,7 +198,7 @@ msgid "Brightness" msgstr "Brillo" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "ERROR COMUNICACION" @@ -252,13 +252,13 @@ msgid "Calibration done" msgstr "Calibracion OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "No se puede mover Selector o Tensor." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -419,7 +419,7 @@ msgid "Dim" msgstr "Oscuro" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Desact." @@ -455,7 +455,7 @@ msgstr "" "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Listo" @@ -556,18 +556,18 @@ msgstr "Det. atasco f" msgid "F. runout" msgstr "Fin fil." -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FIL. YA CARGADO" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NO SE ACTIVO" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -576,7 +576,7 @@ msgstr "" "manualmente. Comprueba que el fi-lamento puede mover-se y FINDA funciona." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -584,10 +584,10 @@ msgstr "" "FINDA no se activó al cargar el filamento. Asegúrate de que el filamento " "puede moverse y FINDA funciona." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: ATASCO FIL." +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA ATASCO FIL." #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -596,22 +596,22 @@ msgid "FS Action" msgstr "FS accion" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR NO SE ACTIVO" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR MUY PRONTO" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: ATASCO FIL." +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR ATASCO FIL." #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "ERROR EJECUCION FW" @@ -710,8 +710,8 @@ msgstr "Fil. no introducido" msgid "Filament sensor" msgstr "Sensor de fil." -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -720,16 +720,16 @@ msgstr "" "Asegúrate de que el filamento puede moverse y el sensor funciona." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "El sensor de filamento no se activó al cargar el filamento. Asegúrate de que" " el filamento llegó al sensor y que éste funciona." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -924,22 +924,22 @@ msgid "I will run z calibration now." msgstr "Voy a hacer Calibracion Z ahora." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "TENSOR: ERROR HOME" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "TENSOR: ERROR MOV." #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "INSPECCIONAR FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "HERR. INVALIDA" @@ -981,7 +981,7 @@ msgstr "" "Inserta el filamento (no lo cargue) en el extrusor y luego presiona el dial." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1102,12 +1102,12 @@ msgid "Loud" msgstr "Alto" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "ACT. FW MMU PRECISA" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Error interno del firmware MMU, reinicia el MMU." @@ -1117,7 +1117,7 @@ msgid "MMU Mode" msgstr "Modo MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NO RESPONDE" @@ -1127,8 +1127,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU Reintento: Restaurando temperatura..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST FALLO" @@ -1145,12 +1145,12 @@ msgid "MMU load fails" msgstr "Carga MMU falla" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU no responde correctamente. Revise los cables y conectores." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "La MMU no responde. Revise los cables y conectores." @@ -1218,18 +1218,18 @@ msgid "Model" msgstr "Modelo" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Mas detalles online." @@ -1450,7 +1450,7 @@ msgstr "" "menu Configuracion -> Cal. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "POLEA: ERROR MOV." @@ -1703,8 +1703,8 @@ msgstr "" "Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en " "ajustes. Impresion cancelada." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "El motor de la polea se ha parado. Asegúrate de que la polea puede moverse y" @@ -1717,7 +1717,7 @@ msgid "Pushing filament" msgstr "Empujando filamento" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "COLA LLENA" @@ -1748,7 +1748,7 @@ msgid "Rename" msgstr "Renombrar" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1785,7 +1785,7 @@ msgid "Retract from FINDA" msgstr "Retraer del FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Reint" @@ -1821,12 +1821,12 @@ msgid "SD card" msgstr "Tarj. SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELECT. SIN HOME" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELECT. SIN MOVERSE" @@ -2049,7 +2049,7 @@ msgid "Steel sheets" msgstr "Lamina de acero" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Parar" @@ -2081,32 +2081,32 @@ msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "ERROR DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "RESET DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "CORTO DRIVER TMC" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "ERROR SOBRECAL TMC" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "ERROR SBRVOLTAJE TMC" @@ -2140,7 +2140,7 @@ msgid "Testing filament" msgstr "Probando filamento" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2148,7 +2148,7 @@ msgstr "" "movimiento." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2213,12 +2213,12 @@ msgid "Tune" msgstr "Ajustar" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "DESCARGA MANUAL" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Desc." @@ -2258,8 +2258,8 @@ msgid "Voltages" msgstr "Voltajes" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "AVISO TMC DEM. CALOR" @@ -2464,12 +2464,12 @@ msgid "MMU power fails" msgstr "Fallo red MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENTO EXPULSADO" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2478,12 +2478,12 @@ msgstr "" "filamento cargado. Compruebe los sensores y el cableado." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "FALL. CARGAR A EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2492,8 +2492,8 @@ msgstr "" "filamento. Refine la calibración del sensor, si es necesario." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU BAJO VOLTAJE VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2503,17 +2503,17 @@ msgid "Material changes" msgstr "Cambios materiales" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Retire el filamento expulsado de la parte frontal de la MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2523,10 +2523,9 @@ msgstr "" "correctamente." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "La versión de firmware de la MMU es incompatible con el FW de la impresora. " "Actualizar a la versión 2.1.9." @@ -2544,6 +2543,16 @@ msgstr "Firmware MK3 detectado en impresora MK3S" msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectado en impresora MK3" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "ERROR DESCONOCIDO" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Ocurrió un error inesperado." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 1f54cd7d8..7ae2968e8 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Luminosite" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "ERREUR COMMUNICATION" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Calibration terminee" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Impossible de deplacer le Selecteur ou l'Idler." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -422,7 +422,7 @@ msgid "Dim" msgstr "Sombre" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Desact." @@ -459,7 +459,7 @@ msgstr "" "plateau?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Fait" @@ -560,18 +560,18 @@ msgstr "Detect bour F" msgid "F. runout" msgstr "Fin de F." -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT DEJA CHARGE" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NON DECLENCHEE" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -581,7 +581,7 @@ msgstr "" "fonctionne." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -589,10 +589,10 @@ msgstr "" "La FINDA ne s'est pas declenchee lors du chargement du filament. Assurez-" "vous que le filament peut bouger et que la FINDA fonctionne." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. BLOQUE" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. BLOQUE" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -601,22 +601,22 @@ msgid "FS Action" msgstr "Action FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "CAPTEUR F. NON DECL." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "CAPTEUR F TROP TOT" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" msgstr "CAPTEUR F: F. BLOQUE" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "ERREUR EXECUTION FW" @@ -715,8 +715,8 @@ msgstr "Filament non charge" msgid "Filament sensor" msgstr "Capteur Fil." -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -725,16 +725,16 @@ msgstr "" "que le filament peut bouger et que le capteur fonctionne." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Capteur de f. non declenche lors du chargement du filament. Assurez-vous que" " le filament a atteint le capteur f et que le capteur fonctionne." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -930,22 +930,22 @@ msgid "I will run z calibration now." msgstr "Je vais maintenant lancer la calibration Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "RAZ IDLER IMPOSSIBLE" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "ECHEC MOUV.T IDLER" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "INSPECTER FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "OUTIL INVALIDE" @@ -988,7 +988,7 @@ msgstr "" "appuyez sur le bouton." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1109,12 +1109,12 @@ msgid "Loud" msgstr "Fort" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MAJ FW MMU NECESS." #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Erreur interne du FW du MMU, reinitialiser le MMU." @@ -1124,7 +1124,7 @@ msgid "MMU Mode" msgstr "Mode MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "LE MMU NE REPOND PAS" @@ -1134,8 +1134,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "Nouvelle tentative MMU: Restauration de la temperature..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU AUTO-TEST ECHEC" @@ -1152,13 +1152,13 @@ msgid "MMU load fails" msgstr "Def. charg. MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" "MMU ne repond pas correctement. Verifiez le cablage et les connecteurs." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU ne repond pas. Verifiez le cablage et les connecteurs." @@ -1226,18 +1226,18 @@ msgid "Model" msgstr "Modele" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Plus de details en ligne." @@ -1457,7 +1457,7 @@ msgstr "" "dans le menu Reglages-> Calib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "ECHEC MOUV.T POULIE" @@ -1711,8 +1711,8 @@ msgstr "" "Diamètre de la buse diffère du G-Code. Vérifiez la valeur. Impression " "annulee." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Le moteur de la poulie s'est bloque. Assurez-vous que la poulie peut bouger " @@ -1725,7 +1725,7 @@ msgid "Pushing filament" msgstr "Chargement filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "FILE PLEINE" @@ -1756,7 +1756,7 @@ msgid "Rename" msgstr "Renommer" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1793,7 +1793,7 @@ msgid "Retract from FINDA" msgstr "Rétraction de FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Ref." @@ -1829,12 +1829,12 @@ msgid "SD card" msgstr "Carte SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "ECHEC RAZ SELECTEUR" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "ECHEC MOUV.T SELECT." @@ -2055,7 +2055,7 @@ msgid "Steel sheets" msgstr "Plaques en acier" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2087,32 +2087,32 @@ msgid "THERMAL ANOMALY" msgstr "ANOMALIE THERMIQUE" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "ERREUR DU DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "REINIT DU DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "CC DU DRIVER TMC" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "ERR SURCHAUFFE TMC" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR SOUS TENSION TMC" @@ -2146,7 +2146,7 @@ msgid "Testing filament" msgstr "Test du filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2154,7 +2154,7 @@ msgstr "" "que ce soit qui bloque son mouvement." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2218,12 +2218,12 @@ msgid "Tune" msgstr "Regler" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "DECHARGER MANUEL.T" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Dech." @@ -2263,8 +2263,8 @@ msgid "Voltages" msgstr "Tensions" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "ATT TMC TROP CHAUD" @@ -2479,12 +2479,12 @@ msgid "MMU power fails" msgstr "Def. alim. MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT ÉJECTÉ" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2493,12 +2493,12 @@ msgstr "" " chargé. Vérifiez les capteurs et le câblage." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "ÉCHOUÉ CHARGE A EXTR" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2507,8 +2507,8 @@ msgstr "" " filament. Affiner l'étalonnage du capteur, si nécessaire." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU SOUS-TENSION VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2518,17 +2518,17 @@ msgid "Material changes" msgstr "Changes matériels" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Retirez le filament éjecté de l'avant de la MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2537,10 +2537,9 @@ msgstr "" "qu'aucun fil. n'est dans le sélecteur et que FINDA fonctionne correctement." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." @@ -2558,6 +2557,16 @@ msgstr "Firmware MK3 detecte sur imprimante MK3S" msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detecte sur imprimante MK3" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "ERREUR INCONNUE" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Une erreur inattendue s'est produite." + #~ msgid "XFLASH init" #~ msgstr "Init XFLASH" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index bdb9f5bbc..934d91be5 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -198,7 +198,7 @@ msgid "Brightness" msgstr "Svjetlina" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "KOM. GRESKA" @@ -252,13 +252,13 @@ msgid "Calibration done" msgstr "Kalibracija gotova" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Ne mogu pomaknuti Odabirac ili Klizac." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -416,7 +416,7 @@ msgid "Dim" msgstr "Tamno" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Onemogu." @@ -454,7 +454,7 @@ msgstr "" "mlaznice i grijace podloge?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Gotov" @@ -555,18 +555,18 @@ msgstr "F. zastopan" msgid "F. runout" msgstr "F. isteko" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT VEC NAPUNJ." #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA SE NIJE AKT." -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -575,7 +575,7 @@ msgstr "" "ručno. Provjerite može li se filament pomicati i FINDA radi." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -583,10 +583,10 @@ msgstr "" "FINDA se nije aktivirala tijekom punjenja filamenta. Provjerite može li se " "filament pomicati i FINDA radi." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. ZAPEO" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. ZAPEO" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -595,22 +595,22 @@ msgid "FS Action" msgstr "FS Akcija" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENZOR NIJE AKTIV." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENZOR PRERANO" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" msgstr "FSENZOR FIL. ZAPEO" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW GRESKA IZVRSENJA" @@ -709,8 +709,8 @@ msgstr "Fil. nije napunjen" msgid "Filament sensor" msgstr "Senzor filamenta" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -719,16 +719,16 @@ msgstr "" " se filament moze pomaknuti i da senzor radi" #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Senzor filamenta nije se aktivirao tijekom punjenja filamenta. Osigurajte da" " je filament dosegao fsenzor i da senzor radi." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -923,22 +923,22 @@ msgid "I will run z calibration now." msgstr "Sada cu pokrenuti z kalibraciju." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "KLIZAC NIJE PODESEN" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "KLIZAC NIJE POMAKNUT" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "PREGLED FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "NEVALJAN ALAT" @@ -980,7 +980,7 @@ msgstr "" "Umetnite filament (nemojte ga puniti) u ekstruder i zatim pritisnite gumb." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1101,12 +1101,12 @@ msgid "Loud" msgstr "Glasno" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "POTREBNO AZURIRANJE" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Interna pogreska firmware MMU-a, resetirajte MMU." @@ -1116,7 +1116,7 @@ msgid "MMU Mode" msgstr "MMU Mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NE ODGOVARA" @@ -1126,8 +1126,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ponovni pokusaj: Vracanje temperature..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST N USPIO" @@ -1144,12 +1144,12 @@ msgid "MMU load fails" msgstr "Neusp. MMU punj" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU ne reagira ispravno. Provjerite ozicenje i konektore." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU ne reagira. Provjerite ozicenje i konektore." @@ -1217,18 +1217,18 @@ msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Vise detalja online." @@ -1447,7 +1447,7 @@ msgstr "" "Postavke->PINDA. kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "REMENICA SE NE MICE" @@ -1698,8 +1698,8 @@ msgstr "" "Promjer mlaznice printera razlikuje se od G-koda. Molimo provjerite " "vrijednost u postavkama. Print je otkazan." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Motor remenice zastao. Provjerite moze li se remenica pomicati i provjerite " @@ -1712,7 +1712,7 @@ msgid "Pushing filament" msgstr "Guranje filamenta" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "RED PUN" @@ -1742,7 +1742,7 @@ msgid "Rename" msgstr "Preimenuj" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1779,7 +1779,7 @@ msgid "Retract from FINDA" msgstr "Izvuci iz FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Retry" @@ -1815,12 +1815,12 @@ msgid "SD card" msgstr "SD karti" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "IZBORNIK NE PODESEN" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "IZBORNIK SE NE MICE" @@ -2044,7 +2044,7 @@ msgid "Steel sheets" msgstr "Celicna ploca" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2076,32 +2076,32 @@ msgid "THERMAL ANOMALY" msgstr "TERMALNA ANOMALIJA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC GRESKA DRAJVERA" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC RESET DRAJVERA" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC DRAJVER SKRACEN" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC GRESKA PREGRIJAN" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC NISKA VOLTAZA" @@ -2135,7 +2135,7 @@ msgid "Testing filament" msgstr "Testiram filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2143,7 +2143,7 @@ msgstr "" "njegovo kretanje." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2207,12 +2207,12 @@ msgid "Tune" msgstr "Ugodi" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "ISPRAZNI RUCNO" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Prazni" @@ -2252,8 +2252,8 @@ msgid "Voltages" msgstr "Voltaza" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "UPOZORENJE TMC VRUC" @@ -2458,12 +2458,12 @@ msgid "MMU power fails" msgstr "Neusp. MMU nap" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT IZBAČEN" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2472,12 +2472,12 @@ msgstr "" " senzore i ožičenje." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "NEUSPJEH PUNI EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2486,8 +2486,8 @@ msgstr "" "Poboljšajte kalibraciju senzora, ako je potrebno." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU PODNAPON VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2497,17 +2497,17 @@ msgid "Material changes" msgstr "Materijal razmjene" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Uklonite izbačenu nit s prednje strane MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2516,10 +2516,9 @@ msgstr "" "jedna nit nije u selektoru i da FINDA radi ispravno." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "2.1.9." @@ -2537,6 +2536,16 @@ msgstr "MK3 firmware otkriven na MK3S printeru" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detektiran na MK3 printeru" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "NEPOZNATA POGREŠKA" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Došlo je do neočekivane pogreške." + #~ msgid "XFLASH init" #~ msgstr "XFLASH validacija" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 6be5aacf9..a233bb1a8 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -198,7 +198,7 @@ msgid "Brightness" msgstr "Fenyero" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "KOMUNIKACIOS HIBA" @@ -252,13 +252,13 @@ msgid "Calibration done" msgstr "Kalibracio kesz" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Nem tudom mozgatni a Fejet vagy a Gorgot" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -419,7 +419,7 @@ msgid "Dim" msgstr "Sotet" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Letilt" @@ -457,7 +457,7 @@ msgstr "" "asztal kozotti tavolsagot?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Kesz" @@ -558,18 +558,18 @@ msgstr "Dugul. eszlel" msgid "F. runout" msgstr "F. fogyas" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT MAR BENT" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NEM KAPCSOLT" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -578,7 +578,7 @@ msgstr "" "fil. utjat es a FINDA mukodeset." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -586,10 +586,10 @@ msgstr "" "A FINDA nem kapcsolt filament betoltese kozben. Ellenorizd a fil. utjat es a" " FINDA mukodeset." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FIL. SZORULT" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FIL. SZORULT" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -598,22 +598,22 @@ msgid "FS Action" msgstr "FSz akcio" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSZENZOR NEM KAPCSOL" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSZENZ. TUL HAMAR" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" msgstr "FSZENZOR: F SZORULT" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW FUTAS HIBA" @@ -712,8 +712,8 @@ msgstr "Fil. nincs betoltve" msgid "Filament sensor" msgstr "Filament szenzor" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -722,16 +722,16 @@ msgstr "" "filament utjat es a szenort." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "A filament szenzor nem kapcsolt be a filament betoltese kozben. Ellenorizd a" " filament utjat es a szenort." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -925,22 +925,22 @@ msgid "I will run z calibration now." msgstr "Lefuttatom a Z kalibraciot." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "GORGO NEM MOZOG" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "GORGO NEM MOZOG" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "ELLENŐRIZZE A FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "HELYTELEN SZERSZAM" @@ -983,7 +983,7 @@ msgstr "" "gombot." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "Futas kozbeni hiba. Inditsd ujra az MMU-t vagy frissitsd a firmwaret." @@ -1102,12 +1102,12 @@ msgid "Loud" msgstr "Hangos" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW FRISSIT. KELL" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware hiba, kerlek inditsd ujra az MMU-t" @@ -1117,7 +1117,7 @@ msgid "MMU Mode" msgstr "MMU Mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NEM VALASZOL" @@ -1127,8 +1127,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU Ujra: Homerseklet visszaallitasa" #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SELFTEST HIBA" @@ -1145,13 +1145,13 @@ msgid "MMU load fails" msgstr "MMU bet. hibak" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "" "Az MMU helytelenul valaszol. Nezd meg a kabelezest es a konnektorokat." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "Az MMU nem valaszol. Nezd meg a kabelezest es a konnektorokat." @@ -1219,18 +1219,18 @@ msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Tovabbi reszletek a neten." @@ -1447,7 +1447,7 @@ msgid "" msgstr "PINDA kalibracio sikeres es aktiv. A Beallitasok ->PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "GORGO NEM MOZOG" @@ -1704,8 +1704,8 @@ msgstr "" "A nyomtato fuvoka atmeroje elter a G-kodtol. Ellenorizd az erteket a " "beallitasokban. Nyomtatas megallitva." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "Gorgo motor nem mozog. Ellenorizd hogy tud-e mozogni es a kabelezest." @@ -1716,7 +1716,7 @@ msgid "Pushing filament" msgstr "Filament benyomasa" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "SOR TELE" @@ -1746,7 +1746,7 @@ msgid "Rename" msgstr "Atnevezes" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1783,7 +1783,7 @@ msgid "Retract from FINDA" msgstr "FINDAtol visszahuz" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Ujra" @@ -1819,12 +1819,12 @@ msgid "SD card" msgstr "SDkartya" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SZELEKTOR NEM HOMEOL" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SZELEKTOR NEM MOZOG" @@ -2043,7 +2043,7 @@ msgid "Steel sheets" msgstr "Acellapok" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Allj" @@ -2075,32 +2075,32 @@ msgid "THERMAL ANOMALY" msgstr "Homersekl. anomalia" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER HIBA" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER RESZET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER ZARLAT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC TULHEVULES HIBA" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ALACSONY FESZ." @@ -2134,7 +2134,7 @@ msgid "Testing filament" msgstr "Filament tesztelese" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2142,7 +2142,7 @@ msgstr "" "mozgasat." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2207,12 +2207,12 @@ msgid "Tune" msgstr "Finomhangolas" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "VEDD KI KEZZEL" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Kiadas" @@ -2252,8 +2252,8 @@ msgid "Voltages" msgstr "Feszultsegek" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "FIGYELEM A TMC FORRO" @@ -2462,12 +2462,12 @@ msgid "MMU power fails" msgstr "MMU tap hibak" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT KIADVA" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2476,12 +2476,12 @@ msgstr "" "betöltve. Ellenőrizze az érzékelőket és a vezetékeket." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "BETÖLTÉS SIKERTELEN" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2490,8 +2490,8 @@ msgstr "" "alakját. Ha szükséges, finomítsd az érzékelő kalibrálását." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU VCC ALACSONY" #. MSG_MATERIAL_CHANGES c=18 @@ -2501,17 +2501,17 @@ msgid "Material changes" msgstr "Anyagcserék" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Távolítsd el a kiadott filamentet az MMU-ból." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2520,10 +2520,9 @@ msgstr "" "arról,hogy nincs fil. a szelektorban, és a FINDA megfelelően működik." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissíts a " "2.1.9-es verzióra." @@ -2541,6 +2540,16 @@ msgstr "MK3 firmver telepitve MK3S nyomtatora" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmver eszlelve MK3 nyomtaton" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "ISMERETLEN HIBA" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Váratlan hiba történt." + #~ msgid "XFLASH init" #~ msgstr "XFLASH inicializal" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 06641d999..abd694b16 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Luminosita'" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "ERRORE COMUNICAZIONE" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Calibr. completa" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Impossibile spostare il Selettore o l'Idler" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -421,7 +421,7 @@ msgid "Dim" msgstr "Scuro" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Disatt." @@ -458,7 +458,7 @@ msgstr "" " piatto?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Fatto" @@ -559,18 +559,18 @@ msgstr "Ril. blocco" msgid "F. runout" msgstr "Ril. fine fil" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAM GIA CARICATO" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NON ATTIVATA" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -579,7 +579,7 @@ msgstr "" " che il fil. possa muoversi e che FINDA funzioni." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -587,10 +587,10 @@ msgstr "" "FINDA non attivata durante il caric. del filamento. Verif che il fil. possa " "muoversi e che FINDA funzioni." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. BLOCC" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. BLOCC" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -599,22 +599,22 @@ msgid "FS Action" msgstr "Azione FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR NON ATTIVATO" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR IN ANTICIPO" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: FIL. BLOCC" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR FIL. BLOCC" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" @@ -713,8 +713,8 @@ msgstr "Fil. non caricato" msgid "Filament sensor" msgstr "Sensore filam." -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -723,16 +723,16 @@ msgstr "" "possa muoversi e che il sensore funzioni." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Sensore del fila-mento non attivato durante il caric. filamento. Verif che " "il filamento abbia raggiunto il sensore e che il sensore funzioni." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -927,22 +927,22 @@ msgid "I will run z calibration now." msgstr "Adesso avviero la Calibrazione Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "IDLER ERR. MOVIMENTO" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "IDLER BLOCCATO" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "ISPEZIONA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "STRUM NON VAL" @@ -984,7 +984,7 @@ msgstr "" "Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1104,12 +1104,12 @@ msgid "Loud" msgstr "Forte" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "AGG FW MMU NECESSARI" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Errore interno FW MMU, resettare la MMU." @@ -1119,7 +1119,7 @@ msgid "MMU Mode" msgstr "Mod. MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NON RISPONDE" @@ -1129,8 +1129,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU Riprova. Ripristino temperatura..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST FALLITO" @@ -1147,12 +1147,12 @@ msgid "MMU load fails" msgstr "Car MMU falliti" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU non risponde correttamente. Controlla cavi e connettori." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU non risponde. Controlla cavi e connettori." @@ -1220,18 +1220,18 @@ msgid "Model" msgstr "Modello" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Piu dettagli online." @@ -1450,7 +1450,7 @@ msgstr "" "Impostazioni ->Calib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "PULEGGIA BLOCCATA" @@ -1703,8 +1703,8 @@ msgstr "" "Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. " "Stampa annullata." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Il motore della puleggia è bloccato. Verifica che la puleggia possa muoversi" @@ -1717,7 +1717,7 @@ msgid "Pushing filament" msgstr "Spingo il filamento" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "CODA PIENA" @@ -1747,7 +1747,7 @@ msgid "Rename" msgstr "Rinomina" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1784,7 +1784,7 @@ msgid "Retract from FINDA" msgstr "Retrai da FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Riprova" @@ -1820,12 +1820,12 @@ msgid "SD card" msgstr "Mem. SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELETTORE ERR MOVIM" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELETTORE BLOCCATO" @@ -2046,7 +2046,7 @@ msgid "Steel sheets" msgstr "Piani d'acciaio" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2078,32 +2078,32 @@ msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "ERRORE DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "RESET DRIVER TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "CORTOCIRC TMC DRIVER" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "ERR TMC SURRISCALD" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" @@ -2137,7 +2137,7 @@ msgid "Testing filament" msgstr "Provo il filamento" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2145,7 +2145,7 @@ msgstr "" "nulla che ne blocchi il movimento." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2210,12 +2210,12 @@ msgid "Tune" msgstr "Regola" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "SCARICA MANUALMENTE" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Scarica" @@ -2255,8 +2255,8 @@ msgid "Voltages" msgstr "Voltaggi" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "ATTENZIONE TMC CALDO" @@ -2463,12 +2463,12 @@ msgid "MMU power fails" msgstr "Manc. corr. MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENTO ESPULSO" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2477,12 +2477,12 @@ msgstr "" "filamento. Controllare i sensori e il cablaggio." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "FALL CARICA SU EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2491,8 +2491,8 @@ msgstr "" "del fil. Affinare la calib. del sensore, se necessario." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "SOTTOTENSION MCU VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2502,17 +2502,17 @@ msgid "Material changes" msgstr "Scambi materiali" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Rimuovere il filamento espulso dalla parte anteriore dell MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2521,10 +2521,9 @@ msgstr "" "nessun fil. sia nel selettore e che FINDA funzioni correttamente." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " "stampante. Aggiornamento alla versione 2.1.9." @@ -2542,6 +2541,16 @@ msgstr "Firmware MK3 rilevato su stampante MK3S" msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S rilevato su stampante MK3" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "ERRORE SCONOSCIUTO" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Si è verificato un errore imprevisto." + #~ msgid "XFLASH init" #~ msgstr "Inizializza XFLASH" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index ae56cf5f2..41a4771d6 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Helderheid" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "COMMUNICATIEFOUT" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Kalibratie klaar" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Kan selector of spanrol niet bewegen." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -421,7 +421,7 @@ msgid "Dim" msgstr "Dim" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Uitschak" @@ -459,7 +459,7 @@ msgstr "" "opnieuw in te stellen?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Klaar" @@ -560,18 +560,18 @@ msgstr "F.Jam ontdek." msgid "F. runout" msgstr "FS. uitloop" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT AL GELADEN" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA TRIGGERDE NIET" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -580,7 +580,7 @@ msgstr "" "ontladen. Controleer of Fil. kan bewegen en of de FINDA werkt." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -588,9 +588,9 @@ msgstr "" "FINDA ging niet af bij het laden van de filament. Controleer of het filament" " kan bewegen en FINDA werkt." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" msgstr "FINDA NIET FIL.VRIJ" #. MSG_FS_ACTION c=10 @@ -600,22 +600,22 @@ msgid "FS Action" msgstr "FS actie" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSEN. NIET AF GEGAAN" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR TE VROEG" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" msgstr "FSENSOR FIL. VAST" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FOUT" @@ -714,8 +714,8 @@ msgstr "Fil. niet geladen" msgid "Filament sensor" msgstr "Filamentsensor" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -724,16 +724,16 @@ msgstr "" "Controleer of het filament kan bewegen en de sensor werkt." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "De filament sensor ging niet af tijdens het laden van de filament. " "Controleer of het filament de fsensor heeft bereikt en de sensor werkt." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -927,22 +927,22 @@ msgid "I will run z calibration now." msgstr "Begin nu met z-kalibratie." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "SPANROL STARTPOSFOUT" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "SPANROL BEWEGT NIET" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "CONTROLEER FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "ONGELDIG TOOL" @@ -984,7 +984,7 @@ msgstr "" "Steek a.u.b. filament (maar niet laden) in de extruder en druk op knop." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1105,12 +1105,12 @@ msgid "Loud" msgstr "Hard" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE NODIG" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware interne fout, reset de MMU." @@ -1120,7 +1120,7 @@ msgid "MMU Mode" msgstr "MMU Mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU REAGEERT NIET" @@ -1130,8 +1130,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: Temperatuur herstellen..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU ZELFTEST MISLUKT" @@ -1148,12 +1148,12 @@ msgid "MMU load fails" msgstr "MMU laadfout" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU reageert niet correct. Controleer de bedrading en connectoren." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU reageert niet. Controleer de bedrading en connectoren." @@ -1221,18 +1221,18 @@ msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Meer details online." @@ -1451,7 +1451,7 @@ msgstr "" "menu Instellingen-> PINDA kalib." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "RIEMSCH. BEWEGT NIET" @@ -1706,8 +1706,8 @@ msgstr "" "De diameter van de tuit van de printer verschilt van de G-code. Controleer " "de waarde in de instellingen. Afdrukken geannuleerd." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Riemschijf motor is vastgelopen. Controleer of de poelie kan bewegen en " @@ -1720,7 +1720,7 @@ msgid "Pushing filament" msgstr "Duwe filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "QUEUE VOL" @@ -1751,7 +1751,7 @@ msgid "Rename" msgstr "Hernoem" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1788,7 +1788,7 @@ msgid "Retract from FINDA" msgstr "Intrekken van FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Retry" @@ -1824,12 +1824,12 @@ msgid "SD card" msgstr "SD kaart" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELECTOR STARTP_FOUT" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR BEWEG FOUT" @@ -2053,7 +2053,7 @@ msgid "Steel sheets" msgstr "Staalplaten" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2085,32 +2085,32 @@ msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC FOUT" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC KORTSLUITING" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC OVERHITTINGSFOUT" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC ONDERVOLT. FOUT" @@ -2144,7 +2144,7 @@ msgid "Testing filament" msgstr "Teste filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2152,7 +2152,7 @@ msgstr "" "blokkeert." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2217,12 +2217,12 @@ msgid "Tune" msgstr "Fijnafstemming" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "ONTLAAD MANUEEL" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Ontla." @@ -2262,8 +2262,8 @@ msgid "Voltages" msgstr "Spanning" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "WAARSCH. TMC TE HEET" @@ -2467,12 +2467,12 @@ msgid "MMU power fails" msgstr "MMU stroomstor." #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT UITGEWORPEN" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2481,12 +2481,12 @@ msgstr "" "geladen. Controleer de sensoren en bedrading." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "FOUT LADEN NA. EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2495,8 +2495,8 @@ msgstr "" "Verfijn de sensorkalibratie, indien nodig." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU ONDERSPANN. VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2506,17 +2506,17 @@ msgid "Material changes" msgstr "Materailwisseling." #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Verwijder het uitgeworpen filament uit de voorkant van de MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2525,10 +2525,9 @@ msgstr "" "dat er geen fil. in de selector zit en dat FINDA naar behoren werkt." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " "printer. Update naar versie 2.1.9." @@ -2546,6 +2545,16 @@ msgstr "MK3-firmware bij MK3S-printer gedetecteerd" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-firmware op MK3-printer ontdekt" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "ONBEKENDE FOUT" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Er is een onverwachte fout opgetreden." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 29cb403d9..4fc2b7370 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Lysstyrke" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKASJONSFEIL" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Kalibrering ferdig" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Kan ikke flytte velger eller tomgangshjul" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -420,7 +420,7 @@ msgid "Dim" msgstr "Svak" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Deaktiv." @@ -457,7 +457,7 @@ msgstr "" "platen?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Ferdig" @@ -558,18 +558,18 @@ msgstr "F. kork føle" msgid "F. runout" msgstr "F. Løput" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT ALLEREDE LA" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA IKKE UTLØST" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -578,7 +578,7 @@ msgstr "" "Sikre at filamentet kan beveges og FINDA fungerer." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -586,10 +586,10 @@ msgstr "" "FINDA ble ikke trigger under lasting av filament. Sikre at filamentet kan " "beveges og FINDA fungerer." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. FAST" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. FAST" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -598,22 +598,22 @@ msgid "FS Action" msgstr "FS aksjon" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR IKKE TIRGG." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR FOR TIDLIG" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: FIL FAST" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR FIL FAST" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEIL" @@ -712,8 +712,8 @@ msgstr "Fil. ikke lastet" msgid "Filament sensor" msgstr "Filamentsensor" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -722,16 +722,16 @@ msgstr "" "filamentet kan beveges og sensoren fungerer." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Filament sensor ble ikke utløst imens filamentet ble lastet. Sikre at " "filamentet rekker fsensor og at sensoren fungerer." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -920,22 +920,22 @@ msgid "I will run z calibration now." msgstr "Nå kjører jeg Z-kalibreringen." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "IDLER CANNOT HOME" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "IDLER CANNOT MOVE" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "KONTROLLER FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "UGYLDIG VERKTØY" @@ -976,7 +976,7 @@ msgid "" msgstr "Sett inn filamentet i ekstruderen og deretter trykk inn valghjulet." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "Intern runtime feil. Prøv omstart av MMU eller oppdater fastvaren." @@ -1095,12 +1095,12 @@ msgid "Loud" msgstr "Høyt" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FV OPPDAT. NØDVE" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU fastvare intern feil, vennligst nullstill MMU-en." @@ -1110,7 +1110,7 @@ msgid "MMU Mode" msgstr "MMU Mod." #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU SVARER IKKE" @@ -1120,8 +1120,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU Retry: gjenoppretter temperatur..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SELVTEST FEILET" @@ -1138,12 +1138,12 @@ msgid "MMU load fails" msgstr "MMU lastefeil" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU svarer ikke riktig. Sjekk ledninger og koblinger." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU svarer ikke. Sjekk ledninger og koblinger." @@ -1211,18 +1211,18 @@ msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Flere detaljer online" @@ -1440,7 +1440,7 @@ msgstr "" "under Innstillinger -> PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "REIM UBEVEGELIG" @@ -1693,8 +1693,8 @@ msgstr "" "Printerens dysediameter er forskjellig fra G-Code. Sjekk Innstillinger for " "hva som er satt. Print avbrutt." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "Reimmotor stanset. Sjekk at Reimen kan beveges og sjekk koblinger" @@ -1705,7 +1705,7 @@ msgid "Pushing filament" msgstr "Dytter filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "FULL KØ" @@ -1735,7 +1735,7 @@ msgid "Rename" msgstr "Gi nytt navn" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1772,7 +1772,7 @@ msgid "Retract from FINDA" msgstr "ta tilbake fra FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Retry" @@ -1808,12 +1808,12 @@ msgid "SD card" msgstr "SD-kort" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "VELGER KAN IKKE HOME" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR STÅR FAST" @@ -2029,7 +2029,7 @@ msgid "Steel sheets" msgstr "Stål plate" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2061,32 +2061,32 @@ msgid "THERMAL ANOMALY" msgstr "THERMISK ANOMALI" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER FEIL" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER NULLSTILL" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER KORTSLUTT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC OVEROPPHETING" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC LAVSPENNING FEIL" @@ -2120,14 +2120,14 @@ msgid "Testing filament" msgstr "Tester filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" "Idleren kan ikke gå hjem riktig. sjekk om noe står i veien for bevegelsen." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2191,12 +2191,12 @@ msgid "Tune" msgstr "Juster" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "LAST UT MANUELT" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Last ut" @@ -2236,8 +2236,8 @@ msgid "Voltages" msgstr "Strøm/Volt" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "VARSEL TMC FOR VARM" @@ -2440,12 +2440,12 @@ msgid "MMU power fails" msgstr "MMU strøm feil" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT UTSETTET" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2454,12 +2454,12 @@ msgstr "" "sensorene og ledningene." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "MISLUKT LAST EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2468,8 +2468,8 @@ msgstr "" "sensorkalibreringen om nødvendig." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU UNDERSPENN. VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2479,17 +2479,17 @@ msgid "Material changes" msgstr "Materialutveksling" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Fjern det utkastede filamentet fra fronten av MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2498,10 +2498,9 @@ msgstr "" " for at ingen fil. er i velgeren og at FINDA fungerer som den skal." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "versjon 2.1.9." @@ -2519,6 +2518,16 @@ msgstr "MK3 system funnet på MK3S printer" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S systemvare funnet på MK3 printer" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "UKJENT FEIL" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Det oppstod en uventet feil." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 30a09b098..a00ae2ec4 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Jasnosc" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "BLAD KOMUNIKACJI" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Kalibracja OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Nie mozna poruszyc wybieraka lub docisku" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -421,7 +421,7 @@ msgid "Dim" msgstr "Sciemn" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Wylacz" @@ -458,7 +458,7 @@ msgstr "" "stolikiem?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Wyk." @@ -559,18 +559,18 @@ msgstr "Zaciecie fil." msgid "F. runout" msgstr "Koniec fil." -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAMENT JUZ ZALAD." #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NIE WLACZONA" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -580,7 +580,7 @@ msgstr "" "dziala." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -588,10 +588,10 @@ msgstr "" "FINDA nie uruchamia sie podczas ladowania filamentu. Upewnij sie, ze " "filament moze sie poruszac i FINDA dziala." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FIL. ZABLOK." +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FIL. ZABLOK." #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -600,22 +600,22 @@ msgid "FS Action" msgstr "Akcja FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR NIE WLACZ." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR ZBYT WCZESN." -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: FIL. ZABLOK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR FIL. ZABLOK" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "BLAD DZIALANIA FW" @@ -714,8 +714,8 @@ msgstr "Fil. nie zaladowany" msgid "Filament sensor" msgstr "Czujnik filamentu" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -724,16 +724,16 @@ msgstr "" "Sprawdz, czy filament moze sie poruszac i czy czujnik dziala." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Czujnik filamentu nie zadzialal podczas ladowania filamentu. Sprawdz, czy " "filament dotarl do czujnika i czy czujnik dziala." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -924,22 +924,22 @@ msgid "I will run z calibration now." msgstr "Przeprowadze kalibracje Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "DOCISK NIE BAZUJE" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "DOCISK NIE RUSZA SIE" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "SPRAWDŹ FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "BLEDNE NARZEDZIE" @@ -982,7 +982,7 @@ msgstr "" "pokretlo." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "Wewnetrzny blad dzialania. Resetuj MMU lub zaktualizuj FW." @@ -1101,12 +1101,12 @@ msgid "Loud" msgstr "Glosny" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW WYMAGA AKTUAL" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Blad wewnetrzny MMU FW, zresetuj MMU." @@ -1116,7 +1116,7 @@ msgid "MMU Mode" msgstr "Tryb MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NIE ODPOWIADA" @@ -1126,8 +1126,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU wznaw. Nagrzewanie..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU BLAD SELFTEST" @@ -1144,12 +1144,12 @@ msgid "MMU load fails" msgstr "Bledy lad. MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU nie dziala. Sprawdz okablowanie i zlacza." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU nie reaguje. Sprawdz okablowanie i zlacza." @@ -1217,18 +1217,18 @@ msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Więcej szczegółów online." @@ -1447,7 +1447,7 @@ msgstr "" " -> Kalib. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "RADELKO NIE RUSZA" @@ -1699,8 +1699,8 @@ msgstr "" "Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk " "anulowany." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Silnik kola radelkowanego utknal. Upewnij sie, ze kolo moze sie poruszac i " @@ -1713,7 +1713,7 @@ msgid "Pushing filament" msgstr "Wsuwanie filamentu" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "KOLEJKA PELNA" @@ -1743,7 +1743,7 @@ msgid "Rename" msgstr "Zmien nazwe" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1780,7 +1780,7 @@ msgid "Retract from FINDA" msgstr "Wycof, z FINDY" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Ponow" @@ -1816,12 +1816,12 @@ msgid "SD card" msgstr "Karta SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "WYBIERAK NIE BAZUJE" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "WYBIERAK NIE RUSZA" @@ -2042,7 +2042,7 @@ msgid "Steel sheets" msgstr "Plyty stalowe" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2074,32 +2074,32 @@ msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "BLAD STEROW. TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "RESET STEROW. TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "ZWARCIE STEROW. TMC" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "PRZEGRZANIE TMC" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "ZA NIS. NAPIECIE TMC" @@ -2133,7 +2133,7 @@ msgid "Testing filament" msgstr "Test filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2141,7 +2141,7 @@ msgstr "" "ruchu." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2206,12 +2206,12 @@ msgid "Tune" msgstr "Strojenie" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "ROZLAD. RECZNIE" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Rozladuj" @@ -2251,8 +2251,8 @@ msgid "Voltages" msgstr "Napiecia" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "UWAGA TMC ZA GORACY" @@ -2459,12 +2459,12 @@ msgid "MMU power fails" msgstr "Zaniki zas. MMU" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "WYSUNIĘTY FILAMENT" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2473,12 +2473,12 @@ msgstr "" "Sprawdź czujniki i okablowanie." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "PRZEGRZ. ŁADOW EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2487,8 +2487,8 @@ msgstr "" "filamentu. W razie potrzeby doprecyzuj kalibrację czujnika." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU POD NAPIĘCI. VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2498,17 +2498,17 @@ msgid "Material changes" msgstr "Wymiany materiałów" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Usuń wyrzucony filament z przodu MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2517,10 +2517,9 @@ msgstr "" "Upewnij się, że w selektorze nie ma filamentu i że FINDA działa prawidłowo." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." @@ -2538,6 +2537,16 @@ msgstr "Wykryto firmware MK3 w drukarce MK3S" msgid "MK3S firmware detected on MK3 printer" msgstr "Wykryto firmware MK3S w drukarce MK3" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "NIEZNANY BŁĄD" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Pojawił się nieoczekiwany błąd." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 3fff96201..dea8abebd 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -200,7 +200,7 @@ msgid "Brightness" msgstr "Luminozitate ecran" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "EROARE DE COMUNICARE" @@ -254,13 +254,13 @@ msgid "Calibration done" msgstr "Calibrare gata" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Select./Idler blocat" #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -422,7 +422,7 @@ msgid "Dim" msgstr "Minim" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Dezactiv" @@ -459,7 +459,7 @@ msgstr "" "suprafata de print?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Gata" @@ -560,18 +560,18 @@ msgstr "F. blocaj det" msgid "F. runout" msgstr "Fil. epuizat" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "FILAM. DEJA INCARCAT" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA NU SA DECLANST" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -580,7 +580,7 @@ msgstr "" "ca FINDA functioneaza." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -588,10 +588,10 @@ msgstr "" "FINDA nu sa declansat in timpul incarcarii. Asigurativa ca filamentul se " "misca si FINDA functioneaza." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. BLOCAT" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. BLOCAT" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -600,22 +600,22 @@ msgid "FS Action" msgstr "Actiune FS" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENZ NU SA DECLASAT" #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR PREA DEVREME" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: FIL. BLOCAT" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR FIL. BLOCAT" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "Eroare FW RUNTIME" @@ -714,8 +714,8 @@ msgstr "Fil. nu e incarcat" msgid "Filament sensor" msgstr "Senz. de filament" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -724,16 +724,16 @@ msgstr "" "filamentul se misca si senzorul functioneaza." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Senzorul de filament nu s-a declansast in timpul incarcarii Fil. Asigurativa" " ca filamentul a ajuns la fsenzor si senzorul functioneaza." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -927,22 +927,22 @@ msgid "I will run z calibration now." msgstr "Voi rula calibrarea Z acum." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "IDLER NU REVINE" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "IDLER NU SE MISCA" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "SPRAWDŹ FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "INSTRUMENT INVALID" @@ -983,7 +983,7 @@ msgid "" msgstr "Infige filamentul (nu-l incarca) in extruder si apasa butonul." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "" @@ -1103,12 +1103,12 @@ msgid "Loud" msgstr "Tare" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU UPDATE NECESAR" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Intermal MMU ERR, Va rog resetati MMU." @@ -1118,7 +1118,7 @@ msgid "MMU Mode" msgstr "Mod MMU" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NU RASPUNDE" @@ -1128,8 +1128,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Restabilirea temperaturii..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU AUTOTEST. ESUATA" @@ -1146,12 +1146,12 @@ msgid "MMU load fails" msgstr "Err. incarc MMU" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU nu raspunde corect. Verificati cablajul si conectorii." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU nu raspunde. Verificati cablajul si conectorii." @@ -1219,18 +1219,18 @@ msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Mai multe detalii online" @@ -1447,7 +1447,7 @@ msgstr "" "meniul Setari->Cal. PINDA" #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "PULLEY NU SE MISCA" @@ -1701,8 +1701,8 @@ msgstr "" "Diametrul varfului diferă de cel din G-code. Va rugam verificati valoarea in" " setari. Print anulat." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Motorul Pully sa blocat. Asigurativa ca scripetele se poate misca si " @@ -1715,7 +1715,7 @@ msgid "Pushing filament" msgstr "Introducere filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "QUEUE PLIN" @@ -1745,7 +1745,7 @@ msgid "Rename" msgstr "Redenumeste" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1782,7 +1782,7 @@ msgid "Retract from FINDA" msgstr "Retract de la FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Retry" @@ -1818,12 +1818,12 @@ msgid "SD card" msgstr "Card SD" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELECTOR NU REVINE" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR NU SE MISCA" @@ -2044,7 +2044,7 @@ msgid "Steel sheets" msgstr "Suprafete print" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stop" @@ -2076,32 +2076,32 @@ msgid "THERMAL ANOMALY" msgstr "ANOMALIE TERMICA" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "Eroare driver TMC" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "Reset driver TMC" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "DRIVER TMC IN SCURT" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "ERR TMC supraincalz." #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "ERR subtensiune TMC" @@ -2135,7 +2135,7 @@ msgid "Testing filament" msgstr "Testare filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2143,7 +2143,7 @@ msgstr "" "miscarea." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2207,12 +2207,12 @@ msgid "Tune" msgstr "Optiuni" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "DESCARCARE MANUALA" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Unload" @@ -2252,8 +2252,8 @@ msgid "Voltages" msgstr "Voltaje" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "TMC SUPRAINCALZIT" @@ -2462,12 +2462,12 @@ msgid "MMU power fails" msgstr "Err. MMU curent" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT EJECTAT" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2476,12 +2476,12 @@ msgstr "" " filament. Verificați senzorii și cablajul." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "A REUSIT ÎNCAR EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2490,8 +2490,8 @@ msgstr "" "Rafinați calibrarea senzorului, dacă este necesar." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU SUBTENSIUNE VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2501,17 +2501,17 @@ msgid "Material changes" msgstr "Schimburi material" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Scoateți filamentul ejectat din partea din față a MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2521,10 +2521,9 @@ msgstr "" "corect." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Actualizați la versiunea 2.1.9." @@ -2542,6 +2541,16 @@ msgstr "Firmware MK3 detectat pe imprimanta MK3S" msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectat pe imprimanta MK3" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "EROARE NECUNOSCUTĂ" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "A apărut o eroare neașteptată." + #~ msgid "XFLASH init" #~ msgstr "Init XFLASH" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index dc2ccf23f..b5caf0c44 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -198,7 +198,7 @@ msgid "Brightness" msgstr "Podsvietenie" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "COMMUNICATION ERROR" @@ -252,13 +252,13 @@ msgid "Calibration done" msgstr "Kalibracia OK" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Selektor alebo Idler nie je mozne presunut." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -419,7 +419,7 @@ msgid "Dim" msgstr "Tmavy" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Vypnut" @@ -456,7 +456,7 @@ msgstr "" "podlozkou?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Hotov" @@ -557,18 +557,18 @@ msgstr "F. zasek" msgid "F. runout" msgstr "F. vypadok" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" -msgstr "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" +msgstr "FIL. ALREADY LOADED" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA DIDNT TRIGGER" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -577,7 +577,7 @@ msgstr "" "ze filament sa moze hybat a FINDA funguje." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -585,10 +585,10 @@ msgstr "" "FINDA sa nezopol pocas zavedenia filamentu. Uiste sa, ze FINDA funguje " "spravne." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. STUCK" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. STUCK" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -597,22 +597,22 @@ msgid "FS Action" msgstr "FS Akcia" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR DIDNT TRIGG." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR TOO EARLY" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: FIL. STUCK" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR FIL. STUCK" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME ERROR" @@ -711,8 +711,8 @@ msgstr "Filament nezavedeny" msgid "Filament sensor" msgstr "Senzor filamentu" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -721,16 +721,16 @@ msgstr "" "filament moze hybat a senzor funguje spravne." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Senzor filamentu sa nezopol pocas zavedenia filamentu. Skontrolujte, ze " "filament dosiahol fsenzor a senzor funguje spravne." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -922,22 +922,22 @@ msgid "I will run z calibration now." msgstr "Teraz urobim kalibraciu Z." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "IDLER CANNOT HOME" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "IDLER CANNOT MOVE" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "KONTROLA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "INVALID TOOL" @@ -978,7 +978,7 @@ msgid "" msgstr "Vlozte filament (nezavadzajte) do extruderu a stlacte tlacidlo" #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "Interna chyba. Skuste resetovat MMU alebo aktualizovat firmware." @@ -1097,12 +1097,12 @@ msgid "Loud" msgstr "Hlasny" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE NEEDED" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "Chyba MMU Firmwaru, resetujte MMU." @@ -1112,7 +1112,7 @@ msgid "MMU Mode" msgstr "MMU mod" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU NOT RESPONDING" @@ -1122,8 +1122,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU: Obnovenie teploty..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SAMOTEST ZLYHAL" @@ -1140,12 +1140,12 @@ msgid "MMU load fails" msgstr "MMU zlyhalo" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU neodpoveda spravne.Skontrolujte zapojenie a konektory." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU neodpoveda. Skontrolujte zapojenie a konektory." @@ -1213,18 +1213,18 @@ msgid "Model" msgstr "Model" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Viac podrobnosti online." @@ -1442,7 +1442,7 @@ msgstr "" "menu Nastavenia->PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "PULLEY CANNOT MOVE" @@ -1696,8 +1696,8 @@ msgstr "" "Priemer trysky tlaciarne sa lisi od G-code. Prosim skontrolujte nastavenie. " "Tlac zrusena." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Motor remenice sa zasekol. Skontrolujte, ze sa remenica moze hybat a jej " @@ -1710,7 +1710,7 @@ msgid "Pushing filament" msgstr "Tlacenie filamentu" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "QUEUE FULL" @@ -1740,7 +1740,7 @@ msgid "Rename" msgstr "Premenovat" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1777,7 +1777,7 @@ msgid "Retract from FINDA" msgstr "Vybrat z FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Znova" @@ -1813,12 +1813,12 @@ msgid "SD card" msgstr "SD karta" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "SELECTOR CANNOT HOME" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR CANNOT MOVE" @@ -2034,7 +2034,7 @@ msgid "Steel sheets" msgstr "Platne" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Zast." @@ -2066,32 +2066,32 @@ msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER ERROR" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER SHORTED" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC OVERHEAT ERROR" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERVOLTAGE ERR" @@ -2125,7 +2125,7 @@ msgid "Testing filament" msgstr "Kontrola filamentu" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2133,7 +2133,7 @@ msgstr "" "pohyb." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2197,12 +2197,12 @@ msgid "Tune" msgstr "Ladit" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "UNLOAD MANUALLY" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Vysuv" @@ -2242,8 +2242,8 @@ msgid "Voltages" msgstr "Napatie" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "WARNING TMC TOO HOT" @@ -2446,12 +2446,12 @@ msgid "MMU power fails" msgstr "MMU vyp. prudu" #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT VYSUNUTY" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2460,12 +2460,12 @@ msgstr "" " Skontrolujte snímače a kabeláž." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "ZLYHALO ZAVED. EXTR" #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2474,9 +2474,9 @@ msgstr "" " potreby upravte kalibráciu snímača." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" -msgstr "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" +msgstr "MMU MCU UNDERPOWER" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 @@ -2485,17 +2485,17 @@ msgid "Material changes" msgstr "Výmena materiálu" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Odstráňte vysunutý filament z prednej časti MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2504,10 +2504,9 @@ msgstr "" " v selektore nie je žiadny filament a FINDA funguje správne." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." @@ -2525,6 +2524,16 @@ msgstr "MK3 firmware na MK3S tlaciarni" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware na MK3 tlaciarni" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "NEZNÁMA CHYBA" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Vyskytla sa neočakávaná chyba." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 8853fc8bb..4bfa8a2cc 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -199,7 +199,7 @@ msgid "Brightness" msgstr "Ljusstyrka" #. MSG_TITLE_COMMUNICATION_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:178 ../../Firmware/mmu2/errors_list.h:224 msgid "COMMUNICATION ERROR" msgstr "KOMMUNIKATIONSFEL" @@ -253,13 +253,13 @@ msgid "Calibration done" msgstr "Kalibraring utförd" #. MSG_DESC_CANNOT_MOVE c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:234 ../../Firmware/mmu2/errors_list.h:285 -#: ../../Firmware/mmu2/errors_list.h:287 +#: ../../Firmware/mmu2/errors_list.h:246 ../../Firmware/mmu2/errors_list.h:301 +#: ../../Firmware/mmu2/errors_list.h:303 msgid "Can't move Selector or Idler." msgstr "Kan inte flytta väljaren eller Idlern." #. MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:260 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:275 ../../Firmware/mmu2/errors_list.h:328 msgid "" "Cannot perform the action, filament is already loaded. Unload it first." msgstr "" @@ -420,7 +420,7 @@ msgid "Dim" msgstr "Dim" #. MSG_BTN_DISABLE_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:334 ../../Firmware/mmu2/errors_list.h:344 +#: ../../Firmware/mmu2/errors_list.h:351 ../../Firmware/mmu2/errors_list.h:361 msgid "Disable" msgstr "Inaktiv." @@ -457,7 +457,7 @@ msgstr "" "bädden?" #. MSG_BTN_CONTINUE c=8 -#: ../../Firmware/mmu2/errors_list.h:330 ../../Firmware/mmu2/errors_list.h:340 +#: ../../Firmware/mmu2/errors_list.h:347 ../../Firmware/mmu2/errors_list.h:357 msgid "Done" msgstr "Klar" @@ -558,18 +558,18 @@ msgstr "F.stopp skett" msgid "F. runout" msgstr "F. slut" -#. MSG_TITLE_FIL_ALREADY_LOADED c=20 -#: ../../Firmware/mmu2/errors_list.h:169 ../../Firmware/mmu2/errors_list.h:214 -msgid "FILAMENT ALREADY LOA" +#. MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 +#: ../../Firmware/mmu2/errors_list.h:179 ../../Firmware/mmu2/errors_list.h:225 +msgid "FIL. ALREADY LOADED" msgstr "F. REDAN INLADDAT" #. MSG_TITLE_FINDA_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:135 ../../Firmware/mmu2/errors_list.h:178 +#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:189 msgid "FINDA DIDNT TRIGGER" msgstr "FINDA TRIGGADES EJ" -#. MSG_DESC_FINDA_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:226 ../../Firmware/mmu2/errors_list.h:277 +#. MSG_DESC_FINDA_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:293 msgid "" "FINDA didn't switch off while unloading filament. Try unloading manually. " "Ensure filament can move and FINDA works." @@ -578,7 +578,7 @@ msgstr "" "manuellt. Se till att filamentet kan röra sig och att FINDA fungerar." #. MSG_DESC_FINDA_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:225 ../../Firmware/mmu2/errors_list.h:276 +#: ../../Firmware/mmu2/errors_list.h:237 ../../Firmware/mmu2/errors_list.h:292 msgid "" "FINDA didn't trigger while loading the filament. Ensure the filament can " "move and FINDA works." @@ -586,10 +586,10 @@ msgstr "" "FINDA triggades inte vid inladdning av filamment. Se till att filament kan " "röra sig och att FINDA fungerar." -#. MSG_TITLE_FINDA_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:136 ../../Firmware/mmu2/errors_list.h:179 -msgid "FINDA: FILAM. STUCK" -msgstr "FINDA: FILAM. STOPP" +#. MSG_TITLE_FINDA_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:190 +msgid "FINDA FILAM. STUCK" +msgstr "FINDA FILAM. STOPP" #. MSG_FS_ACTION c=10 #: ../../Firmware/messages.cpp:159 ../../Firmware/ultralcd.cpp:4048 @@ -598,22 +598,22 @@ msgid "FS Action" msgstr "FS aktion" #. MSG_TITLE_FSENSOR_DIDNT_TRIGGER c=20 -#: ../../Firmware/mmu2/errors_list.h:137 ../../Firmware/mmu2/errors_list.h:180 +#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:191 msgid "FSENSOR DIDNT TRIGG." msgstr "FSENSOR TRIGGADE EJ." #. MSG_TITLE_FSENSOR_TOO_EARLY c=20 -#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:183 +#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:194 msgid "FSENSOR TOO EARLY" msgstr "FSENSOR FÖR TIDIG" -#. MSG_TITLE_FSENSOR_DIDNT_GO_OFF c=20 -#: ../../Firmware/mmu2/errors_list.h:138 ../../Firmware/mmu2/errors_list.h:181 -msgid "FSENSOR: FIL. STUCK" -msgstr "FSENSOR: FIL. STOPP" +#. MSG_TITLE_FSENSOR_FILAMENT_STUCK c=20 +#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:192 +msgid "FSENSOR FIL. STUCK" +msgstr "FSENSOR FIL. STOPP" #. MSG_TITLE_FW_RUNTIME_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:173 ../../Firmware/mmu2/errors_list.h:218 +#: ../../Firmware/mmu2/errors_list.h:183 ../../Firmware/mmu2/errors_list.h:229 msgid "FW RUNTIME ERROR" msgstr "FW RUNTIME FEL" @@ -712,8 +712,8 @@ msgstr "Filament ej laddat" msgid "Filament sensor" msgstr "Filament sensor" -#. MSG_DESC_FSENSOR_DIDNT_GO_OFF c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:228 ../../Firmware/mmu2/errors_list.h:279 +#. MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:240 ../../Firmware/mmu2/errors_list.h:295 msgid "" "Filament sensor didn't switch off while unloading filament. Ensure filament " "can move and the sensor works." @@ -722,16 +722,16 @@ msgstr "" "filamentet kan röra sig och att sensorn fungerar." #. MSG_DESC_FSENSOR_DIDNT_TRIGGER c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:227 ../../Firmware/mmu2/errors_list.h:278 +#: ../../Firmware/mmu2/errors_list.h:239 ../../Firmware/mmu2/errors_list.h:294 msgid "" -"Filament sensor didn't trigger while loading the filament. Ensure the " -"filament reached the fsensor and the sensor works." +"Filament sensor didn't trigger while loading the filament. Ensure the sensor" +" is calibrated and the filament reached it." msgstr "" "Filamentsensorn triggades inte av när filamentet laddades in.Se till att " "filamentet kan röra sig och att sensorn fungerar." #. MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:230 ../../Firmware/mmu2/errors_list.h:281 +#: ../../Firmware/mmu2/errors_list.h:242 ../../Firmware/mmu2/errors_list.h:297 msgid "" "Filament sensor triggered too early while loading to extruder. Check there " "isn't anything stuck in PTFE tube. Check that sensor reads properly." @@ -925,22 +925,22 @@ msgid "I will run z calibration now." msgstr "Jag kommer att utföra z-kalibrering nu." #. MSG_TITLE_IDLER_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:188 +#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:199 msgid "IDLER CANNOT HOME" msgstr "IDLER HEMPOS FEL" #. MSG_TITLE_IDLER_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:189 +#: ../../Firmware/mmu2/errors_list.h:146 ../../Firmware/mmu2/errors_list.h:200 msgid "IDLER CANNOT MOVE" msgstr "IDLER KAN EJ FLYTTA" #. MSG_TITLE_INSPECT_FINDA c=20 -#: ../../Firmware/mmu2/errors_list.h:141 ../../Firmware/mmu2/errors_list.h:184 +#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:195 msgid "INSPECT FINDA" msgstr "KONTROLLERA FINDA" #. MSG_TITLE_INVALID_TOOL c=20 -#: ../../Firmware/mmu2/errors_list.h:170 ../../Firmware/mmu2/errors_list.h:215 +#: ../../Firmware/mmu2/errors_list.h:180 ../../Firmware/mmu2/errors_list.h:226 msgid "INVALID TOOL" msgstr "OGILTIGT VERKTYG" @@ -983,7 +983,7 @@ msgstr "" "knappen." #. MSG_DESC_FW_RUNTIME_ERROR c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:263 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:278 ../../Firmware/mmu2/errors_list.h:332 msgid "" "Internal runtime error. Try resetting the MMU or updating the firmware." msgstr "Internt körtidsfel. Prova återställa MMU eller uppdatera firmware." @@ -1102,12 +1102,12 @@ msgid "Loud" msgstr "Högt" #. MSG_TITLE_FW_UPDATE_NEEDED c=20 -#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:217 +#: ../../Firmware/mmu2/errors_list.h:182 ../../Firmware/mmu2/errors_list.h:228 msgid "MMU FW UPDATE NEEDED" msgstr "MMU FW UPDATE KRÄVS" #. MSG_DESC_QUEUE_FULL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:262 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:277 ../../Firmware/mmu2/errors_list.h:330 msgid "MMU Firmware internal error, please reset the MMU." msgstr "MMU Firmware internt fel, vänligen återställ MMU." @@ -1117,7 +1117,7 @@ msgid "MMU Mode" msgstr "MMU-läge" #. MSG_TITLE_MMU_NOT_RESPONDING c=20 -#: ../../Firmware/mmu2/errors_list.h:167 ../../Firmware/mmu2/errors_list.h:212 +#: ../../Firmware/mmu2/errors_list.h:177 ../../Firmware/mmu2/errors_list.h:223 msgid "MMU NOT RESPONDING" msgstr "MMU SVARAR INTE" @@ -1127,8 +1127,8 @@ msgid "MMU Retry: Restoring temperature..." msgstr "MMU försök igen: Återställer temperatur..." #. MSG_TITLE_SELFTEST_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:165 ../../Firmware/mmu2/errors_list.h:208 -#: ../../Firmware/mmu2/errors_list.h:209 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" msgstr "MMU SJÄLVTEST FELADE" @@ -1145,12 +1145,12 @@ msgid "MMU load fails" msgstr "MMU-laddn felar" #. MSG_DESC_COMMUNICATION_ERROR c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:259 ../../Firmware/mmu2/errors_list.h:311 +#: ../../Firmware/mmu2/errors_list.h:274 ../../Firmware/mmu2/errors_list.h:327 msgid "MMU not responding correctly. Check the wiring and connectors." msgstr "MMU svarar inte korrekt. Kontrollera kablarna och kontakterna." #. MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 -#: ../../Firmware/mmu2/errors_list.h:258 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:273 ../../Firmware/mmu2/errors_list.h:326 msgid "MMU not responding. Check the wiring and connectors." msgstr "MMU svarar inte. Kontrollera kablarna och kontakterna." @@ -1218,18 +1218,18 @@ msgid "Model" msgstr "Modell" #. MSG_DESC_TMC c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:238 ../../Firmware/mmu2/errors_list.h:288 -#: ../../Firmware/mmu2/errors_list.h:289 ../../Firmware/mmu2/errors_list.h:290 -#: ../../Firmware/mmu2/errors_list.h:291 ../../Firmware/mmu2/errors_list.h:292 -#: ../../Firmware/mmu2/errors_list.h:293 ../../Firmware/mmu2/errors_list.h:294 -#: ../../Firmware/mmu2/errors_list.h:295 ../../Firmware/mmu2/errors_list.h:296 -#: ../../Firmware/mmu2/errors_list.h:297 ../../Firmware/mmu2/errors_list.h:298 -#: ../../Firmware/mmu2/errors_list.h:299 ../../Firmware/mmu2/errors_list.h:300 -#: ../../Firmware/mmu2/errors_list.h:301 ../../Firmware/mmu2/errors_list.h:302 -#: ../../Firmware/mmu2/errors_list.h:303 ../../Firmware/mmu2/errors_list.h:304 +#: ../../Firmware/mmu2/errors_list.h:250 ../../Firmware/mmu2/errors_list.h:304 #: ../../Firmware/mmu2/errors_list.h:305 ../../Firmware/mmu2/errors_list.h:306 #: ../../Firmware/mmu2/errors_list.h:307 ../../Firmware/mmu2/errors_list.h:308 -#: ../../Firmware/mmu2/errors_list.h:309 +#: ../../Firmware/mmu2/errors_list.h:309 ../../Firmware/mmu2/errors_list.h:310 +#: ../../Firmware/mmu2/errors_list.h:311 ../../Firmware/mmu2/errors_list.h:312 +#: ../../Firmware/mmu2/errors_list.h:313 ../../Firmware/mmu2/errors_list.h:314 +#: ../../Firmware/mmu2/errors_list.h:315 ../../Firmware/mmu2/errors_list.h:316 +#: ../../Firmware/mmu2/errors_list.h:317 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:319 ../../Firmware/mmu2/errors_list.h:320 +#: ../../Firmware/mmu2/errors_list.h:321 ../../Firmware/mmu2/errors_list.h:322 +#: ../../Firmware/mmu2/errors_list.h:323 ../../Firmware/mmu2/errors_list.h:324 +#: ../../Firmware/mmu2/errors_list.h:325 msgid "More details online." msgstr "Mera detaljer online." @@ -1448,7 +1448,7 @@ msgstr "" "menyn Inställningar->PINDA kal." #. MSG_TITLE_PULLEY_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:139 ../../Firmware/mmu2/errors_list.h:182 +#: ../../Firmware/mmu2/errors_list.h:140 ../../Firmware/mmu2/errors_list.h:193 msgid "PULLEY CANNOT MOVE" msgstr "REMSKIVA FASTNAT" @@ -1702,8 +1702,8 @@ msgstr "" "Skrivarmunstyckets diameter skiljer sig från G-codeen. Kontrollera värdet i " "inställningarna. Utskriften avbröts." -#. MSG_DESC_PULLEY_STALLED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:229 ../../Firmware/mmu2/errors_list.h:280 +#. MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:241 ../../Firmware/mmu2/errors_list.h:296 msgid "Pulley motor stalled. Ensure the pulley can move and check the wiring." msgstr "" "Remskivans motor stannade. Se till att remskivan kan röra sig och " @@ -1716,7 +1716,7 @@ msgid "Pushing filament" msgstr "Pressar filament" #. MSG_TITLE_QUEUE_FULL c=20 -#: ../../Firmware/mmu2/errors_list.h:171 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:181 ../../Firmware/mmu2/errors_list.h:227 msgid "QUEUE FULL" msgstr "KÖ FULL" @@ -1746,7 +1746,7 @@ msgid "Rename" msgstr "Döp om" #. MSG_DESC_INVALID_TOOL c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:261 ../../Firmware/mmu2/errors_list.h:313 +#: ../../Firmware/mmu2/errors_list.h:276 ../../Firmware/mmu2/errors_list.h:329 msgid "" "Requested filament tool is not available on this hardware. Check the G-code " "for tool index out of range (T0-T4)." @@ -1783,7 +1783,7 @@ msgid "Retract from FINDA" msgstr "Dra in från FINDA" #. MSG_BTN_RETRY c=8 -#: ../../Firmware/mmu2/errors_list.h:329 ../../Firmware/mmu2/errors_list.h:339 +#: ../../Firmware/mmu2/errors_list.h:346 ../../Firmware/mmu2/errors_list.h:356 msgid "Retry" msgstr "Igen" @@ -1819,12 +1819,12 @@ msgid "SD card" msgstr "SD-kort" #. MSG_TITLE_SELECTOR_CANNOT_HOME c=20 -#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:186 +#: ../../Firmware/mmu2/errors_list.h:145 ../../Firmware/mmu2/errors_list.h:197 msgid "SELECTOR CANNOT HOME" msgstr "VÄLJARE FASTNAT" #. MSG_TITLE_SELECTOR_CANNOT_MOVE c=20 -#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:187 +#: ../../Firmware/mmu2/errors_list.h:144 ../../Firmware/mmu2/errors_list.h:198 msgid "SELECTOR CANNOT MOVE" msgstr "VÄLJARE FASTNAT" @@ -2042,7 +2042,7 @@ msgid "Steel sheets" msgstr "Metallskivor" #. MSG_BTN_STOP c=8 -#: ../../Firmware/mmu2/errors_list.h:333 ../../Firmware/mmu2/errors_list.h:343 +#: ../../Firmware/mmu2/errors_list.h:350 ../../Firmware/mmu2/errors_list.h:360 msgid "Stop" msgstr "Stopp" @@ -2074,32 +2074,32 @@ msgid "THERMAL ANOMALY" msgstr "TERMISK ANOMALI" #. MSG_TITLE_TMC_DRIVER_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:153 ../../Firmware/mmu2/errors_list.h:196 -#: ../../Firmware/mmu2/errors_list.h:197 ../../Firmware/mmu2/errors_list.h:198 +#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:208 ../../Firmware/mmu2/errors_list.h:209 msgid "TMC DRIVER ERROR" msgstr "TMC DRIVER FEL" #. MSG_TITLE_TMC_DRIVER_RESET c=20 -#: ../../Firmware/mmu2/errors_list.h:156 ../../Firmware/mmu2/errors_list.h:199 -#: ../../Firmware/mmu2/errors_list.h:200 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:160 ../../Firmware/mmu2/errors_list.h:210 +#: ../../Firmware/mmu2/errors_list.h:211 ../../Firmware/mmu2/errors_list.h:212 msgid "TMC DRIVER RESET" msgstr "TMC DRIVER RESET" #. MSG_TITLE_TMC_DRIVER_SHORTED c=20 -#: ../../Firmware/mmu2/errors_list.h:162 ../../Firmware/mmu2/errors_list.h:205 -#: ../../Firmware/mmu2/errors_list.h:206 ../../Firmware/mmu2/errors_list.h:207 +#: ../../Firmware/mmu2/errors_list.h:168 ../../Firmware/mmu2/errors_list.h:216 +#: ../../Firmware/mmu2/errors_list.h:217 ../../Firmware/mmu2/errors_list.h:218 msgid "TMC DRIVER SHORTED" msgstr "TMC DRIVER KORTSLUTN" #. MSG_TITLE_TMC_OVERHEAT_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:150 ../../Firmware/mmu2/errors_list.h:193 -#: ../../Firmware/mmu2/errors_list.h:194 ../../Firmware/mmu2/errors_list.h:195 +#: ../../Firmware/mmu2/errors_list.h:152 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:205 ../../Firmware/mmu2/errors_list.h:206 msgid "TMC OVERHEAT ERROR" msgstr "TMC ÖVERHETTNINGSFEL" #. MSG_TITLE_TMC_UNDERVOLTAGE_ERROR c=20 -#: ../../Firmware/mmu2/errors_list.h:159 ../../Firmware/mmu2/errors_list.h:202 -#: ../../Firmware/mmu2/errors_list.h:203 ../../Firmware/mmu2/errors_list.h:204 +#: ../../Firmware/mmu2/errors_list.h:164 ../../Firmware/mmu2/errors_list.h:213 +#: ../../Firmware/mmu2/errors_list.h:214 ../../Firmware/mmu2/errors_list.h:215 msgid "TMC UNDERVOLTAGE ERR" msgstr "TMC UNDERSPÄNNINGFEL" @@ -2133,7 +2133,7 @@ msgid "Testing filament" msgstr "Testar filament" #. MSG_DESC_IDLER_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:236 ../../Firmware/mmu2/errors_list.h:286 +#: ../../Firmware/mmu2/errors_list.h:248 ../../Firmware/mmu2/errors_list.h:302 msgid "" "The Idler cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2141,7 +2141,7 @@ msgstr "" "blockerar dess rörelse." #. MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:233 ../../Firmware/mmu2/errors_list.h:284 +#: ../../Firmware/mmu2/errors_list.h:245 ../../Firmware/mmu2/errors_list.h:300 msgid "" "The Selector cannot home properly. Check for anything blocking its movement." msgstr "" @@ -2205,12 +2205,12 @@ msgid "Tune" msgstr "Ställ in" #. MSG_TITLE_UNLOAD_MANUALLY c=20 -#: ../../Firmware/mmu2/errors_list.h:174 ../../Firmware/mmu2/errors_list.h:219 +#: ../../Firmware/mmu2/errors_list.h:184 ../../Firmware/mmu2/errors_list.h:230 msgid "UNLOAD MANUALLY" msgstr "LADDA UR MANUELLT" #. MSG_BTN_UNLOAD c=8 -#: ../../Firmware/mmu2/errors_list.h:332 ../../Firmware/mmu2/errors_list.h:342 +#: ../../Firmware/mmu2/errors_list.h:349 ../../Firmware/mmu2/errors_list.h:359 msgid "Unload" msgstr "Ladda ur" @@ -2250,8 +2250,8 @@ msgid "Voltages" msgstr "Spänning" #. MSG_TITLE_TMC_WARNING_TMC_TOO_HOT c=20 -#: ../../Firmware/mmu2/errors_list.h:147 ../../Firmware/mmu2/errors_list.h:190 -#: ../../Firmware/mmu2/errors_list.h:191 ../../Firmware/mmu2/errors_list.h:192 +#: ../../Firmware/mmu2/errors_list.h:148 ../../Firmware/mmu2/errors_list.h:201 +#: ../../Firmware/mmu2/errors_list.h:202 ../../Firmware/mmu2/errors_list.h:203 msgid "WARNING TMC TOO HOT" msgstr "VARNING TMC FÖR VARM" @@ -2453,12 +2453,12 @@ msgid "MMU power fails" msgstr "MMU strömavbr." #. MSG_TITLE_FILAMENT_EJECTED c=20 -#: ../../Firmware/mmu2/errors_list.h:175 ../../Firmware/mmu2/errors_list.h:220 +#: ../../Firmware/mmu2/errors_list.h:185 ../../Firmware/mmu2/errors_list.h:231 msgid "FILAMENT EJECTED" msgstr "FILAMENT UTASTAT" #. MSG_DESC_UNLOAD_MANUALLY c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:264 ../../Firmware/mmu2/errors_list.h:317 +#: ../../Firmware/mmu2/errors_list.h:279 ../../Firmware/mmu2/errors_list.h:333 msgid "" "Filament detected unexpectedly. Ensure no filament is loaded. Check the " "sensors and wiring." @@ -2467,12 +2467,12 @@ msgstr "" "Kontrollera sensorerna och kablarna." #. MSG_TITLE_LOAD_TO_EXTRUDER_FAILED c=20 -#: ../../Firmware/mmu2/errors_list.h:142 ../../Firmware/mmu2/errors_list.h:185 +#: ../../Firmware/mmu2/errors_list.h:143 ../../Firmware/mmu2/errors_list.h:196 msgid "LOAD TO EXTR. FAILED" msgstr "MISLUKT LADDA EXTR." #. MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:232 ../../Firmware/mmu2/errors_list.h:283 +#: ../../Firmware/mmu2/errors_list.h:244 ../../Firmware/mmu2/errors_list.h:299 msgid "" "Loading to extruder failed. Inspect the filament tip shape. Refine the " "sensor calibration, if needed." @@ -2481,8 +2481,8 @@ msgstr "" "Förfina sensorkalibreringen vid behov." #. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 -#: ../../Firmware/mmu2/errors_list.h:166 ../../Firmware/mmu2/errors_list.h:211 -msgid "MCU UNDERVOLTAGE VCC" +#: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 +msgid "MMU MCU UNDERPOWER" msgstr "MCU UNDERSPÄNN. VCC" #. MSG_MATERIAL_CHANGES c=18 @@ -2492,17 +2492,17 @@ msgid "Material changes" msgstr "Materialutbyten" #. MSG_DESC_FILAMENT_EJECTED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:265 ../../Firmware/mmu2/errors_list.h:318 +#: ../../Firmware/mmu2/errors_list.h:280 ../../Firmware/mmu2/errors_list.h:334 msgid "Remove the ejected filament from the front of the MMU." msgstr "Ta bort den utskjutna filament från framsidan av MMU." -#. MSG_BTN_RESTART_MMU c=8 -#: ../../Firmware/mmu2/errors_list.h:331 ../../Firmware/mmu2/errors_list.h:341 -msgid "RstMMU" -msgstr "RstMMU" +#. MSG_BTN_RESET_MMU c=8 +#: ../../Firmware/mmu2/errors_list.h:348 ../../Firmware/mmu2/errors_list.h:358 +msgid "ResetMMU" +msgstr "ResetMMU" #. MSG_DESC_INSPECT_FINDA c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:231 ../../Firmware/mmu2/errors_list.h:282 +#: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" " is in selector and FINDA works properly." @@ -2511,10 +2511,9 @@ msgstr "" "till att inget glödtråd är i väljaren och att FINDA fungerar korrekt." #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 -#: ../../Firmware/mmu2/errors_list.h:268 ../../Firmware/mmu2/errors_list.h:315 +#: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"The MMU firmware version incompatible with the printer's FW. Update to " -"version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 2.1.9." msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "version 2.1.9." @@ -2532,6 +2531,16 @@ msgstr "MK3-firmware upptäckt på MK3S-skrivare" msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-firmware upptäckt på MK3-skrivare" +#. MSG_TITLE_UNKNOWN_ERROR c=20 +#: ../../Firmware/mmu2/errors_list.h:186 ../../Firmware/mmu2/errors_list.h:232 +msgid "UNKNOWN ERROR" +msgstr "OKÄNT FEL" + +#. MSG_DESC_UNKNOWN_ERROR c=20 r=8 +#: ../../Firmware/mmu2/errors_list.h:281 ../../Firmware/mmu2/errors_list.h:335 +msgid "Unexpected error occurred." +msgstr "Ett oväntat fel inträffade." + #~ msgid "XFLASH init" #~ msgstr "XFLASH init" From 1f740f622ccb64da2b8efa42631e8dda816afd11 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 21 Jun 2023 08:43:17 +0200 Subject: [PATCH 045/148] Add Arc, MeatPack and REVO --- Community_made.md | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/Community_made.md b/Community_made.md index efa8af415..1be499844 100644 --- a/Community_made.md +++ b/Community_made.md @@ -1,5 +1,6 @@ # Community made - +Community made features aren't fully supported by Prusa and the owners are responsible to maintain them. +In case the feature isn't maintained OR causes issues Prusa will deactivate these. ## Prusa-Firmware build - `PF-build.sh` - Maintainers: **@3d-gussner** @@ -32,5 +33,33 @@ After compiling with `PF-build.sh` you get the option to start the `MK404` simul Help `./MK404-build.sh -h` -## Translations +# Translations - see [/lang/Community_made_translations.md](https://github.com/prusa3d/Prusa-Firmware/blob/MK3/lang/Community_made_translations.md) + +# Arc interpolation features +**Arc interpolation features by @FormerLurker** +Please read more about it [here](https://github.com/prusa3d/Prusa-Firmware/pull/2657) and [here](https://github.com/FormerLurker/ArcWelderPlugin) + +- Maintainers: **@FormerLurker** +- Co-maintainers: +- Contributors: +- [X] **Active** since January 2023 +- [X] **Maintained** since May 2020 + +# MeatPack +**MeatPack by @scottmudge** +Please read more about it [here](https://github.com/prusa3d/Prusa-Firmware/pull/2955), [here](https://github.com/prusa3d/Prusa-Firmware/pull/4067) and [here](https://github.com/scottmudge/OctoPrint-MeatPack/) + +- Maintainers: **@scottmudge** +- Co-maintainers: +- Contributors: +- [X] **Active** since April 2023 +- [X] **Maintained** since January 2021 + +# E3D Revo +**The E3D REVO support is a community effort thanks to these Contributors, E3D and others.** +- Maintainers: **E3D** +- Co-maintainers: +- Contributors: @alexiri @kromeninja @ulab @JWvP @snafu1282 @matthiazzz @sdh2 @jdrozdz @peschkaj @MarcelTh @zuidwijk @davejhilton @WhiterRice @NightSkySK @D-an-W +- [X] **Active** since June 2023 +- [X] **Maintained** since April 2023 From 5f9cece2da65fefc02c03565994ed788b3e1c46d Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 26 Jun 2023 10:32:13 +0200 Subject: [PATCH 046/148] Update REVO TM warning a error values --- Firmware/temp_model/e3d_REVO.h | 4 ++-- Firmware/temp_model/e3d_REVO_HF_60W.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/temp_model/e3d_REVO.h b/Firmware/temp_model/e3d_REVO.h index fe67aa21f..d129cd11b 100644 --- a/Firmware/temp_model/e3d_REVO.h +++ b/Firmware/temp_model/e3d_REVO.h @@ -12,8 +12,8 @@ #define TEMP_MODEL_E3D_REVO_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) #define TEMP_MODEL_E3D_REVO_LAG 270 // sim. response lag (ms, 0-2160) -#define TEMP_MODEL_E3D_REVO_W 1.2 // Default warning threshold (K/s) -#define TEMP_MODEL_E3D_REVO_E 1.74 // Default error threshold (K/s) +#define TEMP_MODEL_E3D_REVO_W 0.85 // Default warning threshold (K/s) +#define TEMP_MODEL_E3D_REVO_E 1.23 // Default error threshold (K/s) // fall-back resistance vector (R0-15) #define TEMP_MODEL_E3D_REVO_Rv {TEMP_MODEL_E3D_REVO_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} diff --git a/Firmware/temp_model/e3d_REVO_HF_60W.h b/Firmware/temp_model/e3d_REVO_HF_60W.h index 05044413e..1da2c22ea 100644 --- a/Firmware/temp_model/e3d_REVO_HF_60W.h +++ b/Firmware/temp_model/e3d_REVO_HF_60W.h @@ -12,8 +12,8 @@ #define TEMP_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) #define TEMP_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) -#define TEMP_MODEL_E3D_REVO_HF_60W_W 0.75 // Default warning threshold (K/s) -#define TEMP_MODEL_E3D_REVO_HF_60W_E 0.90 // Default error threshold (K/s) +#define TEMP_MODEL_E3D_REVO_HF_60W_W 0.85 // Default warning threshold (K/s) +#define TEMP_MODEL_E3D_REVO_HF_60W_E 1.23 // Default error threshold (K/s) // fall-back resistance vector (R0-15) #define TEMP_MODEL_E3D_REVO_HF_60W_Rv {TEMP_MODEL_E3D_REVO_HF_60W_R, 29.0, 27.5, 24.5, 23.4, 22.3, 21.2, 20.2, 19.8, 19.4, 19.0, 18.6, 18.3, 18.1, 17.9, 17.7} From 136ef9696d51715481a6e3f3774d9eaef3ea5d57 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 26 Jun 2023 10:08:44 +0200 Subject: [PATCH 047/148] Do not check MMU version with `M862.3` for MK3|MK3S --- Firmware/util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 466c8e19b..fff8dd31d 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -408,14 +408,14 @@ return pStrBegin; void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel) { char* pResult; -size_t nLength,nPrinterNameLength; +size_t nLength; -nPrinterNameLength = strlen_P(actualPrinterSModel); pResult=code_string(pStrPos,&nLength); -if(pResult != NULL && nLength == nPrinterNameLength) { - // Only compare them if the lengths match - if (strncmp_P(pResult, actualPrinterSModel, nLength) == 0) return; +if(pResult != NULL) { + // Only compare first 6 chars on MK3|MK3S + if (strncmp_P(pResult, PSTR("MK3"), 3) == 0) nLength = 6; + if (strncmp_P(pResult, actualPrinterSModel, nLength) == 0) return; } render_M862_warnings( From 10e2357cc52314ae2df63b29260274aea0d82de2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 26 Jun 2023 10:10:00 +0200 Subject: [PATCH 048/148] Change MMU2 to MMU3 --- Firmware/Marlin_main.cpp | 4 +++- Firmware/eeprom.h | 2 ++ Firmware/printers.h | 4 ++++ Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 4 ++-- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 4 ++-- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 4 ++-- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 4 ++-- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b009d2b3c..8cce3da4d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7921,9 +7921,11 @@ Sigma_Exit: - MK2.5SMMU2S (20252) - MK3 (300) - MK3MMU2 (20300) + - MK3MMU3 (30300) - MK3S (302) - MK3SMMU2S (20302) - + - MK3SMMU3 (30302) + */ case 862: // M862: print checking { diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index e54984d53..93a8b23da 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -201,8 +201,10 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 1c 4fh 20252 | ^ | PRINTER_MK2.5S with MMU2S | ??? | ^ | ^ | ^ | ^ | 2c 01h 300 | ^ | PRINTER_MK3 | ??? | ^ | ^ | ^ | ^ | 4c 4fh 20300 | ^ | PRINTER_MK3 with MMU2 | ??? | ^ +| ^ | ^ | ^ | 5c 76h 30300 | ^ | PRINTER_MK3 with MMU3 | ??? | ^ | ^ | ^ | ^ | 2e 01h 302 | ^ | PRINTER_MK3S | ??? | ^ | ^ | ^ | ^ | 4e 4fh 20302 | ^ | PRINTER_MK3S with MMU2S | ??? | ^ +| ^ | ^ | ^ | 5e 76h 30302 | ^ | PRINTER_MK3S with MMU3 | ??? | ^ | 0x0EEC 3820 | uint16 | EEPROM_BOARD_TYPE | ??? | ff ffh 65535 | Board Type | ??? | D3 Ax0eec C2 | ^ | ^ | ^ | c8 00h 200 | ^ | BOARD_RAMBO_MINI_1_0 | ??? | ^ | ^ | ^ | ^ | cb 00h 203 | ^ | BOARD_RAMBO_MINI_1_3 | ??? | ^ diff --git a/Firmware/printers.h b/Firmware/printers.h index e26431302..2a9616e4a 100644 --- a/Firmware/printers.h +++ b/Firmware/printers.h @@ -31,10 +31,14 @@ #define PRINTER_MK3_NAME "MK3" #define PRINTER_MK3_MMU2 20300 #define PRINTER_MK3_MMU2_NAME "MK3MMU2" +#define PRINTER_MK3_MMU3 30300 +#define PRINTER_MK3_MMU3_NAME "MK3MMU3" // *** MK3S #define PRINTER_MK3S 302 #define PRINTER_MK3S_NAME "MK3S" #define PRINTER_MK3S_MMU2 20302 #define PRINTER_MK3S_MMU2_NAME "MK3SMMU2S" +#define PRINTER_MK3S_MMU3 30302 +#define PRINTER_MK3S_MMU3_NAME "MK3SMMU3" #endif //PRINTERS_H diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index afed016eb..01f3f54f4 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -12,8 +12,8 @@ #define PRINTER_TYPE PRINTER_MK3 #define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3DREVO" diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 21adab2d1..751ae579e 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -12,8 +12,8 @@ #define PRINTER_TYPE PRINTER_MK3 #define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3Dv6full" diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index 4638cb3fc..2a44ee101 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -11,8 +11,8 @@ #define PRINTER_TYPE PRINTER_MK3S #define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3S" #define NOZZLE_TYPE "E3DREVO" diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index ee7550acd..bc861ed06 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -11,8 +11,8 @@ #define PRINTER_TYPE PRINTER_MK3S #define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3S" #define NOZZLE_TYPE "E3Dv6full" From 3ddd691f4405960336224f031ce39e665c3e6486 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 28 Jun 2023 17:15:14 +0200 Subject: [PATCH 049/148] Update REVO HF 60W to MMU3 --- Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h | 4 ++-- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h index 273c5bb19..5d5e0fad9 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h @@ -12,8 +12,8 @@ #define PRINTER_TYPE PRINTER_MK3 #define PRINTER_NAME PRINTER_MK3_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3S_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3DREVO_HF_60W" diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h index 5575431da..ec8c5bdef 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h @@ -11,8 +11,8 @@ #define PRINTER_TYPE PRINTER_MK3S #define PRINTER_NAME PRINTER_MK3S_NAME #define PRINTER_NAME_ALTERNATE PRINTER_MK3_NAME //the other similar printer to this. -#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2 -#define PRINTER_MMU_NAME PRINTER_MK3S_MMU2_NAME +#define PRINTER_MMU_TYPE PRINTER_MK3S_MMU3 +#define PRINTER_MMU_NAME PRINTER_MK3S_MMU3_NAME #define FILAMENT_SIZE "1_75mm_MK3S" #define NOZZLE_TYPE "E3DREVO_HF_60W" From 9421785190769e38fdc0274d6444d39a3adb8fd2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 29 Jun 2023 08:23:13 +0200 Subject: [PATCH 050/148] Update doxygen and po files --- Firmware/Marlin_main.cpp | 2 +- lang/po/Firmware.pot | 14 +++++++------- lang/po/Firmware_cs.po | 14 +++++++------- lang/po/Firmware_de.po | 18 ++++++++---------- lang/po/Firmware_es.po | 14 +++++++------- lang/po/Firmware_fr.po | 14 +++++++------- lang/po/Firmware_hr.po | 14 +++++++------- lang/po/Firmware_hu.po | 14 +++++++------- lang/po/Firmware_it.po | 14 +++++++------- lang/po/Firmware_nl.po | 14 +++++++------- lang/po/Firmware_no.po | 14 +++++++------- lang/po/Firmware_pl.po | 14 +++++++------- lang/po/Firmware_ro.po | 14 +++++++------- lang/po/Firmware_sk.po | 14 +++++++------- lang/po/Firmware_sv.po | 14 +++++++------- 15 files changed, 100 insertions(+), 102 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8cce3da4d..82832d07b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8423,7 +8423,7 @@ Sigma_Exit: break; /*! - ### M704 - Load to MMU M704: Load to MMU + ### M704 - Preload to MMU M704: Preload to MMU #### Usage M704 [ P ] diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 2fffa1bc5..43c227cac 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -829,7 +829,7 @@ msgid "Heating" msgstr "" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "" @@ -1404,7 +1404,7 @@ msgid "Once" msgstr "" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "" @@ -1540,7 +1540,7 @@ msgid "Please place steel sheet on heatbed." msgstr "" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "" @@ -1642,7 +1642,7 @@ msgid "Press the knob" msgstr "" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "" @@ -1711,7 +1711,7 @@ msgid "Rear side [µm]" msgstr "" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "" @@ -1815,7 +1815,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "" @@ -2054,7 +2054,7 @@ msgid "Swapped" msgstr "" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index fda61b24e..d863065e6 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -851,7 +851,7 @@ msgid "Heating" msgstr "Zahrivani" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Zahrivani preruseno bezpecnostnim casovacem." @@ -1386,7 +1386,7 @@ msgid "Once" msgstr "Jednou" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "STOP: CHYBA TEPLOTY" @@ -1529,7 +1529,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Umistete tiskovy plat na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pro vysunuti filamentu stisknete tlacitko" @@ -1626,7 +1626,7 @@ msgid "Press the knob" msgstr "Stisknete tlacitko" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Pro nahrati trysky a pokracovani stisknete tlacitko." @@ -1713,7 +1713,7 @@ msgid "Rear side [µm]" msgstr "Vzadu [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Obnovovani tisku" @@ -1811,7 +1811,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SE NEHYBE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZASTAVENO." @@ -2049,7 +2049,7 @@ msgid "Swapped" msgstr "Prohozene" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "TEPLOTNI VYJIMKA" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index afc8ecfbb..02ad3e91b 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -857,7 +857,7 @@ msgid "Heating" msgstr "Aufwärmen" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Heizung durch Sicherheitstimer deaktiviert." @@ -1402,7 +1402,7 @@ msgid "Once" msgstr "Einmal" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE THERM. FEHLER" @@ -1549,7 +1549,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Legen Sie das Stahlblech auf das Heizbett." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Drücken Sie den Knopf um das Filament zu entladen." @@ -1646,7 +1646,7 @@ msgid "Press the knob" msgstr "Knopf drücken zum" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Drücken Sie den Knopf um die Düse vorzuheizen und fortzufahren." @@ -1733,7 +1733,7 @@ msgid "Rear side [µm]" msgstr "Hinten [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Druck wiederherst" @@ -1831,7 +1831,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR SITZT FEST" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "GESTOPPT." @@ -2071,7 +2071,7 @@ msgid "Swapped" msgstr "Ausgetauscht" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" @@ -2530,9 +2530,7 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" "MMU FW version is incompatible with printer FW.Update to version 2.1.9." -msgstr "" -"MMU FW ist inkompatibel mit Drucker FW. " -"Update auf Version 2.1.9." +msgstr "MMU FW ist inkompatibel mit Drucker FW. Update auf Version 2.1.9." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index fe2c82f34..33284baac 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -860,7 +860,7 @@ msgid "Heating" msgstr "Calentando..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Calentadores desactivados por el temporizador de seguridad." @@ -1403,7 +1403,7 @@ msgid "Once" msgstr "Una vez" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERROR TERMICO" @@ -1548,7 +1548,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Coloca la lam. de acero en la base calefactable." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pulsa el dial para descargar el filamento" @@ -1645,7 +1645,7 @@ msgid "Press the knob" msgstr "Pulsa el dial" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Pulsa el dial para precalentar la boquilla y continue." @@ -1732,7 +1732,7 @@ msgid "Rear side [µm]" msgstr "Trasera [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Recuper. impresion" @@ -1831,7 +1831,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECT. SIN MOVERSE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "PARADA" @@ -2076,7 +2076,7 @@ msgid "Swapped" msgstr "Intercambiado" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 7ae2968e8..fa37ad171 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -864,7 +864,7 @@ msgid "Heating" msgstr "Chauffe" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Chauffage desactivee par le compteur de securite." @@ -1410,7 +1410,7 @@ msgid "Once" msgstr "1 fois" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE ERREUR THERM." @@ -1556,7 +1556,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Placez la plaque en acier sur le plateau." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Appuyez sur le bouton pour decharger le filament" @@ -1653,7 +1653,7 @@ msgid "Press the knob" msgstr "App. sur sur bouton" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Appuyez sur le bouton pour prechauffer la buse et continuer." @@ -1740,7 +1740,7 @@ msgid "Rear side [µm]" msgstr "Arriere [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Recup. impression" @@ -1839,7 +1839,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "ECHEC MOUV.T SELECT." #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ARRETE." @@ -2082,7 +2082,7 @@ msgid "Swapped" msgstr "Echange" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "ANOMALIE THERMIQUE" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 934d91be5..337eaf690 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -858,7 +858,7 @@ msgid "Heating" msgstr "Grijanje" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Grijanje je onemoguceno sigurnosnim mjeracem vremena." @@ -1400,7 +1400,7 @@ msgid "Once" msgstr "Jednom" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUZIRAN TERMAL EROR" @@ -1543,7 +1543,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Stavite celicnu plocu na grijacu podlogu." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pritisnite gumb za praznjenje filamenta" @@ -1640,7 +1640,7 @@ msgid "Press the knob" msgstr "Pritisnite gumb" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Pritisnite gumb za predgrijavanje mlaznice i nastavite." @@ -1727,7 +1727,7 @@ msgid "Rear side [µm]" msgstr "Zad. str.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Oporavak printa" @@ -1825,7 +1825,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "IZBORNIK SE NE MICE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZAUSTAVLJENO." @@ -2071,7 +2071,7 @@ msgid "Swapped" msgstr "Zamjenjeno" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "TERMALNA ANOMALIJA" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index a233bb1a8..662c2456f 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -861,7 +861,7 @@ msgid "Heating" msgstr "Futes folyamatban" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "A bizonsagi idozito leallitotta a futest" @@ -1402,7 +1402,7 @@ msgid "Once" msgstr "Egyszer" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "SZUNET HOMERSEK.HIBA" @@ -1549,7 +1549,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Kerlek, helyzed az acellapot a targyasztalra." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Kerlek, nyomd meg a gombot a filament kiadasahoz" @@ -1646,7 +1646,7 @@ msgid "Press the knob" msgstr "Nyomd meg a gombot" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Nyomd meg a gombot a folytatashoz es a fuvoka felfutesehez." @@ -1731,7 +1731,7 @@ msgid "Rear side [µm]" msgstr "Hatso old.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Nyomt. visszaallit" @@ -1829,7 +1829,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SZELEKTOR NEM MOZOG" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "MEGALLITVA." @@ -2070,7 +2070,7 @@ msgid "Swapped" msgstr "Felcserelve" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "Homersekl. anomalia" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index abd694b16..01e4632ab 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -863,7 +863,7 @@ msgid "Heating" msgstr "Riscaldamento..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Riscaldamento fermato dal timer di sicurezza." @@ -1403,7 +1403,7 @@ msgid "Once" msgstr "Singolo" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSA ERRORE TERMICO" @@ -1548,7 +1548,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Posizionate la piastra d'acciaio sul piano riscaldato." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Premete la manopola per scaricare il filamento" @@ -1645,7 +1645,7 @@ msgid "Press the knob" msgstr "Premere la manopola" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Premete la manopola per preriscaldare l'ugello e continuare." @@ -1732,7 +1732,7 @@ msgid "Rear side [µm]" msgstr "Retro [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Recupero stampa" @@ -1830,7 +1830,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELETTORE BLOCCATO" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ARRESTATO." @@ -2073,7 +2073,7 @@ msgid "Swapped" msgstr "Scambiato" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "ANOMALIA TERMICA" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 41a4771d6..1b7315eec 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -863,7 +863,7 @@ msgid "Heating" msgstr "Opwarmen" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Verwarming uitgeschakeld door veiligheidstimer." @@ -1404,7 +1404,7 @@ msgid "Once" msgstr "Eenmaal" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSE TERMISCHE FOUT" @@ -1551,7 +1551,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Leg staalplaat op bed." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Druk op de knop om filament te verwijderen" @@ -1648,7 +1648,7 @@ msgid "Press the knob" msgstr "Druk op knop" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Druk op de knop om de tuit voor te verwarmen en door te gaan." @@ -1735,7 +1735,7 @@ msgid "Rear side [µm]" msgstr "Achterkant[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Print herstellen" @@ -1834,7 +1834,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR BEWEG FOUT" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "GESTOPT." @@ -2080,7 +2080,7 @@ msgid "Swapped" msgstr "Gewisseld" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "THERMISCHE ANOMALIE" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 4fc2b7370..b8f3c603c 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -857,7 +857,7 @@ msgid "Heating" msgstr "Varmer opp" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Varme skrudd av pga. sikkerhet." @@ -1393,7 +1393,7 @@ msgid "Once" msgstr "En gang" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSET THERMISK FEIL" @@ -1538,7 +1538,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Plasser stålplaten på varmesenga." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Trykk valghjulet for å ta ut filamentet" @@ -1636,7 +1636,7 @@ msgid "Press the knob" msgstr "Trykk valghjulet" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Trykk valghjulet for å forvarme dysen og fortsette." @@ -1720,7 +1720,7 @@ msgid "Rear side [µm]" msgstr "Baksiden [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Gjenopptar print" @@ -1818,7 +1818,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELEKTOR STÅR FAST" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "STOPPET." @@ -2056,7 +2056,7 @@ msgid "Swapped" msgstr "Byttet" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "THERMISK ANOMALI" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index a00ae2ec4..223459335 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -860,7 +860,7 @@ msgid "Heating" msgstr "Grzanie..." #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Grzanie wylaczone przez wyl. czasowy" @@ -1400,7 +1400,7 @@ msgid "Once" msgstr "1-raz" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUZA BLAD TERMICZNY" @@ -1544,7 +1544,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Umiescic plyte stalowa na stole podgrzewanym." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Nacisnij pokretlo aby rozladowac filament" @@ -1641,7 +1641,7 @@ msgid "Press the knob" msgstr "Wcisnij pokretlo" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." @@ -1728,7 +1728,7 @@ msgid "Rear side [µm]" msgstr "Tyl [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Wznawianie wydruku" @@ -1826,7 +1826,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "WYBIERAK NIE RUSZA" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZATRZYMANO." @@ -2069,7 +2069,7 @@ msgid "Swapped" msgstr "Zamieniono" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index dea8abebd..097362068 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -863,7 +863,7 @@ msgid "Heating" msgstr "Incalzire" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Incalzirea dezactivata de timer-ul de siguranta" @@ -1400,7 +1400,7 @@ msgid "Once" msgstr "O data" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "OPRIT THERMAL ERROR" @@ -1546,7 +1546,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Asezati suprafata de print pe pat." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Apasati butonul pentru a scoate filamentul." @@ -1643,7 +1643,7 @@ msgid "Press the knob" msgstr "Apasati butonul" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Apasati butonul pentru a preincalzi extruder-ul si continuati." @@ -1730,7 +1730,7 @@ msgid "Rear side [µm]" msgstr "Spate [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Recuperare print" @@ -1828,7 +1828,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR NU SE MISCA" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "OPRIT." @@ -2071,7 +2071,7 @@ msgid "Swapped" msgstr "inversate" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "ANOMALIE TERMICA" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index b5caf0c44..d53a7db28 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -859,7 +859,7 @@ msgid "Heating" msgstr "Zahrievanie" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Zohrievanie prerusene bezpecnostnym casovacom." @@ -1395,7 +1395,7 @@ msgid "Once" msgstr "Raz" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSED THERMAL ERROR" @@ -1541,7 +1541,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Umiestnite prosim platnu na podlozku" #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Pre vysunutie filamentu stlacte tlacidlo" @@ -1638,7 +1638,7 @@ msgid "Press the knob" msgstr "Stlacte tlacidlo" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Pre nahriatie trysky a pokracovanie stlacte tlacidlo." @@ -1725,7 +1725,7 @@ msgid "Rear side [µm]" msgstr "Zadna str.[µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Obnovovanie tlace" @@ -1823,7 +1823,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "SELECTOR CANNOT MOVE" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "ZASTAVENE." @@ -2061,7 +2061,7 @@ msgid "Swapped" msgstr "Prehodene" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "THERMAL ANOMALY" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 4bfa8a2cc..d02ea802b 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -861,7 +861,7 @@ msgid "Heating" msgstr "Uppvärmning" #. MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:9272 +#: ../../Firmware/Marlin_main.cpp:9274 msgid "Heating disabled by safety timer." msgstr "Uppvärmning avaktiverad av säkerhetstimer." @@ -1401,7 +1401,7 @@ msgid "Once" msgstr "En gång" #. MSG_PAUSED_THERMAL_ERROR c=20 -#: ../../Firmware/Marlin_main.cpp:9451 ../../Firmware/messages.cpp:175 +#: ../../Firmware/Marlin_main.cpp:9453 ../../Firmware/messages.cpp:175 msgid "PAUSED THERMAL ERROR" msgstr "PAUSAT TERMISKT FEL" @@ -1547,7 +1547,7 @@ msgid "Please place steel sheet on heatbed." msgstr "Placera metallskiva på värmebädden." #. MSG_PRESS_TO_UNLOAD c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11208 ../../Firmware/Marlin_main.cpp:11238 +#: ../../Firmware/Marlin_main.cpp:11210 ../../Firmware/Marlin_main.cpp:11240 #: ../../Firmware/messages.cpp:79 msgid "Please press the knob to unload filament" msgstr "Vänligen tryck på knappen för att mata ut filament" @@ -1644,7 +1644,7 @@ msgid "Press the knob" msgstr "Tryck på knappen" #. MSG_PRESS_TO_PREHEAT c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:11220 +#: ../../Firmware/Marlin_main.cpp:11222 msgid "Press the knob to preheat nozzle and continue." msgstr "Tryck på knappen för att förvärma munstycket och fortsätta." @@ -1731,7 +1731,7 @@ msgid "Rear side [µm]" msgstr "Baksida [µm]" #. MSG_RECOVERING_PRINT c=20 -#: ../../Firmware/Marlin_main.cpp:10598 +#: ../../Firmware/Marlin_main.cpp:10600 msgid "Recovering print" msgstr "Återställer utskrift" @@ -1829,7 +1829,7 @@ msgid "SELECTOR CANNOT MOVE" msgstr "VÄLJARE FASTNAT" #. MSG_STOPPED c=20 -#: ../../Firmware/Marlin_main.cpp:9477 ../../Firmware/messages.cpp:114 +#: ../../Firmware/Marlin_main.cpp:9479 ../../Firmware/messages.cpp:114 msgid "STOPPED." msgstr "STOPPAD." @@ -2069,7 +2069,7 @@ msgid "Swapped" msgstr "Utbytt" #. MSG_THERMAL_ANOMALY c=20 -#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2233 +#: ../../Firmware/messages.cpp:177 ../../Firmware/temperature.cpp:2236 msgid "THERMAL ANOMALY" msgstr "TERMISK ANOMALI" From ef4efc22c36a4337c8a77cca630ac2dab882854f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Thu, 6 Jul 2023 17:17:57 +0000 Subject: [PATCH 051/148] PFW-1528 Intercept register 0x14 This commit syncs the 8-bit firmware with the 32-bit Change in memory: Flash: +56 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 15 +++++++++++---- Firmware/mmu2_protocol_logic.h | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 2e3f94564..7e3a16370 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -141,9 +141,16 @@ bool MMU2::WriteRegister(uint8_t address, uint16_t data) { if (!WaitForMMUReady()) return false; - // special case - intercept requests of extra loading distance and perform the change even on the printer's side - if (address == 0x0b) { + // special cases - intercept requests of registers which influence the printer's behaviour too + perform the change even on the printer's side + switch (address) { + case 0x0b: logic.PlanExtraLoadDistance(data); + break; + case 0x14: + logic.PlanPulleySlowFeedRate(data); + break; + default: + break; // do not intercept any other register writes } do { @@ -1040,7 +1047,7 @@ void MMU2::OnMMUProgressMsgSame(ProgressCode pc) { // After the MMU knows the FSENSOR is triggered it will: // 1. Push the filament by additional 30mm (see fsensorToNozzle) // 2. Disengage the idler and push another 2mm. - MoveE(logic.ExtraLoadDistance() + 2, MMU2_LOAD_TO_NOZZLE_FEED_RATE); + MoveE(logic.ExtraLoadDistance() + 2, logic.PulleySlowFeedRate()); break; case FilamentState::NOT_PRESENT: // fsensor not triggered, continue moving extruder @@ -1050,7 +1057,7 @@ void MMU2::OnMMUProgressMsgSame(ProgressCode pc) { // than 450mm because the firmware will ignore too long extrusions // for safety reasons. See PREVENT_LENGTHY_EXTRUDE. // Use 350mm to be safely away from the prevention threshold - MoveE(350.0f, MMU2_LOAD_TO_NOZZLE_FEED_RATE); + MoveE(350.0f, logic.PulleySlowFeedRate()); } break; default: diff --git a/Firmware/mmu2_protocol_logic.h b/Firmware/mmu2_protocol_logic.h index 53ec0002a..1a13bbe66 100644 --- a/Firmware/mmu2_protocol_logic.h +++ b/Firmware/mmu2_protocol_logic.h @@ -122,6 +122,17 @@ public: return initRegs8[0]; } + /// Sets the Pulley slow feed rate to be reported to the MMU. + /// Beware - this call doesn't send anything to the MMU. + /// The MMU gets the newly set value either by a communication restart or via an explicit WriteRegister call + inline void PlanPulleySlowFeedRate(uint8_t psfr) { + initRegs8[1] = psfr; + } + /// @returns the currently preset Pulley slow feed rate + inline uint8_t PulleySlowFeedRate() const { + return initRegs8[1]; // even though MMU register 0x14 is 16bit, reasonable speeds are way below 255mm/s - saving space ;) + } + /// Step the state machine StepStatus Step(); From 8149853fc90cd0553e85a3a6a6f6201a677def36 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 22 Jun 2023 13:41:02 +0200 Subject: [PATCH 052/148] Optimize `st_set_position()` for speed and size flash: -186 SRAM: 0 time: x0.45 --- Firmware/planner.cpp | 4 ++-- Firmware/stepper.cpp | 11 ++++------- Firmware/stepper.h | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 001b2137b..9406fe839 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -1330,7 +1330,7 @@ void plan_set_position(float x, float y, float z, const float &e) position_float[Z_AXIS] = z; position_float[E_AXIS] = e; #endif - st_set_position(position[X_AXIS], position[Y_AXIS], position[Z_AXIS], position[E_AXIS]); + st_set_position(position); previous_nominal_speed = 0.0; // Resets planner junction speeds. Assumes start from rest. memset(previous_speed, 0, sizeof(previous_speed)); } @@ -1342,7 +1342,7 @@ void plan_set_z_position(const float &z) position_float[Z_AXIS] = z; #endif position[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]); - st_set_position(position[X_AXIS], position[Y_AXIS], position[Z_AXIS], position[E_AXIS]); + st_set_position(position); } void plan_set_e_position(const float &e) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 3e7e4c72c..b3ea244af 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1313,18 +1313,15 @@ void st_synchronize() } } -void st_set_position(const long &x, const long &y, const long &z, const long &e) +void st_set_position(const long *pos) { CRITICAL_SECTION_START; // Copy 4x4B. - // This block locks the interrupts globally for 4.56 us, - // which corresponds to a maximum repeat frequency of 219.18 kHz. + // This block locks the interrupts globally for 2.06 us, + // which corresponds to a maximum repeat frequency of ~484kHz. // This blocking is safe in the context of a 10kHz stepper driver interrupt // or a 115200 Bd serial line receive interrupt, which will not trigger faster than 12kHz. - count_position[X_AXIS] = x; - count_position[Y_AXIS] = y; - count_position[Z_AXIS] = z; - count_position[E_AXIS] = e; + memcpy((uint8_t *)count_position, pos, sizeof(count_position)); CRITICAL_SECTION_END; } diff --git a/Firmware/stepper.h b/Firmware/stepper.h index 944403fe4..72ea5294a 100644 --- a/Firmware/stepper.h +++ b/Firmware/stepper.h @@ -41,7 +41,7 @@ void isr(); void st_synchronize(); // Set current position in steps -void st_set_position(const long &x, const long &y, const long &z, const long &e); +void st_set_position(const long *pos); void st_set_e_position(const long &e); // Get current position in steps From e91ee4a5dbe27b4a644d184b2e9031209592126a Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Sun, 25 Jun 2023 11:21:50 +0200 Subject: [PATCH 053/148] Change uint8_t* cast to long* --- Firmware/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index b3ea244af..5b859d013 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -1321,7 +1321,7 @@ void st_set_position(const long *pos) // which corresponds to a maximum repeat frequency of ~484kHz. // This blocking is safe in the context of a 10kHz stepper driver interrupt // or a 115200 Bd serial line receive interrupt, which will not trigger faster than 12kHz. - memcpy((uint8_t *)count_position, pos, sizeof(count_position)); + memcpy((long *)count_position, pos, sizeof(count_position)); CRITICAL_SECTION_END; } From 37a73e91c62821d8b910ccc98ca19046c4379d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 4 Jun 2023 16:43:16 +0000 Subject: [PATCH 054/148] Remove MMU2 include in stepper.cpp Nothing is used from the MMU class in this file --- Firmware/stepper.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 5b859d013..9e7b9a7d5 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -37,10 +37,7 @@ #endif //TMC2130 #include "Filament_sensor.h" - -#include "mmu2.h" #include "ConfigurationStore.h" - #include "Prusa_farm.h" #ifdef DEBUG_STACK_MONITOR From ee074eb548916118486570fe7d400f9c5582d221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 4 Jun 2023 17:04:42 +0000 Subject: [PATCH 055/148] Remove eeprom.h include in SpoolJoin header --- Firmware/SpoolJoin.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/SpoolJoin.h b/Firmware/SpoolJoin.h index 51ae5f947..6262b8221 100644 --- a/Firmware/SpoolJoin.h +++ b/Firmware/SpoolJoin.h @@ -1,7 +1,6 @@ /// @file #pragma once #include -#include "eeprom.h" // See documentation here: https://help.prusa3d.com/article/spooljoin-mmu2s_134252 From b0ff5f45f3c5a3b7fe4aaadfeed610c6be35c651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 4 Jun 2023 17:41:31 +0000 Subject: [PATCH 056/148] Cleanup language.h includes Remove a few redundant language.h includes Also remove language.h include from cmdqueue.h to prevent including language.h unnecessarily Fix missing message.h includes in a few files --- Firmware/Filament_sensor.cpp | 2 ++ Firmware/Prusa_farm.cpp | 1 + Firmware/cmdqueue.cpp | 2 ++ Firmware/cmdqueue.h | 2 -- Firmware/eeprom.cpp | 3 --- Firmware/first_lay_cal.cpp | 2 +- Firmware/stepper.cpp | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index e298e6035..9736d6343 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -5,7 +5,9 @@ #include "Filament_sensor.h" #include "Timer.h" #include "eeprom.h" +#include "language.h" #include "menu.h" +#include "messages.h" #include "planner.h" #include "temperature.h" #include "ultralcd.h" diff --git a/Firmware/Prusa_farm.cpp b/Firmware/Prusa_farm.cpp index c82989ad5..5ff6a8c66 100644 --- a/Firmware/Prusa_farm.cpp +++ b/Firmware/Prusa_farm.cpp @@ -7,6 +7,7 @@ #include "util.h" #include "ultralcd.h" #include "Filament_sensor.h" +#include "language.h" #ifdef PRUSA_FARM uint8_t farm_mode = 0; diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index e332cacef..39030cb10 100755 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -5,6 +5,8 @@ #include "ultralcd.h" #include "Prusa_farm.h" #include "meatpack.h" +#include "messages.h" +#include "language.h" // Reserve BUFSIZE lines of length MAX_CMD_SIZE plus CMDBUFFER_RESERVE_FRONT. char cmdbuffer[BUFSIZE * (MAX_CMD_SIZE + 1) + CMDBUFFER_RESERVE_FRONT]; diff --git a/Firmware/cmdqueue.h b/Firmware/cmdqueue.h index bf512e09f..96ec6d772 100644 --- a/Firmware/cmdqueue.h +++ b/Firmware/cmdqueue.h @@ -2,8 +2,6 @@ #define CMDQUEUE_H #include "Marlin.h" -#include "language.h" - // String circular buffer. Commands may be pushed to the buffer from both sides: // Chained commands will be pushed to the front, interactive (from LCD menu) diff --git a/Firmware/eeprom.cpp b/Firmware/eeprom.cpp index 520dcf377..06b860d21 100644 --- a/Firmware/eeprom.cpp +++ b/Firmware/eeprom.cpp @@ -8,9 +8,6 @@ #include #include - -#include "language.h" - void eeprom_init() { eeprom_init_default_byte((uint8_t*)EEPROM_POWER_COUNT, 0); diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 65ceaf678..e4f3187a3 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -5,8 +5,8 @@ #include "first_lay_cal.h" #include "Configuration_var.h" -#include "language.h" #include "Marlin.h" +#include "messages.h" #include "cmdqueue.h" #include "mmu2.h" #include diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 9e7b9a7d5..e85b5fad7 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -26,7 +26,6 @@ #include "planner.h" #include "temperature.h" #include "ultralcd.h" -#include "language.h" #include "cardreader.h" #include "speed_lookuptable.h" #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1 From 9cc9af14bdeaac08befca82707d5058def6cccbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 23 Jun 2023 21:01:31 +0000 Subject: [PATCH 057/148] Remove unnecessary la10compat include --- Firmware/ultralcd.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e08c40681..3bd74a990 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -43,10 +43,6 @@ #include "adc.h" #include "config.h" -#ifndef LA_NOCOMPAT -#include "la10compat.h" -#endif - #include "Prusa_farm.h" static void lcd_sd_updir(); From 34ef9665cd169495af12cabc9ddd04b4b60ba94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 23 Jun 2023 21:12:51 +0000 Subject: [PATCH 058/148] Remove two ultralcd includes --- Firmware/ConfigurationStore.cpp | 1 - Firmware/tmc2130.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 7f5222736..d46809328 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -3,7 +3,6 @@ #include "Marlin.h" #include "planner.h" #include "temperature.h" -#include "ultralcd.h" #include "ConfigurationStore.h" #include "Configuration_var.h" diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 7487de10a..a83ca1c0a 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -5,7 +5,6 @@ #ifdef TMC2130 #include "tmc2130.h" -#include "ultralcd.h" #include "language.h" #include "spi.h" #include "Timer.h" From 749360db0fd801cbbbdbc16ebcf682e66985c33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 23 Jun 2023 21:16:08 +0000 Subject: [PATCH 059/148] Remove mesh bed leveling include --- Firmware/ConfigurationStore.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index d46809328..2b3971a8c 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -6,10 +6,6 @@ #include "ConfigurationStore.h" #include "Configuration_var.h" -#ifdef MESH_BED_LEVELING -#include "mesh_bed_leveling.h" -#endif - #ifdef TMC2130 #include "tmc2130.h" #endif From f13d657c7e528e95906389015602c4a4ba421900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 23 Jun 2023 21:33:44 +0000 Subject: [PATCH 060/148] Remove Marlin.h include in backlight.h Also removed it from sound.cpp, only include what is really required --- Firmware/backlight.cpp | 10 +++++----- Firmware/backlight.h | 2 -- Firmware/sound.cpp | 15 ++++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp index ae9122160..f5fccf046 100644 --- a/Firmware/backlight.cpp +++ b/Firmware/backlight.cpp @@ -1,12 +1,12 @@ //backlight.cpp - -#include "backlight.h" -#include "macros.h" -#include #include +#include +#include "backlight.h" #include "eeprom.h" -#include "pins.h" #include "fastio.h" +#include "macros.h" +#include "pins.h" +#include "system_timer.h" #include "Timer.h" #ifdef LCD_BL_PIN diff --git a/Firmware/backlight.h b/Firmware/backlight.h index 7d1300b62..0050da7d9 100644 --- a/Firmware/backlight.h +++ b/Firmware/backlight.h @@ -3,8 +3,6 @@ #define _BACKLIGHT_H #include -#include "Marlin.h" -#include "pins.h" enum Backlight_Mode { diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp index 9630aacb7..5e1f00f36 100644 --- a/Firmware/sound.cpp +++ b/Firmware/sound.cpp @@ -1,11 +1,12 @@ -#include "sound.h" - -#include "Marlin.h" - -//#include -//#include -//#include "eeprom.h" +#include #include "backlight.h" +#include "eeprom.h" +#include "fastio.h" +#include "pins.h" +#include "sound.h" +#include "system_timer.h" +#include "Timer.h" + //eSOUND_MODE eSoundMode=e_SOUND_MODE_LOUD; From 434386e6cc3ed335b3176b865ed90736e1aca687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 11 Jun 2023 15:24:30 +0000 Subject: [PATCH 061/148] Log event when planner is aborted It may be useful to see if any moves are lost Change in memory: Flash: +32 bytes SRAM: 0 bytes --- Firmware/planner.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 9406fe839..b68b6e2f1 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -718,6 +718,8 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate #endif /* PLANNER_DIAGNOSTICS */ if(planner_aborted) { // avoid planning the block early if aborted + SERIAL_ECHO_START; + SERIAL_ECHOLNRPGM(_n("Move aborted")); return; } From 4abdb0225dd3865afa06566a47a7d4e491fe166a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 4 Jun 2023 10:51:45 +0000 Subject: [PATCH 062/148] PFW-1527 FILAMENT_EJECTED should not increment fail statistic Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 7e3a16370..465e49470 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -936,7 +936,7 @@ void MMU2::ReportError(ErrorCode ec, ErrorSource res) { lastErrorSource = res; LogErrorEvent_P(_O(PrusaErrorTitle(PrusaErrorCodeIndex((uint16_t)ec)))); - if (ec != ErrorCode::OK) { + if (ec != ErrorCode::OK && ec != ErrorCode::FILAMENT_EJECTED) { IncrementMMUFails(); // check if it is a "power" failure - we consider TMC-related errors as power failures From 06c42bf85f867c5b313f9922ba7771ecfa558651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 21 May 2023 14:54:32 +0000 Subject: [PATCH 063/148] MMU: Remove a call to Enable_E0 The planner enables the E-motor automatically No need to do it manually Change in memory: Flash: -2 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 465e49470..0c5d23694 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -884,7 +884,6 @@ void MMU2::filament_ramming() { void MMU2::execute_extruder_sequence(const E_Step *sequence, uint8_t steps) { planner_synchronize(); - Enable_E0(); const E_Step *step = sequence; for (uint8_t i = steps; i ; --i) { From 70ae3353ce03792b1978b57d047552e3e5c3a516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 21 May 2023 14:57:59 +0000 Subject: [PATCH 064/148] MMU: Disable E-motor after Try-load-unload The filament is never in the nozzle at this point so there should be no oozing. When a single material MMU print, I can hear audible noise from the motor after executing Tx code. After some timeout (while the heaters still heating up) I can hear the firmware disable the E-motor. But we can safely disable it immediately after the try-load-unload sequence. Change in memory: Flash: +4 bytes SRAM: 0 bytes --- Firmware/mmu2.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 0c5d23694..961917461 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -304,6 +304,8 @@ bool MMU2::VerifyFilamentEnteredPTFE() { } } + Disable_E0(); + if (fsensorState) { IncrementLoadFails(); return false; From 6784c6919bb9d25d72dcfacd8bb7393c6b4406b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 7 May 2023 11:07:55 +0000 Subject: [PATCH 065/148] cleanup: remove TMC2130 ifdef in lcd_selfcheck_axis This function is no longer included in the firmware when using TMC2130 Also removed commented code --- Firmware/ultralcd.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3bd74a990..c61c1c7a0 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6247,10 +6247,8 @@ static bool lcd_selfcheck_axis_sg(uint8_t axis) { #endif //TMC2130 #ifndef TMC2130 - static bool lcd_selfcheck_axis(int _axis, int _travel) { -// printf_P(PSTR("lcd_selfcheck_axis %d, %d\n"), _axis, _travel); bool _stepdone = false; bool _stepresult = false; uint8_t _progress = 0; @@ -6269,13 +6267,9 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) plan_buffer_line_curposXYZE(manual_feedrate[0] / 60); st_synchronize(); -#ifdef TMC2130 - if ((READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING)) -#else //TMC2130 if ((READ(X_MIN_PIN) ^ (bool)X_MIN_ENDSTOP_INVERTING) || (READ(Y_MIN_PIN) ^ (bool)Y_MIN_ENDSTOP_INVERTING) || (READ(Z_MIN_PIN) ^ (bool)Z_MIN_ENDSTOP_INVERTING)) -#endif //TMC2130 { if (_axis == 0) { @@ -6293,10 +6287,7 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) { _stepresult = ((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING) == 1) ? true : false; _err_endstop = ((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING) == 1) ? 0 : 1; - printf_P(PSTR("lcd_selfcheck_axis %d, %d\n"), _stepresult, _err_endstop); - /*disable_x(); - disable_y(); - disable_z();*/ + printf_P(PSTR("lcd_selfcheck_axis %d, %d\n"), _stepresult, _err_endstop); } _stepdone = true; } @@ -6314,15 +6305,10 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) manage_heater(); manage_inactivity(true); - //_delay(100); (_travel_done <= _travel) ? _travel_done++ : _stepdone = true; } while (!_stepdone); - - //current_position[_axis] = current_position[_axis] + 15; - //plan_buffer_line_curposXYZE(manual_feedrate[0] / 60, active_extruder); - if (!_stepresult) { const char *_error_1; @@ -6345,7 +6331,7 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) { lcd_selftest_error(TestError::Motor, _error_1, _error_2); } - } + } current_position[_axis] = 0; //simulate axis home to avoid negative numbers for axis position, especially Z. plan_set_position_curposXYZE(); From 7f95c543052f892ff259b2b39299f50ec36e752c Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Thu, 27 Apr 2023 08:55:37 +0200 Subject: [PATCH 066/148] Move `Language update` to first row --- 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 82832d07b..1ed194f62 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -903,7 +903,7 @@ void update_sec_lang_from_external_flash() uint32_t src_addr; if (lang_get_header(lang, &header, &src_addr)) { - lcd_puts_at_P(1,3,PSTR("Language update.")); + lcd_puts_at_P(1,0,PSTR("Language update")); for (uint8_t i = 0; i < state; i++) fputc('.', lcdout); _delay(100); boot_reserved = (boot_reserved & 0xF8) | ((state + 1) & 0x07); From 5baa74a42539227fd803aa04915fbf8d672a0f05 Mon Sep 17 00:00:00 2001 From: RoboMagus <68224306+RoboMagus@users.noreply.github.com> Date: Tue, 24 Jan 2023 19:53:06 +0100 Subject: [PATCH 067/148] Add M118 Gcode support --- Firmware/Marlin_main.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1ed194f62..62c6c2b3c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3903,6 +3903,7 @@ extern uint8_t st_backlash_y; //!@n M114 - Output current position to serial port //!@n M115 - Capabilities string //!@n M117 - display message +//!@n M118 - Serial print //!@n M119 - Output Endstop status to serial port //!@n M123 - Tachometer value //!@n M126 - Solenoid Air Valve Open (BariCUDA support by jmil) @@ -6459,6 +6460,31 @@ Sigma_Exit: } break; + /*! + ### M118 - Serial print M118: Serial print + */ + case 118: { + bool hasE, hasA = false; + char *p = strchr_pointer; + + for (uint8_t i = 2; i--;) { + // A1, E1, and Pn are always parsed out + if (!((p[0] == 'A' || p[0] == 'E') && p[1] == '1')) break; + switch (p[0]) { + case 'A': hasA = true; break; + case 'E': hasE = true; break; + } + p += 2; + while (*p == ' ') ++p; + } + + if (hasE) SERIAL_ECHO_START; + if (hasA) SERIAL_ECHO("//"); + + SERIAL_ECHOLN(p); + } + break; + #ifdef M120_M121_ENABLED /*! ### M120 - Enable endstops M120: Enable endstop detection From d9e6dd4efec7a0f437453f9e5c78318c8ef42866 Mon Sep 17 00:00:00 2001 From: RoboMagus <68224306+RoboMagus@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:48:35 +0100 Subject: [PATCH 068/148] Update usage comment --- Firmware/Marlin_main.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 62c6c2b3c..c5ef4f5b6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6462,6 +6462,14 @@ Sigma_Exit: /*! ### M118 - Serial print M118: Serial print + #### Usage + + M118 [ A1 | E1 ] [ String ] + + #### Parameters + - `A1` - Prepend // to denote a comment or action command. Hosts like OctoPrint can interpret such commands to perform special actions. See your host’s documentation. + - `E1` - Prepend echo: to the message. Some hosts will display echo messages differently when preceded by echo:. + - `String` - Message string. If omitted, a blank line will be sent. */ case 118: { bool hasE, hasA = false; From 4450dbe4dda85eb184c69880b7b127a192082612 Mon Sep 17 00:00:00 2001 From: RoboMagus <68224306+RoboMagus@users.noreply.github.com> Date: Wed, 25 Jan 2023 10:00:39 +0100 Subject: [PATCH 069/148] Update serial echo macro to print from PGM --- 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 c5ef4f5b6..a9804821b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6472,7 +6472,7 @@ Sigma_Exit: - `String` - Message string. If omitted, a blank line will be sent. */ case 118: { - bool hasE, hasA = false; + bool hasE = false, hasA = false; char *p = strchr_pointer; for (uint8_t i = 2; i--;) { @@ -6487,7 +6487,7 @@ Sigma_Exit: } if (hasE) SERIAL_ECHO_START; - if (hasA) SERIAL_ECHO("//"); + if (hasA) SERIAL_ECHOPGM("//"); SERIAL_ECHOLN(p); } From 2d461572ddcd5751c2619357ba66c2541531cf4b Mon Sep 17 00:00:00 2001 From: RoboMagus <68224306+RoboMagus@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:28:34 +0100 Subject: [PATCH 070/148] Fix command parameters offset --- 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 a9804821b..2e5995f13 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6473,7 +6473,7 @@ Sigma_Exit: */ case 118: { bool hasE = false, hasA = false; - char *p = strchr_pointer; + char *p = strchr_pointer + 5; for (uint8_t i = 2; i--;) { // A1, E1, and Pn are always parsed out From b6572066f4ce7c544241df2c2bcf70bdb0b4e3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 19 May 2023 00:25:05 +0000 Subject: [PATCH 071/148] optimisation: compare uint16_t against uint16_t We're assigning step_rate with the 16-bit value of final_rate I would expect the comparison to be 16-bit also then. Change in memory: Flash: -32 bytes SRAM: 0 bytes --- Firmware/stepper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index e85b5fad7..7e511c7a3 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -863,7 +863,7 @@ FORCE_INLINE void isr() { step_rate = acc_step_rate - step_rate; // Decelerate from acceleration end point. // lower limit - if (step_rate < current_block->final_rate) + if (step_rate < uint16_t(current_block->final_rate)) step_rate = uint16_t(current_block->final_rate); } From 5295bfa0402c89aa8a45f8fc260b4135d542f3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 12 May 2023 17:41:31 +0000 Subject: [PATCH 072/148] Remove dead macro timer02_set_pwm0 It looks like it was removed here https://github.com/prusa3d/Prusa-Firmware/pull/1979 4 years ago No change in memory --- Firmware/system_timer.h | 3 --- Firmware/temperature.cpp | 16 +--------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Firmware/system_timer.h b/Firmware/system_timer.h index d8ef8a266..1705bccd4 100644 --- a/Firmware/system_timer.h +++ b/Firmware/system_timer.h @@ -16,15 +16,12 @@ #define _tone tone4 #define _noTone noTone4 -#define timer02_set_pwm0(pwm0) - #else //SYSTEM_TIMER_2 #define _millis millis #define _micros micros #define _delay delay #define _tone tone #define _noTone noTone -#define timer02_set_pwm0(pwm0) #endif //SYSTEM_TIMER_2 // Timer counter, incremented by the 1ms Arduino timer. diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 4185b31eb..247d0c16e 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -288,7 +288,6 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle if (extruder<0) { soft_pwm_bed = (MAX_BED_POWER)/2; - timer02_set_pwm0(soft_pwm_bed << 1); bias = d = (MAX_BED_POWER)/2; target_temperature_bed = (int)temp; // to display the requested target bed temperature properly on the main screen } @@ -321,10 +320,8 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle if(heating == true && input > temp) { if(_millis() - t2 > 5000) { heating=false; - if (extruder<0) - { + if (extruder<0) { soft_pwm_bed = (bias - d) >> 1; - timer02_set_pwm0(soft_pwm_bed << 1); } else soft_pwm[extruder] = (bias - d) >> 1; @@ -381,7 +378,6 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle if (extruder<0) { soft_pwm_bed = (bias + d) >> 1; - timer02_set_pwm0(soft_pwm_bed << 1); } else soft_pwm[extruder] = (bias + d) >> 1; @@ -1797,12 +1793,10 @@ static void pid_bed(const float current, const int target) if(current < BED_MAXTEMP) { soft_pwm_bed = (int)pid_output >> 1; - timer02_set_pwm0(soft_pwm_bed << 1); } else { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } #elif !defined(BED_LIMIT_SWITCHING) @@ -1812,18 +1806,15 @@ static void pid_bed(const float current, const int target) if(current >= target) { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } else { soft_pwm_bed = MAX_BED_POWER>>1; - timer02_set_pwm0(soft_pwm_bed << 1); } } else { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); WRITE(HEATER_BED_PIN,LOW); } #else //#ifdef BED_LIMIT_SWITCHING @@ -1833,18 +1824,15 @@ static void pid_bed(const float current, const int target) if(current > target + BED_HYSTERESIS) { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } else if(current <= target - BED_HYSTERESIS) { soft_pwm_bed = MAX_BED_POWER>>1; - timer02_set_pwm0(soft_pwm_bed << 1); } } else { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); WRITE(HEATER_BED_PIN,LOW); } #endif //BED_LIMIT_SWITCHING @@ -1852,7 +1840,6 @@ static void pid_bed(const float current, const int target) if(target==0) { soft_pwm_bed = 0; - timer02_set_pwm0(soft_pwm_bed << 1); } #endif //TEMP_SENSOR_BED } @@ -2018,7 +2005,6 @@ void disable_heater() #endif #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 // TODO: this doesn't take immediate effect! - timer02_set_pwm0(0); bedPWMDisabled = 0; #endif } From 526a1dcc63df9638d0634c510f2f369d4cb8da32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 24 Jun 2023 11:44:06 +0000 Subject: [PATCH 073/148] power panic: Move code into a separate file --- CMakeLists.txt | 1 + Firmware/Marlin.h | 15 +- Firmware/Marlin_main.cpp | 502 +-------------------------------------- Firmware/power_panic.cpp | 492 ++++++++++++++++++++++++++++++++++++++ Firmware/power_panic.h | 5 + 5 files changed, 509 insertions(+), 506 deletions(-) create mode 100644 Firmware/power_panic.cpp create mode 100644 Firmware/power_panic.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d45f79e85..d16f6e78e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,7 @@ set(FW_SOURCES optiboot_xflash.cpp pat9125.cpp planner.cpp + power_panic.cpp Prusa_farm.cpp qr_solve.cpp rbuf.c diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index a51d568a2..99bdc1c6a 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -380,14 +380,6 @@ float temp_compensation_pinda_thermistor_offset(float temperature_pinda); void serialecho_temperatures(); bool check_commands(); -void uvlo_(); -void uvlo_tiny(); -void recover_print(uint8_t automatic); -void setup_uvlo_interrupt(); - -extern bool recover_machine_state_after_power_panic(); -extern void restore_print_from_eeprom(bool mbl_was_active); - extern void print_world_coordinates(); extern void print_physical_coordinates(); extern void print_mesh_bed_leveling_table(); @@ -397,6 +389,13 @@ void restore_extruder_temperature_from_ram(); extern void restore_print_from_ram_and_continue(float e_move); extern void cancel_saved_printing(); +// Define some coordinates outside the clamp limits (making them invalid past the parsing stage) so +// that they can be used later for various logical checks +#define X_COORD_INVALID (X_MIN_POS-1) +#define SAVED_START_POSITION_UNSET X_COORD_INVALID +extern float saved_start_position[NUM_AXIS]; +extern uint16_t saved_segment_idx; + //estimated time to end of the print extern uint8_t calc_percent_done(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2e5995f13..ec6316760 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -78,6 +78,7 @@ #include "math.h" #include "util.h" #include "Timer.h" +#include "power_panic.h" #include "Prusa_farm.h" #include @@ -179,9 +180,6 @@ bool mesh_bed_leveling_flag = false; uint32_t total_filament_used; HeatingStatus heating_status; bool loading_flag = false; - -#define XY_NO_RESTORE_FLAG (mesh_bed_leveling_flag || homing_flag) - int fan_edge_counter[2]; int fan_speed[2]; @@ -246,14 +244,9 @@ static uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; const char errormagic[] PROGMEM = "Error:"; const char echomagic[] PROGMEM = "echo:"; -// Define some coordinates outside the clamp limits (making them invalid past the parsing stage) so -// that they can be used later for various logical checks -#define X_COORD_INVALID (X_MIN_POS-1) +float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0}; -#define SAVED_START_POSITION_UNSET X_COORD_INVALID -static float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0}; - -static uint16_t saved_segment_idx = 0; +uint16_t saved_segment_idx = 0; // storing estimated time to end of print counted by slicer uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT; @@ -10342,493 +10335,6 @@ void serialecho_temperatures() { SERIAL_PROTOCOLLN(); } -#ifdef UVLO_SUPPORT -void uvlo_drain_reset() -{ - // burn all that residual power - wdt_enable(WDTO_1S); - WRITE(BEEPER,HIGH); - lcd_clear(); - lcd_puts_at_P(0, 1, MSG_POWERPANIC_DETECTED); - while(1); -} - - -void uvlo_() -{ - unsigned long time_start = _millis(); - bool sd_print = card.sdprinting; - // Conserve power as soon as possible. -#ifdef LCD_BL_PIN - backlightMode = BACKLIGHT_MODE_DIM; - backlightLevel_LOW = 0; - backlight_update(); -#endif //LCD_BL_PIN - disable_x(); - disable_y(); - -#ifdef TMC2130 - tmc2130_set_current_h(Z_AXIS, 20); - tmc2130_set_current_r(Z_AXIS, 20); - tmc2130_set_current_h(E_AXIS, 20); - tmc2130_set_current_r(E_AXIS, 20); -#endif //TMC2130 - - // Stop all heaters - uint8_t saved_target_temperature_bed = target_temperature_bed; - uint16_t saved_target_temperature_ext = target_temperature[active_extruder]; - setTargetHotend(0); - setTargetBed(0); - - // Calculate the file position, from which to resume this print. - long sd_position = sdpos_atomic; //atomic sd position of last command added in queue - { - uint16_t sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner - sd_position -= sdlen_planner; - uint16_t sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue - sd_position -= sdlen_cmdqueue; - if (sd_position < 0) sd_position = 0; - } - - // save the global state at planning time - bool pos_invalid = XY_NO_RESTORE_FLAG; - uint16_t feedrate_bckp; - if (current_block && !pos_invalid) - { - memcpy(saved_start_position, current_block->gcode_start_position, sizeof(saved_start_position)); - feedrate_bckp = current_block->gcode_feedrate; - saved_segment_idx = current_block->segment_idx; - } - else - { - saved_start_position[0] = SAVED_START_POSITION_UNSET; - feedrate_bckp = feedrate; - saved_segment_idx = 0; - } - - // From this point on and up to the print recovery, Z should not move during X/Y travels and - // should be controlled precisely. Reset the MBL status before planner_abort_hard in order to - // get the physical Z for further manipulation. - bool mbl_was_active = mbl.active; - mbl.active = false; - - // After this call, the planner queue is emptied and the current_position is set to a current logical coordinate. - // The logical coordinate will likely differ from the machine coordinate if the skew calibration and mesh bed leveling - // are in action. - planner_abort_hard(); - - // Store the print logical Z position, which we need to recover (a slight error here would be - // recovered on the next Gcode instruction, while a physical location error would not) - float logical_z = current_position[Z_AXIS]; - if(mbl_was_active) logical_z -= mbl.get_z(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS)); - eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z, logical_z); - - // Store the print E position before we lose track - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, (axis_relative_modes & E_AXIS_MASK)?0:1); - - // Clean the input command queue, inhibit serial processing using saved_printing - cmdqueue_reset(); - card.sdprinting = false; - saved_printing = true; - - // Enable stepper driver interrupt to move Z axis. This should be fine as the planner and - // command queues are empty, SD card printing is disabled, usb is inhibited. - planner_aborted = false; - sei(); - - // Retract - current_position[E_AXIS] -= default_retraction; - plan_buffer_line_curposXYZE(95); - st_synchronize(); - disable_e0(); - - // Read out the current Z motor microstep counter to move the axis up towards - // a full step before powering off. NOTE: we need to ensure to schedule more - // than "dropsegments" steps in order to move (this is always the case here - // due to UVLO_Z_AXIS_SHIFT being used) - uint16_t z_res = tmc2130_get_res(Z_AXIS); - uint16_t z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); - current_position[Z_AXIS] += float(1024 - z_microsteps) - / (z_res * cs.axis_steps_per_unit[Z_AXIS]) - + UVLO_Z_AXIS_SHIFT; - plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS]/60); - st_synchronize(); - poweroff_z(); - - // Write the file position. - eeprom_update_dword((uint32_t*)(EEPROM_FILE_POSITION), sd_position); - - // Store the mesh bed leveling offsets. This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. - for (uint8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) { - uint8_t ix = mesh_point % MESH_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 - uint8_t iy = mesh_point / MESH_NUM_X_POINTS; - // Scale the z value to 1u resolution. - int16_t v = mbl_was_active ? int16_t(floor(mbl.z_values[iy][ix] * 1000.f + 0.5f)) : 0; - eeprom_update_word((uint16_t*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL +2*mesh_point), *reinterpret_cast(&v)); - } - - // Write the _final_ Z position and motor microstep counter (unused). - eeprom_update_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z, current_position[Z_AXIS]); - z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); - eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); - - // Store the current position. - if (pos_invalid) - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), X_COORD_INVALID); - else - { - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); - } - - // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) - eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, feedrate_bckp); - eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY, feedmultiply); - eeprom_update_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND, saved_target_temperature_ext); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, saved_target_temperature_bed); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); - eeprom_update_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_0), extruder_multiplier[0]); -#if EXTRUDERS > 1 - eeprom_update_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_1), extruder_multiplier[1]); -#if EXTRUDERS > 2 - eeprom_update_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_2), extruder_multiplier[2]); -#endif -#endif - eeprom_update_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY), (uint16_t)extrudemultiply); - - eeprom_update_float((float*)(EEPROM_UVLO_ACCELL), cs.acceleration); - eeprom_update_float((float*)(EEPROM_UVLO_RETRACT_ACCELL), cs.retract_acceleration); - eeprom_update_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL), cs.travel_acceleration); - - // Store the saved target - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+0*4), saved_start_position[X_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+1*4), saved_start_position[Y_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+2*4), saved_start_position[Z_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+3*4), saved_start_position[E_AXIS]); - - eeprom_update_word((uint16_t*)EEPROM_UVLO_SAVED_SEGMENT_IDX, saved_segment_idx); - -#ifdef LIN_ADVANCE - eeprom_update_float((float*)(EEPROM_UVLO_LA_K), extruder_advance_K); -#endif - - // Finaly store the "power outage" flag. - if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); - - // Increment power failure counter - eeprom_increment_byte((uint8_t*)EEPROM_POWER_COUNT); - eeprom_increment_word((uint16_t*)EEPROM_POWER_COUNT_TOT); - - printf_P(_N("UVLO - end %d\n"), _millis() - time_start); - WRITE(BEEPER,HIGH); - - // All is set: with all the juice left, try to move extruder away to detach the nozzle completely from the print - poweron_z(); - current_position[X_AXIS] = (current_position[X_AXIS] < 0.5f * (X_MIN_POS + X_MAX_POS)) ? X_MIN_POS : X_MAX_POS; - plan_buffer_line_curposXYZE(500); - st_synchronize(); - - wdt_enable(WDTO_1S); - while(1); -} - - -void uvlo_tiny() -{ - unsigned long time_start = _millis(); - - // Conserve power as soon as possible. - disable_x(); - disable_y(); - disable_e0(); - -#ifdef TMC2130 - tmc2130_set_current_h(Z_AXIS, 20); - tmc2130_set_current_r(Z_AXIS, 20); -#endif //TMC2130 - - // Stop all heaters - setTargetHotend(0); - setTargetBed(0); - - // When power is interrupted on the _first_ recovery an attempt can be made to raise the - // extruder, causing the Z position to change. Similarly, when recovering, the Z position is - // lowered. In such cases we cannot just save Z, we need to re-align the steppers to a fullstep. - // Disable MBL (if not already) to work with physical coordinates. - mbl.active = false; - planner_abort_hard(); - - // Allow for small roundoffs to be ignored - if(fabs(current_position[Z_AXIS] - eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z))) >= 1.f/cs.axis_steps_per_unit[Z_AXIS]) - { - // Clean the input command queue, inhibit serial processing using saved_printing - cmdqueue_reset(); - card.sdprinting = false; - saved_printing = true; - - // Enable stepper driver interrupt to move Z axis. This should be fine as the planner and - // command queues are empty, SD card printing is disabled, usb is inhibited. - planner_aborted = false; - sei(); - - // The axis was moved: adjust Z as done on a regular UVLO. - uint16_t z_res = tmc2130_get_res(Z_AXIS); - uint16_t z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); - current_position[Z_AXIS] += float(1024 - z_microsteps) - / (z_res * cs.axis_steps_per_unit[Z_AXIS]) - + UVLO_TINY_Z_AXIS_SHIFT; - plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS]/60); - st_synchronize(); - poweroff_z(); - - // Update Z position - eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); - - // Update the _final_ Z motor microstep counter (unused). - z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); - eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); - } - - // Update the the "power outage" flag. - eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); - - // Increment power failure counter - eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); - - printf_P(_N("UVLO_TINY - end %d\n"), _millis() - time_start); - uvlo_drain_reset(); -} - -void setup_uvlo_interrupt() { - DDRE &= ~(1 << 4); //input pin - PORTE &= ~(1 << 4); //no internal pull-up - - // sensing falling edge - EICRB |= (1 << 0); - EICRB &= ~(1 << 1); - - // enable INT4 interrupt - EIMSK |= (1 << 4); - - // check if power was lost before we armed the interrupt - if(!(PINE & (1 << 4)) && eeprom_read_byte((uint8_t*)EEPROM_UVLO)) - { - SERIAL_ECHOLNPGM("INT4"); - uvlo_drain_reset(); - } -} - -ISR(INT4_vect) { - EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once - SERIAL_ECHOLNPGM("INT4"); - //fire normal uvlo only in case where EEPROM_UVLO is 0 or if IS_SD_PRINTING is 1. - if(printer_active() && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); - if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); -} - -void recover_print(uint8_t automatic) { - lcd_update_enable(true); - lcd_update(2); - lcd_setstatuspgm(_i("Recovering print"));////MSG_RECOVERING_PRINT c=20 - - // Recover position, temperatures and extrude_multipliers - bool mbl_was_active = recover_machine_state_after_power_panic(); - - // Lift the print head 25mm, first to avoid collisions with oozed material with the print, - // and second also so one may remove the excess priming material. - if(eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) - { - enquecommandf_P(PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); - } - - // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine - // transformation status. G28 will not touch Z when MBL is off. - enquecommand_P(PSTR("G28 X Y")); - // Set the target bed and nozzle temperatures and wait. - enquecommandf_P(PSTR("M104 S%d"), target_temperature[active_extruder]); - enquecommandf_P(PSTR("M140 S%d"), target_temperature_bed); - enquecommandf_P(PSTR("M109 S%d"), target_temperature[active_extruder]); - enquecommand_P(MSG_M83); //E axis relative mode - - // If not automatically recoreverd (long power loss) - if(automatic == 0){ - //Extrude some filament to stabilize the pressure - enquecommand_P(PSTR("G1 E5 F120")); - // Retract to be consistent with a short pause - enquecommandf_P(G1_E_F2700, default_retraction); - } - - printf_P(_N("After waiting for temp:\nCurrent pos X_AXIS:%.3f\nCurrent pos Y_AXIS:%.3f\n"), current_position[X_AXIS], current_position[Y_AXIS]); - - // Restart the print. - restore_print_from_eeprom(mbl_was_active); - printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); -} - -bool recover_machine_state_after_power_panic() -{ - // 1) Preset some dummy values for the XY axes - current_position[X_AXIS] = 0; - current_position[Y_AXIS] = 0; - - // 2) Restore the mesh bed leveling offsets, but not the MBL status. - // This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. - bool mbl_was_active = false; - for (int8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) { - uint8_t ix = mesh_point % MESH_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 - uint8_t iy = mesh_point / MESH_NUM_X_POINTS; - // Scale the z value to 10u resolution. - int16_t v; - eeprom_read_block(&v, (void*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL+2*mesh_point), 2); - if (v != 0) - mbl_was_active = true; - mbl.z_values[iy][ix] = float(v) * 0.001f; - } - - // Recover the physical coordinate of the Z axis at the time of the power panic. - // The current position after power panic is moved to the next closest 0th full step. - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)); - - // Recover last E axis position - current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); - - // 3) Initialize the logical to physical coordinate system transformation. - world2machine_initialize(); -// SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); -// print_mesh_bed_leveling_table(); - - // 4) Load the baby stepping value, which is expected to be active at the time of power panic. - // The baby stepping value is used to reset the physical Z axis when rehoming the Z axis. - babystep_load(); - - // 5) Set the physical positions from the logical positions using the world2machine transformation - // This is only done to inizialize Z/E axes with physical locations, since X/Y are unknown. - clamp_to_software_endstops(current_position); - set_destination_to_current(); - plan_set_position_curposXYZE(); - SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); - print_world_coordinates(); - - // 6) Power up the Z motors, mark their positions as known. - axis_known_position[Z_AXIS] = true; - enable_z(); - - // 7) Recover the target temperatures. - target_temperature[active_extruder] = eeprom_read_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND); - target_temperature_bed = eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED); - - // 8) Recover extruder multipilers - extruder_multiplier[0] = eeprom_read_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_0)); -#if EXTRUDERS > 1 - extruder_multiplier[1] = eeprom_read_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_1)); -#if EXTRUDERS > 2 - extruder_multiplier[2] = eeprom_read_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_2)); -#endif -#endif - extrudemultiply = (int)eeprom_read_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY)); - - // 9) Recover the saved target - saved_start_position[X_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+0*4)); - saved_start_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+1*4)); - saved_start_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+2*4)); - saved_start_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+3*4)); - - saved_segment_idx = eeprom_read_word((uint16_t*)EEPROM_UVLO_SAVED_SEGMENT_IDX); - -#ifdef LIN_ADVANCE - extruder_advance_K = eeprom_read_float((float*)EEPROM_UVLO_LA_K); -#endif - - return mbl_was_active; -} - -void restore_print_from_eeprom(bool mbl_was_active) { - int feedrate_rec; - int feedmultiply_rec; - uint8_t fan_speed_rec; - char filename[FILENAME_LENGTH]; - uint8_t depth = 0; - char dir_name[9]; - - fan_speed_rec = eeprom_read_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED); - feedrate_rec = eeprom_read_word((uint16_t*)EEPROM_UVLO_FEEDRATE); - feedmultiply_rec = eeprom_read_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY); - SERIAL_ECHOPGM("Feedrate:"); - MYSERIAL.print(feedrate_rec); - SERIAL_ECHOPGM(", feedmultiply:"); - MYSERIAL.println(feedmultiply_rec); - - depth = eeprom_read_byte((uint8_t*)EEPROM_DIR_DEPTH); - - MYSERIAL.println(int(depth)); - for (uint8_t i = 0; i < depth; i++) { - for (uint8_t j = 0; j < 8; j++) { - dir_name[j] = eeprom_read_byte((uint8_t*)EEPROM_DIRS + j + 8 * i); - } - dir_name[8] = '\0'; - MYSERIAL.println(dir_name); - // strcpy(card.dir_names[i], dir_name); - card.chdir(dir_name, false); - } - - for (uint8_t i = 0; i < 8; i++) { - filename[i] = eeprom_read_byte((uint8_t*)EEPROM_FILENAME + i); - } - filename[8] = '\0'; - - MYSERIAL.print(filename); - strcat_P(filename, PSTR(".gco")); - enquecommandf_P(MSG_M23, filename); - uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); - SERIAL_ECHOPGM("Position read from eeprom:"); - MYSERIAL.println(position); - - // Move to the XY print position in logical coordinates, where the print has been killed, but - // without shifting Z along the way. This requires performing the move without mbl. - float pos_x = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0)); - float pos_y = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); - if (pos_x != X_COORD_INVALID) - { - enquecommandf_P(PSTR("G1 X%-.3f Y%-.3f F3000"), pos_x, pos_y); - } - - // Enable MBL and switch to logical positioning - if (mbl_was_active) - enquecommand_P(PSTR("PRUSA MBL V1")); - - // Move the Z axis down to the print, in logical coordinates. - enquecommandf_P(PSTR("G1 Z%-.3f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); - - // Restore acceleration settings - float acceleration = eeprom_read_float((float*)(EEPROM_UVLO_ACCELL)); - float retract_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_RETRACT_ACCELL)); - float travel_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL)); - // accelerations are usually ordinary numbers, no need to keep extensive amount of decimal places - enquecommandf_P(PSTR("M204 P%-.1f R%-.1f T%-.1f"), acceleration, retract_acceleration, travel_acceleration); - - // Unretract. - enquecommandf_P(G1_E_F2700, default_retraction); - // Recover final E axis position and mode - float pos_e = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); - enquecommandf_P(PSTR("G92 E%-.3f"), pos_e); - if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) - enquecommand_P(PSTR("M82")); //E axis abslute mode - // Set the feedrates saved at the power panic. - enquecommandf_P(PSTR("G1 F%d"), feedrate_rec); - enquecommandf_P(MSG_M220, feedmultiply_rec); - // Set the fan speed saved at the power panic. - enquecommandf_P(PSTR("M106 S%u"), fan_speed_rec); - - // Set a position in the file. - enquecommandf_P(PSTR("M26 S%lu"), position); - enquecommand_P(PSTR("G4 S0")); - enquecommand_P(PSTR("PRUSA uvlo")); -} -#endif //UVLO_SUPPORT - - //! @brief Immediately stop print moves //! //! Immediately stop print moves, save current extruder temperature and position to RAM. @@ -10956,7 +10462,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) #endif // save the global state at planning time - bool pos_invalid = XY_NO_RESTORE_FLAG; + bool pos_invalid = mesh_bed_leveling_flag || homing_flag; if (current_block && !pos_invalid) { memcpy(saved_start_position, current_block->gcode_start_position, sizeof(saved_start_position)); diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp new file mode 100644 index 000000000..24683f74c --- /dev/null +++ b/Firmware/power_panic.cpp @@ -0,0 +1,492 @@ +#include "Configuration.h" +#include "config.h" + +#ifdef UVLO_SUPPORT +#include +#include // For HIGH and LOW macros +#include "backlight.h" +#include "cardreader.h" +#include "cmdqueue.h" +#include "eeprom.h" +#include "fastio.h" +#include "lcd.h" +#include "mesh_bed_leveling.h" +#include "mesh_bed_calibration.h" +#include "messages.h" +#include "planner.h" +#include "power_panic.h" +#include "stepper.h" +#include "system_timer.h" +#include "tmc2130.h" +#include "temperature.h" +#include "ultralcd.h" + +static bool recover_machine_state_after_power_panic(); +static void restore_print_from_eeprom(bool mbl_was_active); + +static void uvlo_drain_reset() { + // burn all that residual power + wdt_enable(WDTO_1S); + WRITE(BEEPER,HIGH); + lcd_clear(); + lcd_puts_at_P(0, 1, MSG_POWERPANIC_DETECTED); + while(1); +} + + +void uvlo_() { + unsigned long time_start = _millis(); + bool sd_print = card.sdprinting; + // Conserve power as soon as possible. +#ifdef LCD_BL_PIN + backlightMode = BACKLIGHT_MODE_DIM; + backlightLevel_LOW = 0; + backlight_update(); +#endif //LCD_BL_PIN + disable_x(); + disable_y(); + +#ifdef TMC2130 + tmc2130_set_current_h(Z_AXIS, 20); + tmc2130_set_current_r(Z_AXIS, 20); + tmc2130_set_current_h(E_AXIS, 20); + tmc2130_set_current_r(E_AXIS, 20); +#endif //TMC2130 + + // Stop all heaters + uint8_t saved_target_temperature_bed = target_temperature_bed; + uint16_t saved_target_temperature_ext = target_temperature[active_extruder]; + setTargetHotend(0); + setTargetBed(0); + + // Calculate the file position, from which to resume this print. + long sd_position = sdpos_atomic; //atomic sd position of last command added in queue + uint16_t sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner + sd_position -= sdlen_planner; + uint16_t sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue + sd_position -= sdlen_cmdqueue; + if (sd_position < 0) sd_position = 0; + + // save the global state at planning time + bool pos_invalid = mesh_bed_leveling_flag || homing_flag; + uint16_t feedrate_bckp; + if (current_block && !pos_invalid) + { + memcpy(saved_start_position, current_block->gcode_start_position, sizeof(saved_start_position)); + feedrate_bckp = current_block->gcode_feedrate; + saved_segment_idx = current_block->segment_idx; + } + else + { + saved_start_position[0] = SAVED_START_POSITION_UNSET; + feedrate_bckp = feedrate; + saved_segment_idx = 0; + } + + // From this point on and up to the print recovery, Z should not move during X/Y travels and + // should be controlled precisely. Reset the MBL status before planner_abort_hard in order to + // get the physical Z for further manipulation. + bool mbl_was_active = mbl.active; + mbl.active = false; + + // After this call, the planner queue is emptied and the current_position is set to a current logical coordinate. + // The logical coordinate will likely differ from the machine coordinate if the skew calibration and mesh bed leveling + // are in action. + planner_abort_hard(); + + // Store the print logical Z position, which we need to recover (a slight error here would be + // recovered on the next Gcode instruction, while a physical location error would not) + float logical_z = current_position[Z_AXIS]; + if(mbl_was_active) logical_z -= mbl.get_z(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS)); + eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z, logical_z); + + // Store the print E position before we lose track + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, (axis_relative_modes & E_AXIS_MASK)?0:1); + + // Clean the input command queue, inhibit serial processing using saved_printing + cmdqueue_reset(); + card.sdprinting = false; + saved_printing = true; + + // Enable stepper driver interrupt to move Z axis. This should be fine as the planner and + // command queues are empty, SD card printing is disabled, usb is inhibited. + planner_aborted = false; + sei(); + + // Retract + current_position[E_AXIS] -= default_retraction; + plan_buffer_line_curposXYZE(95); + st_synchronize(); + disable_e0(); + + // Read out the current Z motor microstep counter to move the axis up towards + // a full step before powering off. NOTE: we need to ensure to schedule more + // than "dropsegments" steps in order to move (this is always the case here + // due to UVLO_Z_AXIS_SHIFT being used) + uint16_t z_res = tmc2130_get_res(Z_AXIS); + uint16_t z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); + current_position[Z_AXIS] += float(1024 - z_microsteps) + / (z_res * cs.axis_steps_per_unit[Z_AXIS]) + + UVLO_Z_AXIS_SHIFT; + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS]/60); + st_synchronize(); + poweroff_z(); + + // Write the file position. + eeprom_update_dword((uint32_t*)(EEPROM_FILE_POSITION), sd_position); + + // Store the mesh bed leveling offsets. This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. + for (uint8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) + { + uint8_t ix = mesh_point % MESH_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 + uint8_t iy = mesh_point / MESH_NUM_X_POINTS; + // Scale the z value to 1u resolution. + int16_t v = mbl_was_active ? int16_t(floor(mbl.z_values[iy][ix] * 1000.f + 0.5f)) : 0; + eeprom_update_word((uint16_t*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL +2*mesh_point), *reinterpret_cast(&v)); + } + + // Write the _final_ Z position and motor microstep counter (unused). + eeprom_update_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z, current_position[Z_AXIS]); + z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); + eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); + + // Store the current position. + if (pos_invalid) + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), X_COORD_INVALID); + else + { + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); + } + + // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) + eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, feedrate_bckp); + eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY, feedmultiply); + eeprom_update_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND, saved_target_temperature_ext); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, saved_target_temperature_bed); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); + eeprom_update_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_0), extruder_multiplier[0]); + eeprom_update_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY), (uint16_t)extrudemultiply); + + eeprom_update_float((float*)(EEPROM_UVLO_ACCELL), cs.acceleration); + eeprom_update_float((float*)(EEPROM_UVLO_RETRACT_ACCELL), cs.retract_acceleration); + eeprom_update_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL), cs.travel_acceleration); + + // Store the saved target + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+0*4), saved_start_position[X_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+1*4), saved_start_position[Y_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+2*4), saved_start_position[Z_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+3*4), saved_start_position[E_AXIS]); + + eeprom_update_word((uint16_t*)EEPROM_UVLO_SAVED_SEGMENT_IDX, saved_segment_idx); + +#ifdef LIN_ADVANCE + eeprom_update_float((float*)(EEPROM_UVLO_LA_K), extruder_advance_K); +#endif + + // Finaly store the "power outage" flag. + if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); + + // Increment power failure counter + eeprom_increment_byte((uint8_t*)EEPROM_POWER_COUNT); + eeprom_increment_word((uint16_t*)EEPROM_POWER_COUNT_TOT); + + printf_P(_N("UVLO - end %d\n"), _millis() - time_start); + WRITE(BEEPER,HIGH); + + // All is set: with all the juice left, try to move extruder away to detach the nozzle completely from the print + poweron_z(); + current_position[X_AXIS] = (current_position[X_AXIS] < 0.5f * (X_MIN_POS + X_MAX_POS)) ? X_MIN_POS : X_MAX_POS; + plan_buffer_line_curposXYZE(500); + st_synchronize(); + + wdt_enable(WDTO_1S); + while(1); +} + + +static void uvlo_tiny() { + unsigned long time_start = _millis(); + + // Conserve power as soon as possible. + disable_x(); + disable_y(); + disable_e0(); + +#ifdef TMC2130 + tmc2130_set_current_h(Z_AXIS, 20); + tmc2130_set_current_r(Z_AXIS, 20); +#endif //TMC2130 + + // Stop all heaters + setTargetHotend(0); + setTargetBed(0); + + // When power is interrupted on the _first_ recovery an attempt can be made to raise the + // extruder, causing the Z position to change. Similarly, when recovering, the Z position is + // lowered. In such cases we cannot just save Z, we need to re-align the steppers to a fullstep. + // Disable MBL (if not already) to work with physical coordinates. + mbl.active = false; + planner_abort_hard(); + + // Allow for small roundoffs to be ignored + if(fabs(current_position[Z_AXIS] - eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z))) >= 1.f/cs.axis_steps_per_unit[Z_AXIS]) + { + // Clean the input command queue, inhibit serial processing using saved_printing + cmdqueue_reset(); + card.sdprinting = false; + saved_printing = true; + + // Enable stepper driver interrupt to move Z axis. This should be fine as the planner and + // command queues are empty, SD card printing is disabled, usb is inhibited. + planner_aborted = false; + sei(); + + // The axis was moved: adjust Z as done on a regular UVLO. + uint16_t z_res = tmc2130_get_res(Z_AXIS); + uint16_t z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); + current_position[Z_AXIS] += float(1024 - z_microsteps) + / (z_res * cs.axis_steps_per_unit[Z_AXIS]) + + UVLO_TINY_Z_AXIS_SHIFT; + plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS]/60); + st_synchronize(); + poweroff_z(); + + // Update Z position + eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); + + // Update the _final_ Z motor microstep counter (unused). + z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); + eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); + } + + // Update the the "power outage" flag. + eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); + + // Increment power failure counter + eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); + + printf_P(_N("UVLO_TINY - end %d\n"), _millis() - time_start); + uvlo_drain_reset(); +} + +void setup_uvlo_interrupt() { + DDRE &= ~(1 << 4); //input pin + PORTE &= ~(1 << 4); //no internal pull-up + + // sensing falling edge + EICRB |= (1 << 0); + EICRB &= ~(1 << 1); + + // enable INT4 interrupt + EIMSK |= (1 << 4); + + // check if power was lost before we armed the interrupt + if(!(PINE & (1 << 4)) && eeprom_read_byte((uint8_t*)EEPROM_UVLO)) + { + SERIAL_ECHOLNPGM("INT4"); + uvlo_drain_reset(); + } +} + +ISR(INT4_vect) { + EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once + SERIAL_ECHOLNPGM("INT4"); + //fire normal uvlo only in case where EEPROM_UVLO is 0 or if IS_SD_PRINTING is 1. + if(printer_active() && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); + if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); +} + +void recover_print(uint8_t automatic) { + lcd_update_enable(true); + lcd_update(2); + lcd_setstatuspgm(_i("Recovering print"));////MSG_RECOVERING_PRINT c=20 + + // Recover position, temperatures and extrude_multipliers + bool mbl_was_active = recover_machine_state_after_power_panic(); + + // Lift the print head 25mm, first to avoid collisions with oozed material with the print, + // and second also so one may remove the excess priming material. + if(eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) + { + enquecommandf_P(PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); + } + + // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine + // transformation status. G28 will not touch Z when MBL is off. + enquecommand_P(PSTR("G28 X Y")); + // Set the target bed and nozzle temperatures and wait. + enquecommandf_P(PSTR("M104 S%d"), target_temperature[active_extruder]); + enquecommandf_P(PSTR("M140 S%d"), target_temperature_bed); + enquecommandf_P(PSTR("M109 S%d"), target_temperature[active_extruder]); + enquecommand_P(MSG_M83); //E axis relative mode + + // If not automatically recoreverd (long power loss) + if(automatic == 0){ + //Extrude some filament to stabilize the pressure + enquecommand_P(PSTR("G1 E5 F120")); + // Retract to be consistent with a short pause + enquecommandf_P(G1_E_F2700, default_retraction); + } + + printf_P(_N("After waiting for temp:\nCurrent pos X_AXIS:%.3f\nCurrent pos Y_AXIS:%.3f\n"), current_position[X_AXIS], current_position[Y_AXIS]); + + // Restart the print. + restore_print_from_eeprom(mbl_was_active); + printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); +} + +bool recover_machine_state_after_power_panic() { + // 1) Preset some dummy values for the XY axes + current_position[X_AXIS] = 0; + current_position[Y_AXIS] = 0; + + // 2) Restore the mesh bed leveling offsets, but not the MBL status. + // This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. + bool mbl_was_active = false; + for (int8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) { + uint8_t ix = mesh_point % MESH_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 + uint8_t iy = mesh_point / MESH_NUM_X_POINTS; + // Scale the z value to 10u resolution. + int16_t v; + eeprom_read_block(&v, (void*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL+2*mesh_point), 2); + if (v != 0) + mbl_was_active = true; + mbl.z_values[iy][ix] = float(v) * 0.001f; + } + + // Recover the physical coordinate of the Z axis at the time of the power panic. + // The current position after power panic is moved to the next closest 0th full step. + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)); + + // Recover last E axis position + current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); + + // 3) Initialize the logical to physical coordinate system transformation. + world2machine_initialize(); + // SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); + // print_mesh_bed_leveling_table(); + + // 4) Load the baby stepping value, which is expected to be active at the time of power panic. + // The baby stepping value is used to reset the physical Z axis when rehoming the Z axis. + babystep_load(); + + // 5) Set the physical positions from the logical positions using the world2machine transformation + // This is only done to inizialize Z/E axes with physical locations, since X/Y are unknown. + clamp_to_software_endstops(current_position); + set_destination_to_current(); + plan_set_position_curposXYZE(); + SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); + print_world_coordinates(); + + // 6) Power up the Z motors, mark their positions as known. + axis_known_position[Z_AXIS] = true; + enable_z(); + + // 7) Recover the target temperatures. + target_temperature[active_extruder] = eeprom_read_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND); + target_temperature_bed = eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED); + + // 8) Recover extruder multipilers + extruder_multiplier[0] = eeprom_read_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_0)); + extrudemultiply = (int)eeprom_read_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY)); + + // 9) Recover the saved target + saved_start_position[X_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+0*4)); + saved_start_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+1*4)); + saved_start_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+2*4)); + saved_start_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+3*4)); + + saved_segment_idx = eeprom_read_word((uint16_t*)EEPROM_UVLO_SAVED_SEGMENT_IDX); + +#ifdef LIN_ADVANCE + extruder_advance_K = eeprom_read_float((float*)EEPROM_UVLO_LA_K); +#endif + + return mbl_was_active; +} + +void restore_print_from_eeprom(bool mbl_was_active) { + int feedrate_rec; + int feedmultiply_rec; + uint8_t fan_speed_rec; + char filename[FILENAME_LENGTH]; + uint8_t depth = 0; + char dir_name[9]; + + fan_speed_rec = eeprom_read_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED); + feedrate_rec = eeprom_read_word((uint16_t*)EEPROM_UVLO_FEEDRATE); + feedmultiply_rec = eeprom_read_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY); + SERIAL_ECHOPGM("Feedrate:"); + MYSERIAL.print(feedrate_rec); + SERIAL_ECHOPGM(", feedmultiply:"); + MYSERIAL.println(feedmultiply_rec); + + depth = eeprom_read_byte((uint8_t*)EEPROM_DIR_DEPTH); + + MYSERIAL.println(int(depth)); + for (uint8_t i = 0; i < depth; i++) { + for (uint8_t j = 0; j < 8; j++) { + dir_name[j] = eeprom_read_byte((uint8_t*)EEPROM_DIRS + j + 8 * i); + } + dir_name[8] = '\0'; + MYSERIAL.println(dir_name); + // strcpy(card.dir_names[i], dir_name); + card.chdir(dir_name, false); + } + + for (uint8_t i = 0; i < 8; i++) { + filename[i] = eeprom_read_byte((uint8_t*)EEPROM_FILENAME + i); + } + filename[8] = '\0'; + + MYSERIAL.print(filename); + strcat_P(filename, PSTR(".gco")); + enquecommandf_P(MSG_M23, filename); + uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); + SERIAL_ECHOPGM("Position read from eeprom:"); + MYSERIAL.println(position); + + // Move to the XY print position in logical coordinates, where the print has been killed, but + // without shifting Z along the way. This requires performing the move without mbl. + float pos_x = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0)); + float pos_y = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); + if (pos_x != X_COORD_INVALID) { + enquecommandf_P(PSTR("G1 X%-.3f Y%-.3f F3000"), pos_x, pos_y); + } + + // Enable MBL and switch to logical positioning + if (mbl_was_active) + enquecommand_P(PSTR("PRUSA MBL V1")); + + // Move the Z axis down to the print, in logical coordinates. + enquecommandf_P(PSTR("G1 Z%-.3f"), eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z))); + + // Restore acceleration settings + float acceleration = eeprom_read_float((float*)(EEPROM_UVLO_ACCELL)); + float retract_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_RETRACT_ACCELL)); + float travel_acceleration = eeprom_read_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL)); + // accelerations are usually ordinary numbers, no need to keep extensive amount of decimal places + enquecommandf_P(PSTR("M204 P%-.1f R%-.1f T%-.1f"), acceleration, retract_acceleration, travel_acceleration); + + // Unretract. + enquecommandf_P(G1_E_F2700, default_retraction); + // Recover final E axis position and mode + float pos_e = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); + enquecommandf_P(PSTR("G92 E%-.3f"), pos_e); + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) + enquecommand_P(PSTR("M82")); //E axis abslute mode + // Set the feedrates saved at the power panic. + enquecommandf_P(PSTR("G1 F%d"), feedrate_rec); + enquecommandf_P(MSG_M220, feedmultiply_rec); + // Set the fan speed saved at the power panic. + enquecommandf_P(PSTR("M106 S%u"), fan_speed_rec); + + // Set a position in the file. + enquecommandf_P(PSTR("M26 S%lu"), position); + enquecommand_P(PSTR("G4 S0")); + enquecommand_P(PSTR("PRUSA uvlo")); +} +#endif //UVLO_SUPPORT diff --git a/Firmware/power_panic.h b/Firmware/power_panic.h new file mode 100644 index 000000000..cc9926fe6 --- /dev/null +++ b/Firmware/power_panic.h @@ -0,0 +1,5 @@ +#pragma once + +void uvlo_(); +void recover_print(uint8_t automatic); +void setup_uvlo_interrupt(); From 2902fcaa7105a7b246520423d03ba2741a804d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 25 Jun 2023 16:12:42 +0000 Subject: [PATCH 074/148] power panic: Add two functions These functions should be able to be re-used during a power panic - save_print_file_state - restore_print_file_state No functional change at the moment. --- Firmware/Marlin_main.cpp | 105 +++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ec6316760..0a26dabf6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -10335,43 +10335,31 @@ void serialecho_temperatures() { SERIAL_PROTOCOLLN(); } -//! @brief Immediately stop print moves -//! -//! Immediately stop print moves, save current extruder temperature and position to RAM. -//! If printing from sd card, position in file is saved. -//! If printing from USB, line number is saved. -//! -//! @param z_move -//! @param e_move -void stop_and_save_print_to_ram(float z_move, float e_move) -{ - if (saved_printing) return; - unsigned char nlines; - uint16_t sdlen_planner; - uint16_t sdlen_cmdqueue; - +void save_print_file_state() { + uint8_t nlines; + uint16_t sdlen_cmdqueue; + uint16_t sdlen_planner; - cli(); - if (card.sdprinting) { - saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue - sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner - saved_sdpos -= sdlen_planner; - sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue - saved_sdpos -= sdlen_cmdqueue; - saved_printing_type = PRINTING_TYPE_SD; - } - else if (usb_timer.running()) { //reuse saved_sdpos for storing line number - saved_sdpos = gcode_LastN; //start with line number of command added recently to cmd queue - //reuse planner_calc_sd_length function for getting number of lines of commands in planner: - nlines = planner_calc_sd_length(); //number of lines of commands in planner - saved_sdpos -= nlines; - saved_sdpos -= buflen; //number of blocks in cmd buffer - saved_printing_type = PRINTING_TYPE_USB; - } - else { - saved_printing_type = PRINTING_TYPE_NONE; - //not sd printing nor usb printing - } + if (card.sdprinting) { + saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue + sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner + saved_sdpos -= sdlen_planner; + sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue + saved_sdpos -= sdlen_cmdqueue; + saved_printing_type = PRINTING_TYPE_SD; + } + else if (usb_timer.running()) { //reuse saved_sdpos for storing line number + saved_sdpos = gcode_LastN; //start with line number of command added recently to cmd queue + //reuse planner_calc_sd_length function for getting number of lines of commands in planner: + nlines = planner_calc_sd_length(); //number of lines of commands in planner + saved_sdpos -= nlines; + saved_sdpos -= buflen; //number of blocks in cmd buffer + saved_printing_type = PRINTING_TYPE_USB; + } + else { + saved_printing_type = PRINTING_TYPE_NONE; + //not sd printing nor usb printing + } #if 0 SERIAL_ECHOPGM("SDPOS_ATOMIC="); MYSERIAL.println(sdpos_atomic, DEC); @@ -10460,6 +10448,36 @@ void stop_and_save_print_to_ram(float z_move, float e_move) } } #endif +} + +void restore_print_file_state() { + if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing + card.setIndex(saved_sdpos); + sdpos_atomic = saved_sdpos; + card.sdprinting = true; + } else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing + gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing + serial_count = 0; + FlushSerialRequestResend(); + } else { + //not sd printing nor usb printing + } +} + +//! @brief Immediately stop print moves +//! +//! Immediately stop print moves, save current extruder temperature and position to RAM. +//! If printing from sd card, position in file is saved. +//! If printing from USB, line number is saved. +//! +//! @param z_move +//! @param e_move +void stop_and_save_print_to_ram(float z_move, float e_move) +{ + if (saved_printing) return; + + cli(); + save_print_file_state(); // save the global state at planning time bool pos_invalid = mesh_bed_leveling_flag || homing_flag; @@ -10599,19 +10617,8 @@ void restore_print_from_ram_and_continue(float e_move) memcpy(current_position, saved_pos, sizeof(saved_pos)); set_destination_to_current(); - if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing - card.setIndex(saved_sdpos); - sdpos_atomic = saved_sdpos; - card.sdprinting = true; - } - else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing - gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing - serial_count = 0; - FlushSerialRequestResend(); - } - else { - //not sd printing nor usb printing - } + + restore_print_file_state(); lcd_setstatuspgm(MSG_WELCOME); saved_printing_type = PRINTING_TYPE_NONE; From 67403603edfda7898ce28e649ee8b625fe6e9479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 25 Jun 2023 16:51:53 +0000 Subject: [PATCH 075/148] power panic: Re-use saving print file state This also adds the Gcode position into EEPROM for Octoprint/PrusaLink prints. Though the recovery part doesn't support that yet. --- Firmware/Marlin.h | 3 +++ Firmware/Marlin_main.cpp | 2 +- Firmware/power_panic.cpp | 9 ++------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 99bdc1c6a..7ecc248e8 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -297,6 +297,7 @@ extern bool mesh_bed_leveling_flag; // save/restore printing extern bool saved_printing; +extern uint32_t saved_sdpos; extern uint8_t saved_printing_type; #define PRINTING_TYPE_SD 0 #define PRINTING_TYPE_USB 1 @@ -384,6 +385,8 @@ extern void print_world_coordinates(); extern void print_physical_coordinates(); extern void print_mesh_bed_leveling_table(); +void save_print_file_state(); +void restore_print_file_state(); extern void stop_and_save_print_to_ram(float z_move, float e_move); void restore_extruder_temperature_from_ram(); extern void restore_print_from_ram_and_continue(float e_move); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0a26dabf6..6e9e6cd70 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -309,7 +309,7 @@ static bool chdkActive = false; //! @name RAM save/restore printing //! @{ bool saved_printing = false; //!< Print is paused and saved in RAM -static uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing +uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing uint8_t saved_printing_type = PRINTING_TYPE_SD; static float saved_pos[4] = { X_COORD_INVALID, 0, 0, 0 }; static uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 24683f74c..33c48004b 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -60,12 +60,7 @@ void uvlo_() { setTargetBed(0); // Calculate the file position, from which to resume this print. - long sd_position = sdpos_atomic; //atomic sd position of last command added in queue - uint16_t sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner - sd_position -= sdlen_planner; - uint16_t sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue - sd_position -= sdlen_cmdqueue; - if (sd_position < 0) sd_position = 0; + save_print_file_state(); // save the global state at planning time bool pos_invalid = mesh_bed_leveling_flag || homing_flag; @@ -134,7 +129,7 @@ void uvlo_() { poweroff_z(); // Write the file position. - eeprom_update_dword((uint32_t*)(EEPROM_FILE_POSITION), sd_position); + eeprom_update_dword((uint32_t*)(EEPROM_FILE_POSITION), saved_sdpos); // Store the mesh bed leveling offsets. This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. for (uint8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) From a45e4320309541e231736ac4f2eaac15640855bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 25 Jun 2023 17:04:11 +0000 Subject: [PATCH 076/148] power panic: Re-use code to save feedrate, segment index, and start position Saves ~80B of Flash --- Firmware/Marlin.h | 2 ++ Firmware/Marlin_main.cpp | 35 +++++++++++++++++++---------------- Firmware/power_panic.cpp | 18 +++--------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 7ecc248e8..ccab29276 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -306,6 +306,7 @@ extern uint8_t saved_printing_type; extern float saved_extruder_temperature; //!< Active extruder temperature extern float saved_bed_temperature; //!< Bed temperature extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255 +extern uint16_t saved_feedrate2; //estimated time to end of the print extern uint8_t print_percent_done_normal; @@ -387,6 +388,7 @@ extern void print_mesh_bed_leveling_table(); void save_print_file_state(); void restore_print_file_state(); +void save_planner_global_state(); extern void stop_and_save_print_to_ram(float z_move, float e_move); void restore_extruder_temperature_from_ram(); extern void restore_print_from_ram_and_continue(float e_move); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6e9e6cd70..eedeac579 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -312,7 +312,7 @@ bool saved_printing = false; //!< Print is paused and saved in RAM uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing uint8_t saved_printing_type = PRINTING_TYPE_SD; static float saved_pos[4] = { X_COORD_INVALID, 0, 0, 0 }; -static uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) +uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) static int saved_feedmultiply2 = 0; float saved_extruder_temperature = 0.0; //!< Active extruder temperature float saved_bed_temperature = 0.0; @@ -10464,6 +10464,21 @@ void restore_print_file_state() { } } +void save_planner_global_state() { + if (current_block && !(mesh_bed_leveling_flag || homing_flag)) + { + memcpy(saved_start_position, current_block->gcode_start_position, sizeof(saved_start_position)); + saved_feedrate2 = current_block->gcode_feedrate; + saved_segment_idx = current_block->segment_idx; + } + else + { + saved_start_position[0] = SAVED_START_POSITION_UNSET; + saved_feedrate2 = feedrate; + saved_segment_idx = 0; + } +} + //! @brief Immediately stop print moves //! //! Immediately stop print moves, save current extruder temperature and position to RAM. @@ -10479,21 +10494,9 @@ void stop_and_save_print_to_ram(float z_move, float e_move) cli(); save_print_file_state(); - // save the global state at planning time - bool pos_invalid = mesh_bed_leveling_flag || homing_flag; - if (current_block && !pos_invalid) - { - memcpy(saved_start_position, current_block->gcode_start_position, sizeof(saved_start_position)); - saved_feedrate2 = current_block->gcode_feedrate; - saved_segment_idx = current_block->segment_idx; - // printf_P(PSTR("stop_and_save_print_to_ram: %f, %f, %f, %f, %u\n"), saved_start_position[0], saved_start_position[1], saved_start_position[2], saved_start_position[3], saved_segment_idx); - } - else - { - saved_start_position[0] = SAVED_START_POSITION_UNSET; - saved_feedrate2 = feedrate; - saved_segment_idx = 0; - } + // save the global state at planning time + const bool pos_invalid = mesh_bed_leveling_flag || homing_flag; + save_planner_global_state(); planner_abort_hard(); //abort printing diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 33c48004b..6129906fd 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -37,6 +37,7 @@ static void uvlo_drain_reset() { void uvlo_() { unsigned long time_start = _millis(); bool sd_print = card.sdprinting; + const bool pos_invalid = mesh_bed_leveling_flag || homing_flag; // Conserve power as soon as possible. #ifdef LCD_BL_PIN backlightMode = BACKLIGHT_MODE_DIM; @@ -63,20 +64,7 @@ void uvlo_() { save_print_file_state(); // save the global state at planning time - bool pos_invalid = mesh_bed_leveling_flag || homing_flag; - uint16_t feedrate_bckp; - if (current_block && !pos_invalid) - { - memcpy(saved_start_position, current_block->gcode_start_position, sizeof(saved_start_position)); - feedrate_bckp = current_block->gcode_feedrate; - saved_segment_idx = current_block->segment_idx; - } - else - { - saved_start_position[0] = SAVED_START_POSITION_UNSET; - feedrate_bckp = feedrate; - saved_segment_idx = 0; - } + save_planner_global_state(); // From this point on and up to the print recovery, Z should not move during X/Y travels and // should be controlled precisely. Reset the MBL status before planner_abort_hard in order to @@ -156,7 +144,7 @@ void uvlo_() { } // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) - eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, feedrate_bckp); + eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, saved_feedrate2); eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY, feedmultiply); eeprom_update_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND, saved_target_temperature_ext); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, saved_target_temperature_bed); From b65c500f252eb8c938f509748879dfaeb6cb7864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 25 Jun 2023 17:11:37 +0000 Subject: [PATCH 077/148] power panic: Add comments about conserving power --- Firmware/power_panic.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 6129906fd..1a0552d16 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -38,15 +38,20 @@ void uvlo_() { unsigned long time_start = _millis(); bool sd_print = card.sdprinting; const bool pos_invalid = mesh_bed_leveling_flag || homing_flag; - // Conserve power as soon as possible. + + // Conserve as much power as soon as possible + // Turn off the LCD backlight #ifdef LCD_BL_PIN backlightMode = BACKLIGHT_MODE_DIM; backlightLevel_LOW = 0; backlight_update(); #endif //LCD_BL_PIN + + // Disable X and Y motors to conserve power disable_x(); disable_y(); + // Minimise Z and E motor currents (Hold and Run) #ifdef TMC2130 tmc2130_set_current_h(Z_AXIS, 20); tmc2130_set_current_r(Z_AXIS, 20); From a2ac513794f2417f366f40e92c5a973e581216ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 10:12:43 +0000 Subject: [PATCH 078/148] power panic: re-use target temps from RAM If a print has been saved to RAM such as during a filament runout, do not overwrite these saved values if a sudden power panic appears. Additionally, change the saved types to be the same as power panic when saving to RAM: - Bed target temperature is uint8_t (0 to 255) instead of float - Extruder target temperature is uint16_t instead of float Doing this change allows us to re-use the same global variables and avoid creating local variables during power panic. Change in memory: Flash: -246 bytes SRAM: -5 bytes --- Firmware/Marlin.h | 4 ++-- Firmware/Marlin_main.cpp | 16 ++++++++-------- Firmware/power_panic.cpp | 24 ++++++++++++++++++------ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index ccab29276..412e41946 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -303,8 +303,8 @@ extern uint8_t saved_printing_type; #define PRINTING_TYPE_USB 1 #define PRINTING_TYPE_NONE 2 -extern float saved_extruder_temperature; //!< Active extruder temperature -extern float saved_bed_temperature; //!< Bed temperature +extern uint16_t saved_extruder_temperature; //!< Active extruder temperature +extern uint8_t saved_bed_temperature; //!< Bed temperature extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255 extern uint16_t saved_feedrate2; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index eedeac579..c3ccfc9ee 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -314,8 +314,8 @@ uint8_t saved_printing_type = PRINTING_TYPE_SD; static float saved_pos[4] = { X_COORD_INVALID, 0, 0, 0 }; uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) static int saved_feedmultiply2 = 0; -float saved_extruder_temperature = 0.0; //!< Active extruder temperature -float saved_bed_temperature = 0.0; +uint16_t saved_extruder_temperature; //!< Active extruder temperature +uint8_t saved_bed_temperature; //!< Bed temperature static bool saved_extruder_relative_mode = false; uint8_t saved_fan_speed = 0; //!< Print fan speed //! @} @@ -9484,8 +9484,8 @@ void ThermalStop(bool allow_recovery) // disable heaters and save the original temperatures to saved_*, which will get // overwritten by stop_and_save_print_to_ram. For this corner-case, re-instate the // original values after the pause handler is called. - float bed_temp = saved_bed_temperature; - float ext_temp = saved_extruder_temperature; + uint8_t bed_temp = saved_bed_temperature; + uint16_t ext_temp = saved_extruder_temperature; uint8_t fan_speed = saved_fan_speed; lcd_pause_print(); saved_bed_temperature = bed_temp; @@ -10504,8 +10504,8 @@ void stop_and_save_print_to_ram(float z_move, float e_move) if (pos_invalid) saved_pos[X_AXIS] = X_COORD_INVALID; saved_feedmultiply2 = feedmultiply; //save feedmultiply - saved_extruder_temperature = degTargetHotend(active_extruder); - saved_bed_temperature = degTargetBed(); + saved_extruder_temperature = (uint16_t)degTargetHotend(active_extruder); + saved_bed_temperature = (uint8_t)degTargetBed(); saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; saved_fan_speed = fanSpeed; cmdqueue_reset(); //empty cmdqueue @@ -10549,7 +10549,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move) } void restore_extruder_temperature_from_ram() { - if (degTargetHotend(active_extruder) != saved_extruder_temperature) + if ((uint16_t)degTargetHotend(active_extruder) != saved_extruder_temperature) { setTargetHotend(saved_extruder_temperature); heating_status = HeatingStatus::EXTRUDER_HEATING; @@ -10581,7 +10581,7 @@ void restore_print_from_ram_and_continue(float e_move) fanSpeed = 0; // restore bed temperature (bed can be disabled during a thermal warning) - if (degBed() != saved_bed_temperature) + if ((uint8_t)degBed() != saved_bed_temperature) setTargetBed(saved_bed_temperature); restore_extruder_temperature_from_ram(); diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 1a0552d16..4bcc6f416 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -36,7 +36,12 @@ static void uvlo_drain_reset() { void uvlo_() { unsigned long time_start = _millis(); - bool sd_print = card.sdprinting; + + // True if a print is already saved to RAM + bool sd_print_saved_in_ram = saved_printing && (saved_printing_type == PRINTING_TYPE_SD); + + // Flag to decide whether or not to set EEPROM_UVLO bit + bool sd_print = card.sdprinting || sd_print_saved_in_ram; const bool pos_invalid = mesh_bed_leveling_flag || homing_flag; // Conserve as much power as soon as possible @@ -60,8 +65,12 @@ void uvlo_() { #endif //TMC2130 // Stop all heaters - uint8_t saved_target_temperature_bed = target_temperature_bed; - uint16_t saved_target_temperature_ext = target_temperature[active_extruder]; + if (!sd_print_saved_in_ram) + { + saved_bed_temperature = target_temperature_bed; + saved_extruder_temperature = target_temperature[active_extruder]; + } + setTargetHotend(0); setTargetBed(0); @@ -151,8 +160,8 @@ void uvlo_() { // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, saved_feedrate2); eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY, feedmultiply); - eeprom_update_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND, saved_target_temperature_ext); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, saved_target_temperature_bed); + eeprom_update_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND, saved_extruder_temperature); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, saved_bed_temperature); eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); eeprom_update_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_0), extruder_multiplier[0]); eeprom_update_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY), (uint16_t)extrudemultiply); @@ -173,7 +182,10 @@ void uvlo_() { eeprom_update_float((float*)(EEPROM_UVLO_LA_K), extruder_advance_K); #endif - // Finaly store the "power outage" flag. + // Finally store the "power outage" flag. + // Note: Recovering a print from EEPROM currently assumes the user + // is printing from an SD card, this is why this EEPROM byte is only set + // when SD card print is detected if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); // Increment power failure counter From 97c27525d47a843e0539109ef24937e003fffcce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 11:52:23 +0000 Subject: [PATCH 079/148] power panic: re-use saved_extruder_relative_mode Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 2 +- Firmware/power_panic.cpp | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 412e41946..72e2d5e17 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -305,6 +305,7 @@ extern uint8_t saved_printing_type; extern uint16_t saved_extruder_temperature; //!< Active extruder temperature extern uint8_t saved_bed_temperature; //!< Bed temperature +extern bool saved_extruder_relative_mode; extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255 extern uint16_t saved_feedrate2; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c3ccfc9ee..60fe27e0e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -316,7 +316,7 @@ uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) static int saved_feedmultiply2 = 0; uint16_t saved_extruder_temperature; //!< Active extruder temperature uint8_t saved_bed_temperature; //!< Bed temperature -static bool saved_extruder_relative_mode = false; +bool saved_extruder_relative_mode; uint8_t saved_fan_speed = 0; //!< Print fan speed //! @} diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 4bcc6f416..df5b8e475 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -64,13 +64,14 @@ void uvlo_() { tmc2130_set_current_r(E_AXIS, 20); #endif //TMC2130 - // Stop all heaters if (!sd_print_saved_in_ram) { saved_bed_temperature = target_temperature_bed; saved_extruder_temperature = target_temperature[active_extruder]; + saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; } + // Stop all heaters setTargetHotend(0); setTargetBed(0); @@ -99,7 +100,7 @@ void uvlo_() { // Store the print E position before we lose track eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, (axis_relative_modes & E_AXIS_MASK)?0:1); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, !saved_extruder_relative_mode); // Clean the input command queue, inhibit serial processing using saved_printing cmdqueue_reset(); From 6ccd12c7e8773e7b8d7d91ff7ab43f5f33ac30aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 12:17:46 +0000 Subject: [PATCH 080/148] power panic: re-use saved_pos This allows us to restore the position of all axis saved in RAM If the extruder had been parked to the side for example due to filament runout. Then the original position (before parking) should now be restored Change in memory: Flash: +40 bytes SRAM: 0 bytes --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 2 +- Firmware/power_panic.cpp | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 72e2d5e17..2b8d16862 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -307,6 +307,7 @@ extern uint16_t saved_extruder_temperature; //!< Active extruder temperature extern uint8_t saved_bed_temperature; //!< Bed temperature extern bool saved_extruder_relative_mode; extern uint8_t saved_fan_speed; //!< Print fan speed, ranges from 0 to 255 +extern float saved_pos[NUM_AXIS]; extern uint16_t saved_feedrate2; //estimated time to end of the print diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 60fe27e0e..1c4256be4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -311,7 +311,7 @@ static bool chdkActive = false; bool saved_printing = false; //!< Print is paused and saved in RAM uint32_t saved_sdpos = 0; //!< SD card position, or line number in case of USB printing uint8_t saved_printing_type = PRINTING_TYPE_SD; -static float saved_pos[4] = { X_COORD_INVALID, 0, 0, 0 }; +float saved_pos[NUM_AXIS] = { X_COORD_INVALID, 0, 0, 0 }; uint16_t saved_feedrate2 = 0; //!< Default feedrate (truncated from float) static int saved_feedmultiply2 = 0; uint16_t saved_extruder_temperature; //!< Active extruder temperature diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index df5b8e475..3035aca21 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -71,15 +71,20 @@ void uvlo_() { saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; } - // Stop all heaters + // Stop all heaters before continuing setTargetHotend(0); setTargetBed(0); - // Calculate the file position, from which to resume this print. - save_print_file_state(); + if (!sd_print_saved_in_ram) { + // Calculate the file position, from which to resume this print. + save_print_file_state(); - // save the global state at planning time - save_planner_global_state(); + // save the global state at planning time + save_planner_global_state(); + + memcpy(saved_pos, current_position, sizeof(saved_pos)); + if (pos_invalid) saved_pos[X_AXIS] = X_COORD_INVALID; + } // From this point on and up to the print recovery, Z should not move during X/Y travels and // should be controlled precisely. Reset the MBL status before planner_abort_hard in order to @@ -94,12 +99,12 @@ void uvlo_() { // Store the print logical Z position, which we need to recover (a slight error here would be // recovered on the next Gcode instruction, while a physical location error would not) - float logical_z = current_position[Z_AXIS]; - if(mbl_was_active) logical_z -= mbl.get_z(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS)); + float logical_z = saved_pos[Z_AXIS]; + if(mbl_was_active) logical_z = current_position[Z_AXIS] - mbl.get_z(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS)); eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z, logical_z); // Store the print E position before we lose track - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), current_position[E_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), saved_pos[E_AXIS]); eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, !saved_extruder_relative_mode); // Clean the input command queue, inhibit serial processing using saved_printing @@ -150,13 +155,8 @@ void uvlo_() { eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); // Store the current position. - if (pos_invalid) - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), X_COORD_INVALID); - else - { - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); - } + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), saved_pos[X_AXIS]); + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), saved_pos[Y_AXIS]); // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDRATE, saved_feedrate2); From 62a3d179f062fd5b4b4c298e46f332d39b51bbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 13:39:17 +0000 Subject: [PATCH 081/148] optimisation: read/write EEPROM_UVLO_SAVED_START_POSITION block I verified via printf that sizeof(saved_start_position) = 16 (i.e. 4 float values) We simply want to write 16 bytes to address EEPROM_UVLO_SAVED_START_POSITION Change in memory: Flash: -160 bytes SRAM: 0 bytes --- Firmware/power_panic.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 3035aca21..08e799b06 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -172,10 +172,7 @@ void uvlo_() { eeprom_update_float((float*)(EEPROM_UVLO_TRAVEL_ACCELL), cs.travel_acceleration); // Store the saved target - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+0*4), saved_start_position[X_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+1*4), saved_start_position[Y_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+2*4), saved_start_position[Z_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+3*4), saved_start_position[E_AXIS]); + eeprom_update_block(saved_start_position, (float *)EEPROM_UVLO_SAVED_START_POSITION, sizeof(saved_start_position)); eeprom_update_word((uint16_t*)EEPROM_UVLO_SAVED_SEGMENT_IDX, saved_segment_idx); @@ -395,10 +392,7 @@ bool recover_machine_state_after_power_panic() { extrudemultiply = (int)eeprom_read_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY)); // 9) Recover the saved target - saved_start_position[X_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+0*4)); - saved_start_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+1*4)); - saved_start_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+2*4)); - saved_start_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_SAVED_START_POSITION+3*4)); + eeprom_read_block(saved_start_position, (float *)EEPROM_UVLO_SAVED_START_POSITION, sizeof(saved_start_position)); saved_segment_idx = eeprom_read_word((uint16_t*)EEPROM_UVLO_SAVED_SEGMENT_IDX); From 44bedcd94112723a40439bdf3ecf3136d3a9f847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 13:46:03 +0000 Subject: [PATCH 082/148] power panic: cleanup: remove commented code --- Firmware/power_panic.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 08e799b06..529db4430 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -364,8 +364,6 @@ bool recover_machine_state_after_power_panic() { // 3) Initialize the logical to physical coordinate system transformation. world2machine_initialize(); - // SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); - // print_mesh_bed_leveling_table(); // 4) Load the baby stepping value, which is expected to be active at the time of power panic. // The baby stepping value is used to reset the physical Z axis when rehoming the Z axis. @@ -428,7 +426,6 @@ void restore_print_from_eeprom(bool mbl_was_active) { } dir_name[8] = '\0'; MYSERIAL.println(dir_name); - // strcpy(card.dir_names[i], dir_name); card.chdir(dir_name, false); } From 6d902d6437ec67c5fcafa4c2e900c122166dab3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 16:49:27 +0000 Subject: [PATCH 083/148] power panic: store saved_fan_speed in EEPROM fanSpeed may have an outdated value --- Firmware/power_panic.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 529db4430..c785ce79a 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -69,6 +69,7 @@ void uvlo_() { saved_bed_temperature = target_temperature_bed; saved_extruder_temperature = target_temperature[active_extruder]; saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; + saved_fan_speed = fanSpeed; } // Stop all heaters before continuing @@ -163,7 +164,7 @@ void uvlo_() { eeprom_update_word((uint16_t*)EEPROM_UVLO_FEEDMULTIPLY, feedmultiply); eeprom_update_word((uint16_t*)EEPROM_UVLO_TARGET_HOTEND, saved_extruder_temperature); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, saved_bed_temperature); - eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); + eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, saved_fan_speed); eeprom_update_float((float*)(EEPROM_EXTRUDER_MULTIPLIER_0), extruder_multiplier[0]); eeprom_update_word((uint16_t*)(EEPROM_EXTRUDEMULTIPLY), (uint16_t)extrudemultiply); From 392c46c7ad5ce0e649cbaa427ee0163440877f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 1 Jul 2023 16:50:00 +0000 Subject: [PATCH 084/148] power panic: pull INT4 string into PROGMEM Change in memory: Flash: -4 bytes SRAM 0 bytes --- Firmware/power_panic.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index c785ce79a..7c25d85ed 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -21,6 +21,8 @@ #include "temperature.h" #include "ultralcd.h" +static const char MSG_INT4[] PROGMEM = "INT4"; + static bool recover_machine_state_after_power_panic(); static void restore_print_from_eeprom(bool mbl_was_active); @@ -285,14 +287,14 @@ void setup_uvlo_interrupt() { // check if power was lost before we armed the interrupt if(!(PINE & (1 << 4)) && eeprom_read_byte((uint8_t*)EEPROM_UVLO)) { - SERIAL_ECHOLNPGM("INT4"); + SERIAL_ECHOLNRPGM(MSG_INT4); uvlo_drain_reset(); } } ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once - SERIAL_ECHOLNPGM("INT4"); + SERIAL_ECHOLNRPGM(MSG_INT4); //fire normal uvlo only in case where EEPROM_UVLO is 0 or if IS_SD_PRINTING is 1. if(printer_active() && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); From 10ed195531edcfcfc31e16f1fb8528a7a1018e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Jul 2023 16:36:28 +0000 Subject: [PATCH 085/148] power panic: use saved position consistently 1) current_position[Z_AXIS] is not always correct. saved_pos[Z_AXIS] should always represent the correct resume position for the Z-axis 2) Use the saved position to fetch the Z-offset value from the mesh bed leveling grid. In case the extruder is parked during power panic, the previous code may extract the wrong mesh bed leveling offset (due to extruder being located at different X and Y axis coordinates) --- Firmware/power_panic.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 7c25d85ed..7e9685796 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -103,7 +103,11 @@ void uvlo_() { // Store the print logical Z position, which we need to recover (a slight error here would be // recovered on the next Gcode instruction, while a physical location error would not) float logical_z = saved_pos[Z_AXIS]; - if(mbl_was_active) logical_z = current_position[Z_AXIS] - mbl.get_z(st_get_position_mm(X_AXIS), st_get_position_mm(Y_AXIS)); + if(mbl_was_active) { + // Mesh bed leveling was being actively applied to the Z-position. Revert the + // mesh bed leveling offset value. + logical_z -= mbl.get_z(saved_pos[X_AXIS], saved_pos[Y_AXIS]); + } eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z, logical_z); // Store the print E position before we lose track From fa843a4a9b1742074cffc455daf71506252b9519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 2 Jul 2023 16:48:33 +0000 Subject: [PATCH 086/148] power panic: implement partial back up in RAM A partial backup is needed in scenarios where the extruder may be parked after a print is saved. For example during a blocking wait for the user in M600 Or during a MMU error screen. A sudden power panic at this point would previously save the parked position into EEPROM. When the print is recovered it would print in mid air. --- Firmware/Marlin.h | 3 +++ Firmware/Marlin_main.cpp | 28 ++++++++++++++++++++++++++++ Firmware/mmu2.cpp | 9 +++++++++ Firmware/power_panic.cpp | 7 +++---- 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 2b8d16862..66abdaf12 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -391,6 +391,8 @@ extern void print_mesh_bed_leveling_table(); void save_print_file_state(); void restore_print_file_state(); void save_planner_global_state(); +void refresh_print_state_in_ram(); +void clear_print_state_in_ram(); extern void stop_and_save_print_to_ram(float z_move, float e_move); void restore_extruder_temperature_from_ram(); extern void restore_print_from_ram_and_continue(float e_move); @@ -402,6 +404,7 @@ extern void cancel_saved_printing(); #define SAVED_START_POSITION_UNSET X_COORD_INVALID extern float saved_start_position[NUM_AXIS]; extern uint16_t saved_segment_idx; +extern bool isPartialBackupAvailable; //estimated time to end of the print diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1c4256be4..8763b45dc 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -247,6 +247,7 @@ const char echomagic[] PROGMEM = "echo:"; float saved_start_position[NUM_AXIS] = {SAVED_START_POSITION_UNSET, 0, 0, 0}; uint16_t saved_segment_idx = 0; +bool isPartialBackupAvailable; // storing estimated time to end of print counted by slicer uint8_t print_percent_done_normal = PRINT_PERCENT_DONE_INIT; @@ -7624,6 +7625,10 @@ Sigma_Exit: { st_synchronize(); + // In case a power panic happens while waiting for the user + // take a partial back up of print state into RAM (current position, etc.) + refresh_print_state_in_ram(); + float x_position = FILAMENTCHANGE_XPOS; float y_position = FILAMENTCHANGE_YPOS; float z_shift = MIN_Z_FOR_SWAP; @@ -10479,6 +10484,29 @@ void save_planner_global_state() { } } +/// Take a backup of the current state of variables +/// e.g. feedrate, Z-axis position etc. +/// This function should backup variables which may be lost +/// For example a power panic in M600 or during MMU error +void refresh_print_state_in_ram() +{ + if (saved_printing) return; + memcpy(saved_pos, current_position, sizeof(saved_pos)); + saved_feedmultiply2 = feedmultiply; //save feedmultiply + saved_extruder_temperature = (uint16_t)degTargetHotend(active_extruder); + saved_bed_temperature = (uint8_t)degTargetBed(); + saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; + saved_fan_speed = fanSpeed; + isPartialBackupAvailable = true; +} + +void clear_print_state_in_ram() +{ + // Set flag to false in order to avoid using + // the saved values during power panic + isPartialBackupAvailable = false; +} + //! @brief Immediately stop print moves //! //! Immediately stop print moves, save current extruder temperature and position to RAM. diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index 961917461..6969bb5c5 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -627,6 +627,10 @@ void MMU2::SaveAndPark(bool move_axes) { Disable_E0(); planner_synchronize(); + // In case a power panic happens while waiting for the user + // take a partial back up of print state into RAM (current position, etc.) + refresh_print_state_in_ram(); + if (move_axes) { mmu_print_saved |= SavedState::ParkExtruder; resume_position = planner_current_position(); // save current pos @@ -681,6 +685,11 @@ void MMU2::ResumeUnpark() { // Move Z_AXIS to saved position motion_do_blocking_move_to_z(resume_position.xyz[2], feedRate_t(NOZZLE_PARK_Z_FEEDRATE)); + // From this point forward, power panic should not use + // the partial backup in RAM since the extruder is no + // longer in parking position + clear_print_state_in_ram(); + mmu_print_saved &= ~(SavedState::ParkExtruder); } } diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 7e9685796..1e2ebf8fd 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -66,12 +66,14 @@ void uvlo_() { tmc2130_set_current_r(E_AXIS, 20); #endif //TMC2130 - if (!sd_print_saved_in_ram) + if (!sd_print_saved_in_ram && !isPartialBackupAvailable) { saved_bed_temperature = target_temperature_bed; saved_extruder_temperature = target_temperature[active_extruder]; saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; saved_fan_speed = fanSpeed; + memcpy(saved_pos, current_position, sizeof(saved_pos)); + if (pos_invalid) saved_pos[X_AXIS] = X_COORD_INVALID; } // Stop all heaters before continuing @@ -84,9 +86,6 @@ void uvlo_() { // save the global state at planning time save_planner_global_state(); - - memcpy(saved_pos, current_position, sizeof(saved_pos)); - if (pos_invalid) saved_pos[X_AXIS] = X_COORD_INVALID; } // From this point on and up to the print recovery, Z should not move during X/Y travels and From 5ee7ba84e39e239bfed3dea0c59f0065fb8221f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Jul 2023 13:55:15 +0000 Subject: [PATCH 087/148] fix build --- Firmware/power_panic.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 1e2ebf8fd..8fe959467 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -9,6 +9,7 @@ #include "cmdqueue.h" #include "eeprom.h" #include "fastio.h" +#include "language.h" #include "lcd.h" #include "mesh_bed_leveling.h" #include "mesh_bed_calibration.h" From 005f9f0d242b389906973e38995d2e2ec51433e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Jul 2023 17:51:22 +0000 Subject: [PATCH 088/148] power panic: Fix an error in saved position planner_abort_hard() calls planner_reset_position() which will set current_position vector to the machine position. We want to save this position when there is no position already saved (i.e. when there is no partial back-up or a saved print in RAM) When a power outage comes, the printer is in the middle of a gcode move. And at the moment a gcode is executed by the planner, the planner will update current_position vector to the final destination vector. This means current_position vector is invalidated during a power outage and so we must check what the actual machine position is instead and save it. This was working correctly before, this commit only fixes the regression in my pull request. Change in memory: Flash: -2 bytes SRAM: 0 bytes --- Firmware/power_panic.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 8fe959467..b9f9dad47 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -73,14 +73,13 @@ void uvlo_() { saved_extruder_temperature = target_temperature[active_extruder]; saved_extruder_relative_mode = axis_relative_modes & E_AXIS_MASK; saved_fan_speed = fanSpeed; - memcpy(saved_pos, current_position, sizeof(saved_pos)); - if (pos_invalid) saved_pos[X_AXIS] = X_COORD_INVALID; } // Stop all heaters before continuing setTargetHotend(0); setTargetBed(0); + // Fetch data not included in a partial back-up if (!sd_print_saved_in_ram) { // Calculate the file position, from which to resume this print. save_print_file_state(); @@ -100,6 +99,14 @@ void uvlo_() { // are in action. planner_abort_hard(); + // When there is no position already saved, then we must grab whatever the current position is. + // This is most likely a position where the printer is in the middle of a G-code move + if (!sd_print_saved_in_ram && !isPartialBackupAvailable) + { + memcpy(saved_pos, current_position, sizeof(saved_pos)); + if (pos_invalid) saved_pos[X_AXIS] = X_COORD_INVALID; + } + // Store the print logical Z position, which we need to recover (a slight error here would be // recovered on the next Gcode instruction, while a physical location error would not) float logical_z = saved_pos[Z_AXIS]; From d5125c6b1e1f42c9d0031d941f3ebe2170d6c4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Jul 2023 12:59:36 +0000 Subject: [PATCH 089/148] power panic: refactor log output on recovery Use M114 to print coordinates for all axis. We save a lot of memory by reusing the M114 code Change in memory: Flash: -184 bytes SRAM: 0 bytes --- Firmware/power_panic.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index b9f9dad47..9dde1b42f 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -343,11 +343,13 @@ void recover_print(uint8_t automatic) { enquecommandf_P(G1_E_F2700, default_retraction); } - printf_P(_N("After waiting for temp:\nCurrent pos X_AXIS:%.3f\nCurrent pos Y_AXIS:%.3f\n"), current_position[X_AXIS], current_position[Y_AXIS]); + puts_P(_N("Temperature Restored\n")); + gcode_M114(); // Restart the print. restore_print_from_eeprom(mbl_was_active); - printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); + puts_P(_N("Done reading EEPROM\n")); + gcode_M114(); } bool recover_machine_state_after_power_panic() { From 4dc5d97ca90c413eff87f9ba368975cda03b8557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Jul 2023 13:36:20 +0000 Subject: [PATCH 090/148] power panic: remove unused EEPROM_UVLO_Z_MICROSTEPS It isn't very helpful IMO to have unused code during power panic it just complicates things. Change in memory: Flash: -32 bytes SRAM: 0 bytes --- Firmware/eeprom.h | 2 +- Firmware/power_panic.cpp | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 93a8b23da..aefc50628 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -430,7 +430,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP #define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) #define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) #define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) -#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) // uint16_t (could be removed) +#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) // uint16_t (unused) #define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) #define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E #define EEPROM_UVLO_SAVED_SEGMENT_IDX (EEPROM_UVLO_CURRENT_POSITION_E - 2) //uint16_t diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 9dde1b42f..4e0704103 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -163,10 +163,8 @@ void uvlo_() { eeprom_update_word((uint16_t*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL +2*mesh_point), *reinterpret_cast(&v)); } - // Write the _final_ Z position and motor microstep counter (unused). + // Write the _final_ Z position eeprom_update_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z, current_position[Z_AXIS]); - z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); - eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); // Store the current position. eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), saved_pos[X_AXIS]); @@ -267,10 +265,6 @@ static void uvlo_tiny() { // Update Z position eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); - - // Update the _final_ Z motor microstep counter (unused). - z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); - eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); } // Update the the "power outage" flag. From 2cd5ab2349dc9e89987e6c8fe68a84a2fa16c2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Jul 2023 14:43:08 +0000 Subject: [PATCH 091/148] power panic: add readable flags and optimise ISR(INT4_vect) Add more readable names for the EEPROM_UVLO values Change in memory: Flash: -14 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 10 +++++----- Firmware/power_panic.cpp | 22 +++++++++++++++------- Firmware/power_panic.h | 6 ++++++ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 8763b45dc..abb7b2002 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1457,7 +1457,7 @@ void setup() } eeprom_write_byte((uint8_t*)EEPROM_TEMP_CAL_ACTIVE, 0); } - eeprom_init_default_byte((uint8_t*)EEPROM_UVLO, 0); + eeprom_init_default_byte((uint8_t*)EEPROM_UVLO, NO_PENDING_RECOVERY); eeprom_init_default_byte((uint8_t*)EEPROM_SD_SORT, 0); //mbl_mode_init(); @@ -1578,7 +1578,7 @@ void setup() fw_crash_init(); #ifdef UVLO_SUPPORT - if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != NO_PENDING_RECOVERY) { //previous print was terminated by UVLO manage_heater(); // Update temperatures #ifdef DEBUG_UVLO_AUTOMATIC_RECOVER printf_P(_N("Power panic detected!\nCurrent bed temp:%d\nSaved bed temp:%d\n"), (int)degBed(), eeprom_read_byte((uint8_t*)EEPROM_UVLO_TARGET_BED)); @@ -1596,7 +1596,7 @@ void setup() if ( lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false) == LCD_LEFT_BUTTON_CHOICE) { recover_print(0); } else { - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); + eeprom_update_byte((uint8_t*)EEPROM_UVLO, NO_PENDING_RECOVERY); lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(MSG_WELCOME); @@ -4149,7 +4149,7 @@ void process_commands() printf_P(_N("E0:%d RPM\nPRN0:%d RPM\n"), 60*fan_speed[0], 60*fan_speed[1]); } else if (code_seen_P(PSTR("uvlo"))) { // PRUSA uvlo - eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); + eeprom_update_byte((uint8_t*)EEPROM_UVLO, NO_PENDING_RECOVERY); enquecommand_P(MSG_M24); } else if (code_seen_P(PSTR("MMURES"))) // PRUSA MMURES @@ -10660,7 +10660,7 @@ void restore_print_from_ram_and_continue(float e_move) // Cancel the state related to a currently saved print void cancel_saved_printing() { - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); + eeprom_update_byte((uint8_t*)EEPROM_UVLO, NO_PENDING_RECOVERY); saved_start_position[0] = SAVED_START_POSITION_UNSET; saved_printing_type = PRINTING_TYPE_NONE; saved_printing = false; diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 4e0704103..0c0837c6a 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -196,7 +196,7 @@ void uvlo_() { // Note: Recovering a print from EEPROM currently assumes the user // is printing from an SD card, this is why this EEPROM byte is only set // when SD card print is detected - if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); + if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, PENDING_RECOVERY); // Increment power failure counter eeprom_increment_byte((uint8_t*)EEPROM_POWER_COUNT); @@ -268,7 +268,7 @@ static void uvlo_tiny() { } // Update the the "power outage" flag. - eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); + eeprom_update_byte((uint8_t*)EEPROM_UVLO, PENDING_RECOVERY_RETRY); // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); @@ -290,7 +290,7 @@ void setup_uvlo_interrupt() { EIMSK |= (1 << 4); // check if power was lost before we armed the interrupt - if(!(PINE & (1 << 4)) && eeprom_read_byte((uint8_t*)EEPROM_UVLO)) + if(!(PINE & (1 << 4)) && eeprom_read_byte((uint8_t*)EEPROM_UVLO) != NO_PENDING_RECOVERY) { SERIAL_ECHOLNRPGM(MSG_INT4); uvlo_drain_reset(); @@ -300,9 +300,17 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNRPGM(MSG_INT4); - //fire normal uvlo only in case where EEPROM_UVLO is 0 or if IS_SD_PRINTING is 1. - if(printer_active() && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); - if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == NO_PENDING_RECOVERY) + { + if(printer_active()) { + uvlo_(); + } + } else { + // There is already a pending recovery waiting. Power outage in this scenario + // arrives before we can fully recover the print. In that case call a 'tiny' + // version of uvlo_() which doesn't overwrite the print state already waiting in EEPROM + uvlo_tiny(); + } } void recover_print(uint8_t automatic) { @@ -315,7 +323,7 @@ void recover_print(uint8_t automatic) { // Lift the print head 25mm, first to avoid collisions with oozed material with the print, // and second also so one may remove the excess priming material. - if(eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) + if(eeprom_read_byte((uint8_t*)EEPROM_UVLO) == PENDING_RECOVERY) { enquecommandf_P(PSTR("G1 Z%.3f F800"), current_position[Z_AXIS] + 25); } diff --git a/Firmware/power_panic.h b/Firmware/power_panic.h index cc9926fe6..6a70a2103 100644 --- a/Firmware/power_panic.h +++ b/Firmware/power_panic.h @@ -1,5 +1,11 @@ #pragma once +enum PowerPanicFlag : uint8_t { + NO_PENDING_RECOVERY = 0, + PENDING_RECOVERY = 1, // First power panic, print state is saved in EEPROM + PENDING_RECOVERY_RETRY = 2, // Power outage occured during recovery, print is still saved in EEPROM +}; + void uvlo_(); void recover_print(uint8_t automatic); void setup_uvlo_interrupt(); From 03e7ff1983913b66d9e044db69987e13380909bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 16 Jul 2023 14:43:57 +0000 Subject: [PATCH 092/148] power panic: optimise incrementing EEPROM statistics Change in memory: Flash: -26 bytes SRAM: 0 bytes --- Firmware/power_panic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 0c0837c6a..7797a8b66 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -271,8 +271,8 @@ static void uvlo_tiny() { eeprom_update_byte((uint8_t*)EEPROM_UVLO, PENDING_RECOVERY_RETRY); // Increment power failure counter - eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); + eeprom_increment_byte((uint8_t*)EEPROM_POWER_COUNT); + eeprom_increment_word((uint16_t*)EEPROM_POWER_COUNT_TOT); printf_P(_N("UVLO_TINY - end %d\n"), _millis() - time_start); uvlo_drain_reset(); From ffb6a2ae0cc41ed4c74853bc862848fa4cf0fbbc Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Wed, 19 Jul 2023 12:45:57 +0200 Subject: [PATCH 093/148] Generalize description of MMU MCU power errors as requested in Prusa-Error-Codes PR#97 There will be more separate sources of MCU power errors in the future and reporting each of them separately doesn't make much sense - especially when the only thing a user can do about it is to check the connectors. So based on this, the error title has changed a bit (we are not using the full text description in 8bit FW) Also, update perform the related changes in PO files + add (machine generated) translations. --- Firmware/mmu2/errors_list.h | 16 ++++++++-------- Firmware/mmu2_error_converter.cpp | 4 ++-- lang/po/Firmware.pot | 4 ++-- lang/po/Firmware_cs.po | 8 ++++---- lang/po/Firmware_de.po | 6 +++--- lang/po/Firmware_es.po | 6 +++--- lang/po/Firmware_fr.po | 6 +++--- lang/po/Firmware_hr.po | 6 +++--- lang/po/Firmware_hu.po | 6 +++--- lang/po/Firmware_it.po | 6 +++--- lang/po/Firmware_nl.po | 6 +++--- lang/po/Firmware_no.po | 6 +++--- lang/po/Firmware_pl.po | 6 +++--- lang/po/Firmware_ro.po | 6 +++--- lang/po/Firmware_sk.po | 6 +++--- lang/po/Firmware_sv.po | 6 +++--- 16 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index d39a26042..a012837a5 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -62,7 +62,7 @@ typedef enum : uint16_t { ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED = 315, ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED = 325, - ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC = 306, + ERR_ELECTRICAL_MMU_MCU_ERROR = 306, ERR_CONNECT = 400, ERR_CONNECT_MMU_NOT_RESPONDING = 401, @@ -119,7 +119,7 @@ static const constexpr uint16_t errorCodes[] PROGMEM = { ERR_ELECTRICAL_MMU_PULLEY_SELFTEST_FAILED, ERR_ELECTRICAL_MMU_SELECTOR_SELFTEST_FAILED, ERR_ELECTRICAL_MMU_IDLER_SELFTEST_FAILED, - ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC, + ERR_ELECTRICAL_MMU_MCU_ERROR, ERR_CONNECT_MMU_NOT_RESPONDING, ERR_CONNECT_COMMUNICATION_ERROR, ERR_SYSTEM_FILAMENT_ALREADY_LOADED, @@ -173,7 +173,7 @@ static const char MSG_TITLE_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTE //static const char MSG_TITLE_MMU_PULLEY_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); //static const char MSG_TITLE_MMU_SELECTOR_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); //static const char MSG_TITLE_MMU_IDLER_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU SELFTEST FAILED"); -static const char MSG_TITLE_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU UNDERPOWER"); ////MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +static const char MSG_TITLE_MMU_MCU_ERROR[] PROGMEM_I1 = ISTR("MMU MCU ERROR"); ////MSG_TITLE_MMU_MCU_ERROR c=20 static const char MSG_TITLE_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU NOT RESPONDING"); ////MSG_TITLE_MMU_NOT_RESPONDING c=20 static const char MSG_TITLE_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("COMMUNICATION ERROR"); ////MSG_TITLE_COMMUNICATION_ERROR c=20 static const char MSG_TITLE_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("FIL. ALREADY LOADED"); ////MSG_TITLE_FILAMENT_ALREADY_LOADED c=20 @@ -219,7 +219,7 @@ static const char * const errorTitles [] PROGMEM = { _R(MSG_TITLE_SELFTEST_FAILED), _R(MSG_TITLE_SELFTEST_FAILED), _R(MSG_TITLE_SELFTEST_FAILED), - _R(MSG_TITLE_MCU_UNDERVOLTAGE_VCC), + _R(MSG_TITLE_MMU_MCU_ERROR), _R(MSG_TITLE_MMU_NOT_RESPONDING), _R(MSG_TITLE_COMMUNICATION_ERROR), _R(MSG_TITLE_FILAMENT_ALREADY_LOADED), @@ -240,7 +240,7 @@ static const char MSG_DESC_FSENSOR_DIDNT_TRIGGER[] PROGMEM_I1 = ISTR("Filament s static const char MSG_DESC_FSENSOR_FILAMENT_STUCK[] PROGMEM_I1 = ISTR("Filament sensor didn't switch off while unloading filament. Ensure filament can move and the sensor works."); ////MSG_DESC_FSENSOR_FILAMENT_STUCK c=20 r=8 static const char MSG_DESC_PULLEY_CANNOT_MOVE[] PROGMEM_I1 = ISTR("Pulley motor stalled. Ensure the pulley can move and check the wiring."); ////MSG_DESC_PULLEY_CANNOT_MOVE c=20 r=8 static const char MSG_DESC_FSENSOR_TOO_EARLY[] PROGMEM_I1 = ISTR("Filament sensor triggered too early while loading to extruder. Check there isn't anything stuck in PTFE tube. Check that sensor reads properly."); ////MSG_DESC_FSENSOR_TOO_EARLY c=20 r=8 -static const char MSG_DESC_INSPECT_FINDA[] PROGMEM_I1 = ISTR("Selector can't move due to FINDA detecting a filament. Make sure no filament is in selector and FINDA works properly."); ////MSG_DESC_INSPECT_FINDA c=20 r=8 +static const char MSG_DESC_INSPECT_FINDA[] PROGMEM_I1 = ISTR("Selector can't move due to FINDA detecting a filament. Make sure no filament is in Selector and FINDA works properly."); ////MSG_DESC_INSPECT_FINDA c=20 r=8 static const char MSG_DESC_LOAD_TO_EXTRUDER_FAILED[] PROGMEM_I1 = ISTR("Loading to extruder failed. Inspect the filament tip shape. Refine the sensor calibration, if needed."); ////MSG_DESC_LOAD_TO_EXTRUDER_FAILED c=20 r=8 static const char MSG_DESC_SELECTOR_CANNOT_HOME[] PROGMEM_I1 = ISTR("The Selector cannot home properly. Check for anything blocking its movement."); ////MSG_DESC_SELECTOR_CANNOT_HOME c=20 r=8 static const char MSG_DESC_CANNOT_MOVE[] PROGMEM_I1 = ISTR("Can't move Selector or Idler."); /////MSG_DESC_CANNOT_MOVE c=20 r=4 @@ -269,7 +269,7 @@ static const char MSG_DESC_TMC[] PROGMEM_I1 = ISTR("More details online."); //// //static const char MSG_DESC_MMU_PULLEY_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU selftest failed on the Pulley TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_MMU_SELECTOR_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU selftest failed on the Selector TMC driver. Check the wiring and connectors. If the issue persists contact support."); //static const char MSG_DESC_MMU_IDLER_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("MMU selftest failed on the Idler TMC driver. Check the wiring and connectors. If the issue persists contact support."); -//static const char MSG_DESC_MCU_UNDERVOLTAGE_VCC[] PROGMEM_I1 = ISTR("MMU MCU detected a 5V undervoltage. There might be an issue with the electronics. Check the wiring and connectors"); ////MSG_DESC_MCU_UNDERVOLTAGE_VCC c=20 r=8 +//static const char MSG_DESC_MMU_MCU_ERROR[] PROGMEM_I1 = ISTR("MMU detected a power-related issue. Check the wiring and connectors. If the issue persists, contact support."); ////MSG_DESC_MMU_MCU_ERROR c=20 r=8 static const char MSG_DESC_MMU_NOT_RESPONDING[] PROGMEM_I1 = ISTR("MMU not responding. Check the wiring and connectors."); ////MSG_DESC_MMU_NOT_RESPONDING c=20 r=4 static const char MSG_DESC_COMMUNICATION_ERROR[] PROGMEM_I1 = ISTR("MMU not responding correctly. Check the wiring and connectors."); ////MSG_DESC_COMMUNICATION_ERROR c=20 r=4 static const char MSG_DESC_FILAMENT_ALREADY_LOADED[] PROGMEM_I1 = ISTR("Cannot perform the action, filament is already loaded. Unload it first."); ////MSG_DESC_FILAMENT_ALREADY_LOADED c=20 r=8 @@ -322,7 +322,7 @@ static const char * const errorDescs[] PROGMEM = { _R(MSG_DESC_TMC), // descMMU_PULLEY_SELFTEST_FAILED _R(MSG_DESC_TMC), // descMMU_SELECTOR_SELFTEST_FAILED _R(MSG_DESC_TMC), // descMMU_IDLER_SELFTEST_FAILED - _R(MSG_DESC_TMC), // descMSG_DESC_MCU_UNDERVOLTAGE_VCC + _R(MSG_DESC_TMC), // descMSG_DESC_MMU_MCU_ERROR _R(MSG_DESC_MMU_NOT_RESPONDING), _R(MSG_DESC_COMMUNICATION_ERROR), _R(MSG_DESC_FILAMENT_ALREADY_LOADED), @@ -405,7 +405,7 @@ static const uint8_t errorButtons[] PROGMEM = { Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_PULLEY_SELFTEST_FAILED Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_SELECTOR_SELFTEST_FAILED Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_IDLER_SELFTEST_FAILED - Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MCU_UNDERVOLTAGE_VCC + Btns(ButtonOperations::ResetMMU, ButtonOperations::NoOperation),//MMU_MCU_ERROR Btns(ButtonOperations::ResetMMU, ButtonOperations::DisableMMU),//MMU_NOT_RESPONDING Btns(ButtonOperations::ResetMMU, ButtonOperations::DisableMMU),//COMMUNICATION_ERROR diff --git a/Firmware/mmu2_error_converter.cpp b/Firmware/mmu2_error_converter.cpp index 510e38bd4..cfb940bfa 100644 --- a/Firmware/mmu2_error_converter.cpp +++ b/Firmware/mmu2_error_converter.cpp @@ -85,7 +85,7 @@ uint8_t PrusaErrorCodeIndex(uint16_t ec) { case (uint16_t)ErrorCode::FINDA_VS_EEPROM_DISREPANCY: return FindErrorIndex(ERR_SYSTEM_UNLOAD_MANUALLY); case (uint16_t)ErrorCode::MCU_UNDERVOLTAGE_VCC: - return FindErrorIndex(ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC); + return FindErrorIndex(ERR_ELECTRICAL_MMU_MCU_ERROR); } // Electrical issues which can be detected somehow. @@ -267,7 +267,7 @@ Buttons ButtonAvailable(uint16_t ec) { case ERR_SYSTEM_QUEUE_FULL: case ERR_SYSTEM_FW_RUNTIME_ERROR: - case ERR_ELECTRICAL_MCU_UNDERVOLTAGE_VCC: + case ERR_ELECTRICAL_MMU_MCU_ERROR: switch (buttonSelectedOperation) { case ButtonOperations::ResetMMU: // "Reset MMU" return ResetMMU; diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 43c227cac..cf7724a7a 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1088,9 +1088,9 @@ msgstr "" msgid "MMU Firmware internal error, please reset the MMU." msgstr "" -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" +msgid "MMU MCU ERROR" msgstr "" #. MSG_MMU_MODE c=8 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index d863065e6..9bc38f94e 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -1117,7 +1117,7 @@ msgstr "MMU opakovani: Obnova teploty..." #: ../../Firmware/mmu2/errors_list.h:172 ../../Firmware/mmu2/errors_list.h:219 #: ../../Firmware/mmu2/errors_list.h:220 ../../Firmware/mmu2/errors_list.h:221 msgid "MMU SELFTEST FAILED" -msgstr "MMU SELFTEST SELAHL" +msgstr "MMU SELFTEST SELHAL" #. MSG_MMU_FAILS c=15 #: ../../Firmware/messages.cpp:68 ../../Firmware/ultralcd.cpp:1118 @@ -2468,10 +2468,10 @@ msgstr "" "Načítání do extrudéru se nezdařilo. Zkontrolujte tvar špičky vlákna. V " "případě potřeby upřesněte kalibraci snímače." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU PODPĚTÍ VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU CHYBA" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 02ad3e91b..f8a27fe5e 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2496,10 +2496,10 @@ msgstr "" "Laden in den Extruder fehlgeschlagen. Überprüfe die Form der Filamentspitze." " Verfeiner die Sensorkalibrierung, falls erforderlich." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU-UNTERSPANN. VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU FEHLER" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 33284baac..bfac0e562 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2491,10 +2491,10 @@ msgstr "" "Error al cargar en la extrusora. Inspeccione la forma de la punta del " "filamento. Refine la calibración del sensor, si es necesario." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU BAJO VOLTAJE VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU ERROR" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index fa37ad171..f4e28cdc7 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2506,10 +2506,10 @@ msgstr "" "Le chargement dans l'extrudeuse a échoué. Inspectez la forme de la pointe du" " filament. Affiner l'étalonnage du capteur, si nécessaire." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU SOUS-TENSION VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU ERREUR" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 337eaf690..7d3da1d3b 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2485,10 +2485,10 @@ msgstr "" "Učitavanje u ekstruder nije uspjelo. Provjerite oblik vrha žarne niti. " "Poboljšajte kalibraciju senzora, ako je potrebno." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU PODNAPON VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU GRESKA" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 662c2456f..4522345c6 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2489,10 +2489,10 @@ msgstr "" "Az extruderbe való betöltés nem sikerült. Ellenőrizze az fil. hegyének " "alakját. Ha szükséges, finomítsd az érzékelő kalibrálását." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU VCC ALACSONY" +msgid "MMU MCU ERROR" +msgstr "MMU MCU HIBA" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 01e4632ab..93ad4c542 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2490,10 +2490,10 @@ msgstr "" "Caricamento nell' estrusore non riuscito. Ispezionare la forma della punta " "del fil. Affinare la calib. del sensore, se necessario." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "SOTTOTENSION MCU VCC" +msgid "MMU MCU ERROR" +msgstr "ERRORE MMU MCU" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 1b7315eec..61fca0075 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2494,10 +2494,10 @@ msgstr "" "Laden naar extruder is mislukt. Inspecteer de vorm van de filamenttip. " "Verfijn de sensorkalibratie, indien nodig." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU ONDERSPANN. VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU FOUT" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index b8f3c603c..6beb07a2d 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2467,10 +2467,10 @@ msgstr "" "Lasting til ekstruder mislyktes. Inspiser filamentspissens form. Avgrens " "sensorkalibreringen om nødvendig." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU UNDERSPENN. VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU FEIL" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 223459335..b451abfd0 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2486,10 +2486,10 @@ msgstr "" "Ładowanie do ekstrudera nie powiodło się. Sprawdź kształt końcówki " "filamentu. W razie potrzeby doprecyzuj kalibrację czujnika." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU POD NAPIĘCI. VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU BLAD" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 097362068..6771d51fe 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2489,10 +2489,10 @@ msgstr "" "Încărcarea în extruder nu a reușit. Inspectați forma vârfului filamentului. " "Rafinați calibrarea senzorului, dacă este necesar." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU SUBTENSIUNE VCC" +msgid "MMU MCU ERROR" +msgstr "MMU: EROARE MCU" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index d53a7db28..064807c42 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2473,10 +2473,10 @@ msgstr "" "Zavedenie do extrudéra zlyhalo. Skontrolujte tvar konca filamentu. V prípade" " potreby upravte kalibráciu snímača." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MMU MCU UNDERPOWER" +msgid "MMU MCU ERROR" +msgstr "MMU MCU CHYBA" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index d02ea802b..5b778c623 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2480,10 +2480,10 @@ msgstr "" "Det gick inte att ladda till extrudern. Inspektera filamentspetsens form. " "Förfina sensorkalibreringen vid behov." -#. MSG_TITLE_MCU_UNDERVOLTAGE_VCC c=20 +#. MSG_TITLE_MCU_ERROR c=20 #: ../../Firmware/mmu2/errors_list.h:176 ../../Firmware/mmu2/errors_list.h:222 -msgid "MMU MCU UNDERPOWER" -msgstr "MCU UNDERSPÄNN. VCC" +msgid "MMU MCU ERROR" +msgstr "MMU MCU FEL" #. MSG_MATERIAL_CHANGES c=18 #: ../../Firmware/messages.cpp:103 ../../Firmware/ultralcd.cpp:1095 From d67fc84b7355a88dba21198b658568b4cba37610 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Thu, 20 Jul 2023 11:00:03 +0200 Subject: [PATCH 094/148] Relink MSG_DESC_INSPECT_FINDA in PO files --- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 2 +- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index cf7724a7a..833ad211f 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1870,7 +1870,7 @@ msgstr "" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" #. MSG_SELFTEST_OK c=20 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 9bc38f94e..91144d00c 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2493,7 +2493,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selektor se nemůže pohybovat, protože FINDA detekuje vlákno. Ujistěte se, že" " ve voliči není žádné vlákno a FINDA funguje správně." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index f8a27fe5e..c16001083 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2521,7 +2521,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selektor kann sich nicht bewegen, da FINDA Fil. erkennt wird. Stelle sicher," " dass sich kein Fil. im Selektor befindet und FINDA ricchtig funktioniert." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index bfac0e562..9d75c9c75 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2516,7 +2516,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "El selector no se puede mover debido a que FINDA detecta un filamento. " "Asegúrese de que no haya fil. en el selector y que FINDA funcione " diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index f4e28cdc7..9f6ccdaa3 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2531,7 +2531,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Le sélecteur ne peut pas bouger car FINDA détecte un filament. Assurez-vous " "qu'aucun fil. n'est dans le sélecteur et que FINDA fonctionne correctement." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 7d3da1d3b..1a477438c 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2510,7 +2510,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selektor se ne može pomaknuti jer FINDA otkriva nit. Uvjerite se da niti " "jedna nit nije u selektoru i da FINDA radi ispravno." diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 4522345c6..92c6aad17 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2514,7 +2514,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "A szelektor nem tud mozogni, mert a FINDA filamentet észlelt. Győződj meg " "arról,hogy nincs fil. a szelektorban, és a FINDA megfelelően működik." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 93ad4c542..a452255a4 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2515,7 +2515,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Il selettore non può muoversi perché FINDA rileva un fil. Assicurati che " "nessun fil. sia nel selettore e che FINDA funzioni correttamente." diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 61fca0075..c8971d163 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2519,7 +2519,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selector kan niet bewegen omdat FINDA een filament detecteert. Zorg ervoor " "dat er geen fil. in de selector zit en dat FINDA naar behoren werkt." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 6beb07a2d..0456c5c7e 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2492,7 +2492,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Velgeren kan ikke bevege seg på grunn av at FINDA oppdager en filament. Sørg" " for at ingen fil. er i velgeren og at FINDA fungerer som den skal." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index b451abfd0..14d37ea60 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2511,7 +2511,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selektor nie może się poruszyć, ponieważ program FINDA wykrył żarnik. " "Upewnij się, że w selektorze nie ma filamentu i że FINDA działa prawidłowo." diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 6771d51fe..45eea76ef 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2514,7 +2514,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selectorul nu se poate mișca deoarece FINDA detectează un filament. " "Asigurați-vă că nu există filament în selector și că FINDA funcționează " diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 064807c42..7951e5567 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2498,7 +2498,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Selektor sa nemôže pohybovať, pretože FINDA zistila filament. Uistite sa, že" " v selektore nie je žiadny filament a FINDA funguje správne." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 5b778c623..cd206953b 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2505,7 +2505,7 @@ msgstr "ResetMMU" #: ../../Firmware/mmu2/errors_list.h:243 ../../Firmware/mmu2/errors_list.h:298 msgid "" "Selector can't move due to FINDA detecting a filament. Make sure no filament" -" is in selector and FINDA works properly." +" is in Selector and FINDA works properly." msgstr "" "Väljaren kan inte röra sig på grund av att FINDA detekterar en filament. Se " "till att inget glödtråd är i väljaren och att FINDA fungerar korrekt." From 43c823987ce8fa9c6a741cd64e87091c9eb1b721 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Thu, 13 Jul 2023 14:53:38 +0200 Subject: [PATCH 095/148] MMU version 3.0.0 PFW-1529 --- Firmware/mmu2/errors_list.h | 2 +- Firmware/mmu2_supported_version.h | 6 +++--- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 4 ++-- lang/po/Firmware_de.po | 4 ++-- lang/po/Firmware_es.po | 4 ++-- lang/po/Firmware_fr.po | 4 ++-- lang/po/Firmware_hr.po | 4 ++-- lang/po/Firmware_hu.po | 4 ++-- lang/po/Firmware_it.po | 4 ++-- lang/po/Firmware_nl.po | 4 ++-- lang/po/Firmware_no.po | 4 ++-- lang/po/Firmware_pl.po | 4 ++-- lang/po/Firmware_ro.po | 4 ++-- lang/po/Firmware_sk.po | 4 ++-- lang/po/Firmware_sv.po | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Firmware/mmu2/errors_list.h b/Firmware/mmu2/errors_list.h index a012837a5..1377191d2 100644 --- a/Firmware/mmu2/errors_list.h +++ b/Firmware/mmu2/errors_list.h @@ -281,7 +281,7 @@ static const char MSG_DESC_FILAMENT_EJECTED[] PROGMEM_I1 = ISTR("Remove the ejec static const char MSG_DESC_UNKNOWN_ERROR[] PROGMEM_I1 = ISTR("Unexpected error occurred."); ////MSG_DESC_UNKNOWN_ERROR c=20 r=8 // Read explanation in mmu2_protocol_logic.cpp -> supportedMmuFWVersion -static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("MMU FW version is incompatible with printer FW.Update to version 2.1.9."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 +static constexpr char MSG_DESC_FW_UPDATE_NEEDED[] PROGMEM_I1 = ISTR("MMU FW version is incompatible with printer FW.Update to version 3.0.0."); ////MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 static constexpr uint8_t szFWUN = sizeof(MSG_DESC_FW_UPDATE_NEEDED); // at least check the individual version characters in MSG_DESC_FW_UPDATE_NEEDED static_assert(MSG_DESC_FW_UPDATE_NEEDED[szFWUN - 7] == ('0' + mmuVersionMajor)); diff --git a/Firmware/mmu2_supported_version.h b/Firmware/mmu2_supported_version.h index 26683174b..5c06b6cd3 100644 --- a/Firmware/mmu2_supported_version.h +++ b/Firmware/mmu2_supported_version.h @@ -3,8 +3,8 @@ namespace MMU2 { -static constexpr uint8_t mmuVersionMajor = 2; -static constexpr uint8_t mmuVersionMinor = 1; -static constexpr uint8_t mmuVersionPatch = 9; +static constexpr uint8_t mmuVersionMajor = 3; +static constexpr uint8_t mmuVersionMinor = 0; +static constexpr uint8_t mmuVersionPatch = 0; } // namespace MMU2 diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 833ad211f..5d7243260 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1080,7 +1080,7 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" #. MSG_DESC_QUEUE_FULL c=20 r=8 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 91144d00c..9e6629887 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2501,10 +2501,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " -"2.1.9." +"3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index c16001083..9580a7ed6 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2529,8 +2529,8 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." -msgstr "MMU FW ist inkompatibel mit Drucker FW. Update auf Version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." +msgstr "MMU FW ist inkompatibel mit Drucker FW. Update auf Version 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 9d75c9c75..ebe25e949 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2525,10 +2525,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "La versión de firmware de la MMU es incompatible con el FW de la impresora. " -"Actualizar a la versión 2.1.9." +"Actualizar a la versión 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 9f6ccdaa3..a3c16dcbb 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2539,10 +2539,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " -"vers la version 2.1.9." +"vers la version 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index 1a477438c..dd5c271c5 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2518,10 +2518,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " -"2.1.9." +"3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 92c6aad17..d474e4a82 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2522,10 +2522,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissíts a " -"2.1.9-es verzióra." +"3.0.0-es verzióra." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index a452255a4..0c7a51b1b 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2523,10 +2523,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " -"stampante. Aggiornamento alla versione 2.1.9." +"stampante. Aggiornamento alla versione 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index c8971d163..c7354246c 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2527,10 +2527,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " -"printer. Update naar versie 2.1.9." +"printer. Update naar versie 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 0456c5c7e..91f5b349d 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2500,10 +2500,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " -"versjon 2.1.9." +"versjon 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 14d37ea60..45da80996 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2519,10 +2519,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " -"sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." +"sprzętowym drukarki. Zaktualizuj do wersji 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 45eea76ef..4baa82ad5 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2523,10 +2523,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " -"Actualizați la versiunea 2.1.9." +"Actualizați la versiunea 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 7951e5567..e4bdbf079 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2506,10 +2506,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " -"verziu 2.1.9." +"verziu 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index cd206953b..f2285257a 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2513,10 +2513,10 @@ msgstr "" #. MSG_DESC_FW_UPDATE_NEEDED c=20 r=8 #: ../../Firmware/mmu2/errors_list.h:284 ../../Firmware/mmu2/errors_list.h:331 msgid "" -"MMU FW version is incompatible with printer FW.Update to version 2.1.9." +"MMU FW version is incompatible with printer FW.Update to version 3.0.0." msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " -"version 2.1.9." +"version 3.0.0." #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5231 From d4733664a864af190a4eb43b7802c76e15d9c7ff Mon Sep 17 00:00:00 2001 From: Addio <59629419+AddioElectronics@users.noreply.github.com> Date: Fri, 21 Jul 2023 07:02:32 -0700 Subject: [PATCH 096/148] Fixed printer_smodel_check for MK3/S and possible older MMU machines (#4265) Fixed printer_smodel_check for non MMU machines Commit 136ef96 broke the compatibility check for MK3S without MMU. May have fixed bug for older MMU machines. Only comparing up to the length of the value from the g-code, would return equal on older MMU machines trying to run g-code sliced without the MMU. Unfortunately if that is a feature, it will cause the different printer warning. --- Firmware/util.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index fff8dd31d..2b0dc5676 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -407,16 +407,19 @@ return pStrBegin; } void printer_smodel_check(const char *pStrPos, const char *actualPrinterSModel) { -char* pResult; -size_t nLength; + char* pResult; + size_t nLength; + size_t aLength; -pResult=code_string(pStrPos,&nLength); + pResult=code_string(pStrPos,&nLength); + if(pResult != NULL) { + aLength=strlen_P(actualPrinterSModel); + if(aLength > nLength) nLength = aLength; -if(pResult != NULL) { - // Only compare first 6 chars on MK3|MK3S - if (strncmp_P(pResult, PSTR("MK3"), 3) == 0) nLength = 6; - if (strncmp_P(pResult, actualPrinterSModel, nLength) == 0) return; -} + // Only compare first 6 chars on MK3|MK3S if string longer than 4 characters + if (nLength > 4 && strncmp_P(pResult, PSTR("MK3"), 3) == 0) nLength = 6; + if (strncmp_P(pResult, actualPrinterSModel, nLength) == 0) return; + } render_M862_warnings( _T(MSG_GCODE_DIFF_PRINTER_CONTINUE) From 57d780ccf9697ebcd621887ddc6eff66387b7394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 23 Jul 2023 11:58:25 +0000 Subject: [PATCH 097/148] PFW-1519 Hide Preload to MMU menu item if filament is detected This is by far the simplest solution to prevent the user from sending a Load command to the MMU when the FINDA or Filament sensor is detecting a filament. This may even happen if the sensors are poorly positioned. Either way a Load in this scenario will make the MMU seem to hang as the state machine will reject the command. We could add a full screen message to let the use know but it would require some memory resources. For now, just hide the menu item. Change in memory: Flash: +16 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c61c1c7a0..2bb1fb40b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5224,7 +5224,11 @@ static void lcd_main_menu() if ( ! ( printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { if (MMU2::mmu2.Enabled()) { - MENU_ITEM_SUBMENU_P(_T(MSG_PRELOAD_TO_MMU), mmu_preload_filament_menu); + if(!MMU2::mmu2.FindaDetectsFilament() && !fsensor.getFilamentPresent()) { + // The MMU 'Load filament' state machine will reject the command if any + // filament sensor is reporting a detected filament + MENU_ITEM_SUBMENU_P(_T(MSG_PRELOAD_TO_MMU), mmu_preload_filament_menu); + } MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), lcd_mmuLoadFilament);////MSG_LOAD_TO_NOZZLE c=18 MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), lcd_mmuUnloadFilament); MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FROM_MMU), lcd_mmuEjectFilament); From 1fea4a7335b030b9ad15b469ac81094d6255db74 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 22 Jul 2023 12:32:01 +0200 Subject: [PATCH 098/148] catch2: Fix build with gcc13 Cherrypick of catch2 commit 52066dbc2a53f4c3ab2a418d03f93200a8245451 to fix the build with gcc 13 without a full update. --- lib/Catch2/src/catch2/catch_test_case_info.hpp | 1 + lib/Catch2/src/catch2/internal/catch_string_manip.hpp | 1 + lib/Catch2/src/catch2/internal/catch_xmlwriter.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/Catch2/src/catch2/catch_test_case_info.hpp b/lib/Catch2/src/catch2/catch_test_case_info.hpp index 6cfc2aaf9..a32399a36 100644 --- a/lib/Catch2/src/catch2/catch_test_case_info.hpp +++ b/lib/Catch2/src/catch2/catch_test_case_info.hpp @@ -15,6 +15,7 @@ #include +#include #include #include diff --git a/lib/Catch2/src/catch2/internal/catch_string_manip.hpp b/lib/Catch2/src/catch2/internal/catch_string_manip.hpp index dc58a3360..e80d76a6f 100644 --- a/lib/Catch2/src/catch2/internal/catch_string_manip.hpp +++ b/lib/Catch2/src/catch2/internal/catch_string_manip.hpp @@ -10,6 +10,7 @@ #include +#include #include #include #include diff --git a/lib/Catch2/src/catch2/internal/catch_xmlwriter.cpp b/lib/Catch2/src/catch2/internal/catch_xmlwriter.cpp index 93758cba7..85e44aa96 100644 --- a/lib/Catch2/src/catch2/internal/catch_xmlwriter.cpp +++ b/lib/Catch2/src/catch2/internal/catch_xmlwriter.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include From 5cfdceb18442187289f2d817b954ea7e93147abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 3 May 2023 23:45:28 +0000 Subject: [PATCH 099/148] Remove redundant lcd_draw_update assignment When scrolling through menu items, the rotation event on the knob takes care of updating the LCD by setting lcd_draw_update. The menu code doesn't need to do it as well. Change in memory: Flash: -6 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 3b61379cd..67a9ee9dc 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -90,7 +90,6 @@ void menu_end(void) if (((uint8_t)lcd_encoder) >= menu_top + LCD_HEIGHT) { menu_top = lcd_encoder - LCD_HEIGHT + 1; - lcd_draw_update = 1; menu_line = menu_top - 1; menu_row = -1; } From 6aff3c761bce52648acb079bbcebd88ed0807f1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 11 Jun 2023 16:57:06 +0000 Subject: [PATCH 100/148] XYZCal: reduce code size in go_manhattan The variable always takes a value of subtraction between two int16_t values. It will also fit into int16_t Change in memory: Flash: -50 bytes: SRAM: 0 bytes --- Firmware/xyzcal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/xyzcal.cpp b/Firmware/xyzcal.cpp index 380065519..96130d2c9 100644 --- a/Firmware/xyzcal.cpp +++ b/Firmware/xyzcal.cpp @@ -535,7 +535,7 @@ void go_start_stop(uint8_t axes, uint8_t dir, int16_t acc, uint16_t min_delay_us /// 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; + int16_t length; // DBG(_n("x %d -> %d, "), x, _X); length = x - _X; From 06100e366ce0ef1d974439611cbf74565d47af7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 5 May 2023 23:11:30 +0000 Subject: [PATCH 101/148] optimisation: use union in tmc2130_setup_chopper An idea from the MMU FW Change in memory: Flash: -278 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 98 +++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index a83ca1c0a..a1b8d535a 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -116,7 +116,7 @@ uint16_t tmc2130_rd_TSTEP(uint8_t axis); uint16_t tmc2130_rd_MSCNT(uint8_t axis); uint32_t tmc2130_rd_MSCURACT(uint8_t axis); -void tmc2130_wr_CHOPCONF(uint8_t axis, uint8_t toff = 3, uint8_t hstrt = 4, uint8_t hend = 1, uint8_t fd3 = 0, uint8_t disfdcc = 0, uint8_t rndtf = 0, uint8_t chm = 0, uint8_t tbl = 2, uint8_t vsense = 0, uint8_t vhighfs = 0, uint8_t vhighchm = 0, uint8_t sync = 0, uint8_t mres = 0b0100, uint8_t intpol = 1, uint8_t dedge = 0, uint8_t diss2g = 0); +void tmc2130_wr_CHOPCONF(uint8_t axis, uint32_t conf); void tmc2130_wr_PWMCONF(uint8_t axis, uint8_t pwm_ampl, uint8_t pwm_grad, uint8_t pwm_freq, uint8_t pwm_auto, uint8_t pwm_symm, uint8_t freewheel); void tmc2130_wr_TPWMTHRS(uint8_t axis, uint32_t val32); void tmc2130_wr_THIGH(uint8_t axis, uint32_t val32); @@ -378,54 +378,85 @@ 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 + union ChopConfU { + struct __attribute__((packed)) S { + uint32_t toff : 4; + uint32_t hstrt : 3; + uint32_t hend : 4; + uint32_t fd : 1; + uint32_t disfdcc : 1; + uint32_t rndtf : 1; + uint32_t chm : 1; + uint32_t tbl : 2; + uint32_t vsense : 1; + uint32_t vhighfs : 1; + uint32_t vhighchm : 1; + uint32_t sync : 4; + uint32_t mres : 4; + uint32_t intpol : 1; + uint32_t dedge : 1; + uint32_t diss2g : 1; + uint32_t reserved : 1; + } s; + uint32_t dw; + } chopconf; + static_assert(sizeof(ChopConfU::S) == 4); + static_assert(sizeof(ChopConfU) == 4); + + chopconf.dw = 0; // Zero initialise + + chopconf.s.intpol = (mres != 0); // intpol to 256 only if microsteps aren't 256 #ifdef TMC2130_DEDGE_STEPPING - uint8_t dedge = 1; + chopconf.s.dedge = 1; #else - uint8_t dedge = 0; + chopconf.s.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 - uint8_t fd3 = 0; - uint8_t rndtf = 0; //random off time - uint8_t chm = 0; //spreadCycle - uint8_t tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 + chopconf.s.toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) + chopconf.s.hstrt = tmc2130_chopper_config[axis].hstr; // initial 4, modified to 5 + chopconf.s.hend = tmc2130_chopper_config[axis].hend; // original value = 1 + chopconf.s.fd = 0; + chopconf.s.disfdcc = 0; + chopconf.s.rndtf = 0; //random off time + chopconf.s.chm = 0; //spreadCycle + chopconf.s.tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 + chopconf.s.vsense = 0; + chopconf.s.vhighfs = 0; + chopconf.s.vhighchm = 0; + chopconf.s.sync = 0; + chopconf.s.mres = mres; if (axis == E_AXIS) { #if defined(TMC2130_INTPOL_E) && (TMC2130_INTPOL_E == 0) - intpol = 0; + chopconf.s.intpol = 0; #endif #ifdef TMC2130_CNSTOFF_E - // fd = 0 (slow decay only) - hstrt = 0; //fd0..2 - fd3 = 0; //fd3 - hend = 0; //sine wave offset - chm = 1; // constant off time mod + chopconf.s.hstrt = 0; // fd0..2 + chopconf.s.fd = 0; // fd3 + chopconf.s.hend = 0; // sine wave offset + chopconf.s.chm = 0; // constant off time mod #endif //TMC2130_CNSTOFF_E -// 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; + chopconf.s.intpol = 0; } #endif #if defined(TMC2130_INTPOL_Z) && (TMC2130_INTPOL_Z == 0) else if (axis == Z_AXIS) { - intpol = 0; + chopconf.s.intpol = 0; } #endif // DBG(_n("tmc2130_setup_chopper(axis=%d, mres=%d, curh=%d, curr=%d\n"), axis, mres, current_h, current_r); // DBG(_n(" toff=%d, hstr=%d, hend=%d, tbl=%d\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, dedge, 0); + chopconf.s.vsense = 1; + tmc2130_wr_CHOPCONF(axis, chopconf.dw); 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, dedge, 0); + tmc2130_wr_CHOPCONF(axis, chopconf.dw); tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | (((current_r >> 1) & 0x1f) << 8) | ((current_h >> 1) & 0x1f)); } } @@ -521,26 +552,9 @@ void tmc2130_wr_MSLUT(uint8_t axis, uint8_t i, uint32_t val) //printf_P(PSTR("MSLUT[%d]=%08lx\n"), i, val); } -void tmc2130_wr_CHOPCONF(uint8_t axis, uint8_t toff, uint8_t hstrt, uint8_t hend, uint8_t fd3, uint8_t disfdcc, uint8_t rndtf, uint8_t chm, uint8_t tbl, uint8_t vsense, uint8_t vhighfs, uint8_t vhighchm, uint8_t sync, uint8_t mres, uint8_t intpol, uint8_t dedge, uint8_t diss2g) +void tmc2130_wr_CHOPCONF(uint8_t axis, uint32_t conf) { - uint32_t val = 0; - val |= (uint32_t)(toff & 15); - val |= (uint32_t)(hstrt & 7) << 4; - val |= (uint32_t)(hend & 15) << 7; - val |= (uint32_t)(fd3 & 1) << 11; - val |= (uint32_t)(disfdcc & 1) << 12; - val |= (uint32_t)(rndtf & 1) << 13; - val |= (uint32_t)(chm & 1) << 14; - val |= (uint32_t)(tbl & 3) << 15; - val |= (uint32_t)(vsense & 1) << 17; - val |= (uint32_t)(vhighfs & 1) << 18; - val |= (uint32_t)(vhighchm & 1) << 19; - val |= (uint32_t)(sync & 15) << 20; - val |= (uint32_t)(mres & 15) << 24; - val |= (uint32_t)(intpol & 1) << 28; - val |= (uint32_t)(dedge & 1) << 29; - val |= (uint32_t)(diss2g & 1) << 30; - tmc2130_wr(axis, TMC2130_REG_CHOPCONF, val); + tmc2130_wr(axis, TMC2130_REG_CHOPCONF, conf); } //void tmc2130_wr_PWMCONF(uint8_t axis, uint8_t PWMautoScale, uint8_t PWMfreq, uint8_t PWMgrad, uint8_t PWMampl) From ae1a7898dc8c7a3847da40d88129420c4faf9e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 7 May 2023 14:34:34 +0000 Subject: [PATCH 102/148] optimisation: use union in for TMC2130 PWMCONF Simplify writing the value to PWMCONF by gathering all the bits into one dword. Change in memory: Flash: -128 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 120 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 52 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index a1b8d535a..2c7d11487 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -24,19 +24,48 @@ uint8_t tmc2130_current_r[4] = TMC2130_CURRENTS_R; //running currents for homing static uint8_t tmc2130_current_r_home[4] = TMC2130_CURRENTS_R_HOME; +union PWMConfU { + struct __attribute__((packed)) S { + uint32_t pwm_ampl : 8; // User defined amplitude (offset) + uint32_t pwm_grad : 8; // User defined amplitude (gradient) or regulation loop gradient + uint32_t pwm_freq0 : 1; // PWM frequency selection + uint32_t pwm_freq1 : 1; + uint32_t pwm_autoscale : 1; // PWM automatic amplitude scaling + uint32_t pwm_symmetric : 1; // Currently always zero + uint32_t freewheel0 : 1; // Currently always zero + uint32_t freewheel1 : 1; // Currently always zero + uint32_t reserved : 10; // Set to zero + } s; + uint32_t dw; + constexpr PWMConfU(uint32_t val) + : dw(val) {} +}; +static_assert(sizeof(PWMConfU::S) == 4); +static_assert(sizeof(PWMConfU) == 4); -//pwm_ampl -static uint8_t tmc2130_pwm_ampl[4] = {TMC2130_PWM_AMPL_X, TMC2130_PWM_AMPL_Y, TMC2130_PWM_AMPL_Z, TMC2130_PWM_AMPL_E}; -//pwm_grad -static uint8_t tmc2130_pwm_grad[4] = {TMC2130_PWM_GRAD_X, TMC2130_PWM_GRAD_Y, TMC2130_PWM_GRAD_Z, TMC2130_PWM_GRAD_E}; -//pwm_auto -static uint8_t tmc2130_pwm_auto[4] = {TMC2130_PWM_AUTO_X, TMC2130_PWM_AUTO_Y, TMC2130_PWM_AUTO_Z, TMC2130_PWM_AUTO_E}; -//pwm_freq -static uint8_t tmc2130_pwm_freq[4] = {TMC2130_PWM_FREQ_X, TMC2130_PWM_FREQ_Y, TMC2130_PWM_FREQ_Z, TMC2130_PWM_FREQ_E}; +/// Helper function to set bit shifts in one line +constexpr uint32_t PWMCONF_REG(uint32_t PWM_AMPL, uint32_t PWM_GRAD, uint32_t PWM_FREQ, uint32_t PWM_AUTO) +{ + return uint32_t((PWM_AMPL << 0U) | (PWM_GRAD<< 8U) | (PWM_FREQ << 16U) | (PWM_AUTO << 18U)); +} + +static constexpr uint32_t PWM_AMPL[NUM_AXIS] = {TMC2130_PWM_AMPL_X, TMC2130_PWM_AMPL_Y, TMC2130_PWM_AMPL_Z, TMC2130_PWM_AMPL_E}; +static constexpr uint32_t PWM_GRAD[NUM_AXIS] = {TMC2130_PWM_GRAD_X, TMC2130_PWM_GRAD_Y, TMC2130_PWM_GRAD_Z, TMC2130_PWM_GRAD_E}; +static constexpr uint32_t PWM_FREQ[NUM_AXIS] = {TMC2130_PWM_FREQ_X, TMC2130_PWM_FREQ_Y, TMC2130_PWM_FREQ_Z, TMC2130_PWM_FREQ_E}; +static constexpr uint32_t PWM_AUTO[NUM_AXIS] = {TMC2130_PWM_AUTO_X, TMC2130_PWM_AUTO_Y, TMC2130_PWM_AUTO_Z, TMC2130_PWM_AUTO_E}; + +static PWMConfU pwmconf[NUM_AXIS] = { + PWMConfU(PWMCONF_REG(PWM_AMPL[X_AXIS], PWM_GRAD[X_AXIS], PWM_FREQ[X_AXIS], PWM_AUTO[X_AXIS])), + PWMConfU(PWMCONF_REG(PWM_AMPL[Y_AXIS], PWM_GRAD[Y_AXIS], PWM_FREQ[Y_AXIS], PWM_AUTO[Y_AXIS])), + PWMConfU(PWMCONF_REG(PWM_AMPL[Z_AXIS], PWM_GRAD[Z_AXIS], PWM_FREQ[Z_AXIS], PWM_AUTO[Z_AXIS])), + PWMConfU(PWMCONF_REG(PWM_AMPL[E_AXIS], PWM_GRAD[E_AXIS], PWM_FREQ[E_AXIS], PWM_AUTO[E_AXIS])) +}; + +// E-axis PWMCONF setting when using E-cool mode. Can be disabled/enabled at run time. +static constexpr PWMConfU pwmconf_Ecool = PWMConfU(PWMCONF_REG(TMC2130_PWM_AMPL_Ecool, TMC2130_PWM_GRAD_Ecool, PWM_FREQ[E_AXIS], TMC2130_PWM_AUTO_Ecool)); uint8_t tmc2130_mres[4] = {0, 0, 0, 0}; //will be filed at begin of init - uint8_t tmc2130_sg_thr[4] = {TMC2130_SG_THRS_X, TMC2130_SG_THRS_Y, TMC2130_SG_THRS_Z, TMC2130_SG_THRS_E}; static uint8_t tmc2130_sg_thr_home[4] = TMC2130_SG_THRS_HOME; @@ -117,7 +146,7 @@ uint16_t tmc2130_rd_MSCNT(uint8_t axis); uint32_t tmc2130_rd_MSCURACT(uint8_t axis); void tmc2130_wr_CHOPCONF(uint8_t axis, uint32_t conf); -void tmc2130_wr_PWMCONF(uint8_t axis, uint8_t pwm_ampl, uint8_t pwm_grad, uint8_t pwm_freq, uint8_t pwm_auto, uint8_t pwm_symm, uint8_t freewheel); +void tmc2130_wr_PWMCONF(uint8_t axis, uint32_t conf); void tmc2130_wr_TPWMTHRS(uint8_t axis, uint32_t val32); void tmc2130_wr_THIGH(uint8_t axis, uint32_t val32); @@ -168,7 +197,7 @@ void tmc2130_init(TMCInitParams params) tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, (tmc2130_mode == TMC2130_MODE_SILENT)?0:__tcoolthrs(axis)); tmc2130_wr(axis, TMC2130_REG_GCONF, (tmc2130_mode == TMC2130_MODE_SILENT)?TMC2130_GCONF_SILENT:TMC2130_GCONF_SGSENS); - tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0); + tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); //tmc2130_wr_THIGH(axis, TMC2130_THIGH); } @@ -182,33 +211,32 @@ void tmc2130_init(TMCInitParams params) tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, (tmc2130_mode == TMC2130_MODE_SILENT)?0:__tcoolthrs(axis)); tmc2130_wr(axis, TMC2130_REG_GCONF, (tmc2130_mode == TMC2130_MODE_SILENT)?TMC2130_GCONF_SILENT:TMC2130_GCONF_DYNAMIC_SGSENS); - tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0); + tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); tmc2130_wr_TPWMTHRS(axis, (tmc2130_mode == TMC2130_MODE_SILENT)?0:0xFFFF0); #endif //TMC2130_STEALTH_Z } - for (uint_least8_t axis = 3; axis < 4; axis++) // E axis - { - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); - tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); + + // E axis + tmc2130_setup_chopper(E_AXIS, tmc2130_mres[E_AXIS], tmc2130_current_h[E_AXIS], tmc2130_current_r[E_AXIS]); + tmc2130_wr(E_AXIS, TMC2130_REG_TPOWERDOWN, 0x00000000); #ifndef TMC2130_STEALTH_E - if( ! params.enableECool ){ - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); - } else { - tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16)); - tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, 0); - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); - tmc2130_wr_PWMCONF(axis, TMC2130_PWM_AMPL_Ecool, TMC2130_PWM_GRAD_Ecool, tmc2130_pwm_freq[axis], TMC2130_PWM_AUTO_Ecool, 0, 0); - tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS_E); - SERIAL_ECHOLNRPGM(eMotorCurrentScalingEnabled); - } + if( ! params.enableECool ){ + tmc2130_wr(E_AXIS, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); + } else { + tmc2130_wr(E_AXIS, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[E_AXIS]) << 16)); + tmc2130_wr(E_AXIS, TMC2130_REG_TCOOLTHRS, 0); + tmc2130_wr(E_AXIS, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); + tmc2130_wr_PWMCONF(E_AXIS, pwmconf_Ecool.dw); + tmc2130_wr_TPWMTHRS(E_AXIS, TMC2130_TPWMTHRS_E); + SERIAL_ECHOLNRPGM(eMotorCurrentScalingEnabled); + } #else //TMC2130_STEALTH_E - tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16)); - tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, 0); - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); - tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0); - tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); + tmc2130_wr(E_AXIS, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[E_AXIS]) << 16)); + tmc2130_wr(E_AXIS, TMC2130_REG_TCOOLTHRS, 0); + tmc2130_wr(E_AXIS, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); + tmc2130_wr_PWMCONF(E_AXIS, pwmconf[E_AXIS].dw); + tmc2130_wr_TPWMTHRS(E_AXIS, TMC2130_TPWMTHRS); #endif //TMC2130_STEALTH_E - } #ifdef TMC2130_LINEARITY_CORRECTION #ifdef TMC2130_LINEARITY_CORRECTION_XYZ @@ -304,7 +332,6 @@ void tmc2130_home_exit() { tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); // Configuration back to stealthChop tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, 0); -// tmc2130_wr_PWMCONF(i, tmc2130_pwm_ampl[i], tmc2130_pwm_grad[i], tmc2130_pwm_freq[i], tmc2130_pwm_auto[i], 0, 0); } else { @@ -487,18 +514,16 @@ void tmc2130_print_currents() void tmc2130_set_pwm_ampl(uint8_t axis, uint8_t pwm_ampl) { -// DBG(_n("tmc2130_set_pwm_ampl(axis=%d, pwm_ampl=%d\n"), axis, pwm_ampl); - tmc2130_pwm_ampl[axis] = pwm_ampl; - if (((axis == 0) || (axis == 1)) && (tmc2130_mode == TMC2130_MODE_SILENT)) - tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0); + pwmconf[axis].s.pwm_ampl = pwm_ampl; + if (((axis == X_AXIS) || (axis == Y_AXIS)) && (tmc2130_mode == TMC2130_MODE_SILENT)) + tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); } void tmc2130_set_pwm_grad(uint8_t axis, uint8_t pwm_grad) { -// DBG(_n("tmc2130_set_pwm_grad(axis=%d, pwm_grad=%d\n"), axis, pwm_grad); - tmc2130_pwm_grad[axis] = pwm_grad; - if (((axis == 0) || (axis == 1)) && (tmc2130_mode == TMC2130_MODE_SILENT)) - tmc2130_wr_PWMCONF(axis, tmc2130_pwm_ampl[axis], tmc2130_pwm_grad[axis], tmc2130_pwm_freq[axis], tmc2130_pwm_auto[axis], 0, 0); + pwmconf[axis].s.pwm_grad = pwm_grad; + if (((axis == X_AXIS) || (axis == Y_AXIS)) && (tmc2130_mode == TMC2130_MODE_SILENT)) + tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); } uint16_t tmc2130_rd_TSTEP(uint8_t axis) @@ -557,18 +582,9 @@ void tmc2130_wr_CHOPCONF(uint8_t axis, uint32_t conf) tmc2130_wr(axis, TMC2130_REG_CHOPCONF, conf); } -//void tmc2130_wr_PWMCONF(uint8_t axis, uint8_t PWMautoScale, uint8_t PWMfreq, uint8_t PWMgrad, uint8_t PWMampl) -void tmc2130_wr_PWMCONF(uint8_t axis, uint8_t pwm_ampl, uint8_t pwm_grad, uint8_t pwm_freq, uint8_t pwm_auto, uint8_t pwm_symm, uint8_t freewheel) +void tmc2130_wr_PWMCONF(uint8_t axis, uint32_t conf) { - uint32_t val = 0; - val |= (uint32_t)(pwm_ampl & 255); - val |= (uint32_t)(pwm_grad & 255) << 8; - val |= (uint32_t)(pwm_freq & 3) << 16; - val |= (uint32_t)(pwm_auto & 1) << 18; - val |= (uint32_t)(pwm_symm & 1) << 19; - val |= (uint32_t)(freewheel & 3) << 20; - tmc2130_wr(axis, TMC2130_REG_PWMCONF, val); -// tmc2130_wr(axis, TMC2130_REG_PWMCONF, ((uint32_t)(PWMautoScale+PWMfreq) << 16) | ((uint32_t)PWMgrad << 8) | PWMampl); // TMC LJ -> For better readability changed to 0x00 and added PWMautoScale and PWMfreq + tmc2130_wr(axis, TMC2130_REG_PWMCONF, conf); } void tmc2130_wr_TPWMTHRS(uint8_t axis, uint32_t val32) From 60f1c2095fba37d77ba454d9754ca31cfdb305de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 7 May 2023 17:48:47 +0000 Subject: [PATCH 103/148] optimise tmc2130_setup_chopper further Reduce code duplication Change in memory: Flash: -50 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 2c7d11487..0a08feac1 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -473,19 +473,16 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ chopconf.s.intpol = 0; } #endif -// DBG(_n("tmc2130_setup_chopper(axis=%d, mres=%d, curh=%d, curr=%d\n"), axis, mres, current_h, current_r); -// DBG(_n(" toff=%d, hstr=%d, hend=%d, tbl=%d\n"), toff, hstrt, hend, tbl); if (current_r <= 31) { chopconf.s.vsense = 1; - tmc2130_wr_CHOPCONF(axis, chopconf.dw); - tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | ((current_r & 0x1f) << 8) | (current_h & 0x1f)); - } - else - { - tmc2130_wr_CHOPCONF(axis, chopconf.dw); - tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | (((current_r >> 1) & 0x1f) << 8) | ((current_h >> 1) & 0x1f)); + } else { + current_r >>= 1; + current_h >>= 1; } + + tmc2130_wr_CHOPCONF(axis, chopconf.dw); + tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | ((current_r & 0x1f) << 8) | (current_h & 0x1f)); } void tmc2130_set_current_h(uint8_t axis, uint8_t current) From 3842a5c98c39ed2320bf1d94a1b5d2484c6e2d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 11 Jun 2023 11:10:14 +0000 Subject: [PATCH 104/148] optimisation: correctly reset registers in tmc2130_home_exit Previously Z-axis would not be reset to TMC2130_GCONF_DYNAMIC_SGSENS in tmc2130_home_exit() when TMC2130_STEALTH_Z is defined Pulled configuration code into one common function this ensures the registers are set correctly like in tmc2130_init() Change in memory: Flash: -206 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 73 ++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 0a08feac1..a6d290f9e 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -169,6 +169,31 @@ uint16_t __tcoolthrs(uint8_t axis) } return 0; } + +static void tmc2130_XYZ_reg_init(uint8_t axis) +{ + const bool isStealth = (tmc2130_mode == TMC2130_MODE_SILENT); + if (axis == Z_AXIS) { +#ifdef TMC2130_STEALTH_Z + tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); + tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, isStealth ? 0 : __tcoolthrs(axis)); + tmc2130_wr(axis, TMC2130_REG_GCONF, isStealth ? TMC2130_GCONF_SILENT : TMC2130_GCONF_DYNAMIC_SGSENS); + tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); + tmc2130_wr_TPWMTHRS(axis, isStealth ? 0 : 0xFFFF0); +#else // TMC2130_STEALTH_Z + tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); +#endif // TMC2130_STEALTH_Z + } else { // X Y + tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); + tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, isStealth ? 0 : __tcoolthrs(axis)); + tmc2130_wr(axis, TMC2130_REG_GCONF, isStealth ? TMC2130_GCONF_SILENT : TMC2130_GCONF_SGSENS); + tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); + tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); + } + tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); +} + void tmc2130_init(TMCInitParams params) { // DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL")); @@ -190,30 +215,9 @@ void tmc2130_init(TMCInitParams params) WRITE(Z_TMC2130_DIAG,HIGH); WRITE(E0_TMC2130_DIAG,HIGH); - for (uint_least8_t axis = 0; axis < 2; axis++) // X Y axes + for (uint_least8_t axis = 0; axis < E_AXIS; axis++) // X Y Z axes { - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); - tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); - tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); - tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, (tmc2130_mode == TMC2130_MODE_SILENT)?0:__tcoolthrs(axis)); - tmc2130_wr(axis, TMC2130_REG_GCONF, (tmc2130_mode == TMC2130_MODE_SILENT)?TMC2130_GCONF_SILENT:TMC2130_GCONF_SGSENS); - tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); - tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); - //tmc2130_wr_THIGH(axis, TMC2130_THIGH); - } - for (uint_least8_t axis = 2; axis < 3; axis++) // Z axis - { - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); - tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); -#ifndef TMC2130_STEALTH_Z - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); -#else //TMC2130_STEALTH_Z - tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); - tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, (tmc2130_mode == TMC2130_MODE_SILENT)?0:__tcoolthrs(axis)); - tmc2130_wr(axis, TMC2130_REG_GCONF, (tmc2130_mode == TMC2130_MODE_SILENT)?TMC2130_GCONF_SILENT:TMC2130_GCONF_DYNAMIC_SGSENS); - tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); - tmc2130_wr_TPWMTHRS(axis, (tmc2130_mode == TMC2130_MODE_SILENT)?0:0xFFFF0); -#endif //TMC2130_STEALTH_Z + tmc2130_XYZ_reg_init(axis); } // E axis @@ -316,31 +320,14 @@ void tmc2130_home_exit() { printf_P(PSTR("tmc2130_home_exit tmc2130_sg_homing_axes_mask=0x%02x\n"), tmc2130_sg_homing_axes_mask); #ifdef TMC2130_SG_HOMING - if (tmc2130_sg_homing_axes_mask & 0x03) //X or Y + if (tmc2130_sg_homing_axes_mask & (X_AXIS_MASK | Y_AXIS_MASK)) tmc2130_wait_standstill_xy(1000); if (tmc2130_sg_homing_axes_mask) { for (uint8_t axis = X_AXIS, mask = X_AXIS_MASK; axis <= Z_AXIS; axis++, mask <<= 1) //X Y and Z axes { - if (tmc2130_sg_homing_axes_mask & mask) - { -#ifndef TMC2130_STEALTH_Z - if ((tmc2130_mode == TMC2130_MODE_SILENT) && (axis != Z_AXIS)) -#else //TMC2130_STEALTH_Z - if (tmc2130_mode == TMC2130_MODE_SILENT) -#endif //TMC2130_STEALTH_Z - { - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); // Configuration back to stealthChop - tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, 0); - } - else - { -// tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_NORMAL); - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); - tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); - tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, __tcoolthrs(axis)); - tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); - } + if (tmc2130_sg_homing_axes_mask & mask) { + tmc2130_XYZ_reg_init(axis); } } tmc2130_sg_homing_axes_mask = 0x00; From 2d2ab6e889b11c546123f9ee420798bfb74da2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 19 Jul 2023 15:55:26 +0000 Subject: [PATCH 105/148] tmc2130: chopconf: simplify dedge code move dedge preprocessing out of tmc2130_setup_chopper We can use default_dedge_bit to initialise the dedge bit in the chopconf constuctor later No change in memory --- Firmware/tmc2130.cpp | 72 +++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index a6d290f9e..5535cc353 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -140,6 +140,39 @@ static ShortTimer tmc2130_overtemp_timer; #define TMC2130_REG_ENCM_CTRL 0x72 // 2 bits #define TMC2130_REG_LOST_STEPS 0x73 // 20 bits +#define _GET_PWR_X (READ(X_ENABLE_PIN) == X_ENABLE_ON) +#define _GET_PWR_Y (READ(Y_ENABLE_PIN) == Y_ENABLE_ON) +#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) +#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) +#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 +static constexpr uint8_t default_dedge_bit = 1; +#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 // !TMC2130_DEDGE_STEPPING +static constexpr uint8_t default_dedge_bit = 0; +#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 // TMC2130_DEDGE_STEPPING uint16_t tmc2130_rd_TSTEP(uint8_t axis); uint16_t tmc2130_rd_MSCNT(uint8_t axis); @@ -420,11 +453,7 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ chopconf.dw = 0; // Zero initialise chopconf.s.intpol = (mres != 0); // intpol to 256 only if microsteps aren't 256 -#ifdef TMC2130_DEDGE_STEPPING - chopconf.s.dedge = 1; -#else - chopconf.s.dedge = 0; -#endif + chopconf.s.dedge = default_dedge_bit; chopconf.s.toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) chopconf.s.hstrt = tmc2130_chopper_config[axis].hstr; // initial 4, modified to 5 chopconf.s.hend = tmc2130_chopper_config[axis].hend; // original value = 1 @@ -656,39 +685,6 @@ static uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval) return stat; } -#define _GET_PWR_X (READ(X_ENABLE_PIN) == X_ENABLE_ON) -#define _GET_PWR_Y (READ(Y_ENABLE_PIN) == Y_ENABLE_ON) -#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) -#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) -#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) -#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); 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 - - uint16_t tmc2130_get_res(uint8_t axis) { return tmc2130_mres2usteps(tmc2130_mres[axis]); From bb8ebbb5e3a362c31fd5e57dc882f3427d9765e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 19 Jul 2023 16:16:56 +0000 Subject: [PATCH 106/148] tmc2130: chopconf: simplify intpol config Pull the preprocessor code outside tmc2130_setup_chopper No change in memory --- Firmware/tmc2130.cpp | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 5535cc353..47a7edd82 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -423,6 +423,21 @@ void tmc2130_check_overtemp() } } +/// Helper function to determine the value of the CHOPCONF intpol flag +static constexpr bool getIntpolBit([[maybe_unused]]const uint8_t axis, const uint8_t mres) { +#if defined(TMC2130_INTPOL_E) && (TMC2130_INTPOL_E == 0) + if (axis == E_AXIS) return 0; +#endif +#if defined(TMC2130_INTPOL_XY) && (TMC2130_INTPOL_XY == 0) + if (axis == X_AXIS || axis == Y_AXIS) return 0; +#endif +#if defined(TMC2130_INTPOL_Z) && (TMC2130_INTPOL_Z == 0) + if (axis == Z_AXIS) return 0; +#endif + + return (mres != 0); // intpol to 256 only if microsteps aren't 256 +} + void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r) { union ChopConfU { @@ -451,8 +466,8 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ static_assert(sizeof(ChopConfU) == 4); chopconf.dw = 0; // Zero initialise - - chopconf.s.intpol = (mres != 0); // intpol to 256 only if microsteps aren't 256 + + chopconf.s.intpol = getIntpolBit(axis, mres); chopconf.s.dedge = default_dedge_bit; chopconf.s.toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) chopconf.s.hstrt = tmc2130_chopper_config[axis].hstr; // initial 4, modified to 5 @@ -467,28 +482,15 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ chopconf.s.vhighchm = 0; chopconf.s.sync = 0; chopconf.s.mres = mres; - if (axis == E_AXIS) - { -#if defined(TMC2130_INTPOL_E) && (TMC2130_INTPOL_E == 0) - chopconf.s.intpol = 0; -#endif + #ifdef TMC2130_CNSTOFF_E + if (axis == E_AXIS) { chopconf.s.hstrt = 0; // fd0..2 chopconf.s.fd = 0; // fd3 chopconf.s.hend = 0; // sine wave offset chopconf.s.chm = 0; // constant off time mod -#endif //TMC2130_CNSTOFF_E } -#if defined(TMC2130_INTPOL_XY) && (TMC2130_INTPOL_XY == 0) - else if (axis == X_AXIS || axis == Y_AXIS) { - chopconf.s.intpol = 0; - } -#endif -#if defined(TMC2130_INTPOL_Z) && (TMC2130_INTPOL_Z == 0) - else if (axis == Z_AXIS) { - chopconf.s.intpol = 0; - } -#endif +#endif //TMC2130_CNSTOFF_E if (current_r <= 31) { chopconf.s.vsense = 1; From 664d4e2bbefd8b3736c95080be54d9078e150379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Jul 2023 16:17:50 +0000 Subject: [PATCH 107/148] tmc2130: chopconf: Add constructor to ChopConfU Removed redundant initialisations which the constructor now takes care of Change in memory: Flash: +8 bytes SRAM: 0 bytes --- Firmware/tmc2130.cpp | 144 +++++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 68 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 47a7edd82..eca7d3dca 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -14,6 +14,19 @@ #define TMC2130_GCONF_DYNAMIC_SGSENS 0x00000184 // stealthChop/spreadCycle (dynamic) with stallguard (stall activates DIAG0 and DIAG1 [open collector]) #define TMC2130_GCONF_SILENT 0x00000004 // stealthChop +#ifdef TMC2130_DEDGE_STEPPING +static constexpr uint8_t default_dedge_bit = 1; +#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 // !TMC2130_DEDGE_STEPPING +static constexpr uint8_t default_dedge_bit = 0; +#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 // TMC2130_DEDGE_STEPPING //mode uint8_t tmc2130_mode = TMC2130_MODE_NORMAL; @@ -24,6 +37,51 @@ uint8_t tmc2130_current_r[4] = TMC2130_CURRENTS_R; //running currents for homing static uint8_t tmc2130_current_r_home[4] = TMC2130_CURRENTS_R_HOME; +union ChopConfU { + struct __attribute__((packed)) S { + uint32_t toff : 4; + uint32_t hstrt : 3; + uint32_t hend : 4; + uint32_t fd : 1; + uint32_t disfdcc : 1; + uint32_t rndtf : 1; + uint32_t chm : 1; + uint32_t tbl : 2; + uint32_t vsense : 1; + uint32_t vhighfs : 1; + uint32_t vhighchm : 1; + uint32_t sync : 4; + uint32_t mres : 4; + uint32_t intpol : 1; + uint32_t dedge : 1; + uint32_t diss2g : 1; + uint32_t reserved : 1; + constexpr S(bool vsense, uint8_t mres) + : toff(TMC2130_TOFF_XYZ) + , hstrt(5) + , hend(1) + , fd(0) + , disfdcc(0) + , rndtf(0) + , chm(0) + , tbl(2) + , vsense(vsense) + , vhighfs(0) + , vhighchm(0) + , sync(0) + , mres(mres) + , intpol(0) + , dedge(default_dedge_bit) + , diss2g(0) + , reserved(0) {} + } s; + uint32_t dw; + constexpr ChopConfU(bool vsense, uint8_t mres) + : s(vsense, mres) {} +}; +static_assert(sizeof(ChopConfU::S) == 4); +static_assert(sizeof(ChopConfU) == 4); + union PWMConfU { struct __attribute__((packed)) S { uint32_t pwm_ampl : 8; // User defined amplitude (offset) @@ -160,20 +218,6 @@ static ShortTimer tmc2130_overtemp_timer; #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 -static constexpr uint8_t default_dedge_bit = 1; -#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 // !TMC2130_DEDGE_STEPPING -static constexpr uint8_t default_dedge_bit = 0; -#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 // TMC2130_DEDGE_STEPPING - uint16_t tmc2130_rd_TSTEP(uint8_t axis); uint16_t tmc2130_rd_MSCNT(uint8_t axis); uint32_t tmc2130_rd_MSCURACT(uint8_t axis); @@ -440,65 +484,29 @@ static constexpr bool getIntpolBit([[maybe_unused]]const uint8_t axis, const uin void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r) { - union ChopConfU { - struct __attribute__((packed)) S { - uint32_t toff : 4; - uint32_t hstrt : 3; - uint32_t hend : 4; - uint32_t fd : 1; - uint32_t disfdcc : 1; - uint32_t rndtf : 1; - uint32_t chm : 1; - uint32_t tbl : 2; - uint32_t vsense : 1; - uint32_t vhighfs : 1; - uint32_t vhighchm : 1; - uint32_t sync : 4; - uint32_t mres : 4; - uint32_t intpol : 1; - uint32_t dedge : 1; - uint32_t diss2g : 1; - uint32_t reserved : 1; - } s; - uint32_t dw; - } chopconf; - static_assert(sizeof(ChopConfU::S) == 4); - static_assert(sizeof(ChopConfU) == 4); - - chopconf.dw = 0; // Zero initialise - - chopconf.s.intpol = getIntpolBit(axis, mres); - chopconf.s.dedge = default_dedge_bit; - chopconf.s.toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) - chopconf.s.hstrt = tmc2130_chopper_config[axis].hstr; // initial 4, modified to 5 - chopconf.s.hend = tmc2130_chopper_config[axis].hend; // original value = 1 - chopconf.s.fd = 0; - chopconf.s.disfdcc = 0; - chopconf.s.rndtf = 0; //random off time - chopconf.s.chm = 0; //spreadCycle - chopconf.s.tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 - chopconf.s.vsense = 0; - chopconf.s.vhighfs = 0; - chopconf.s.vhighchm = 0; - chopconf.s.sync = 0; - chopconf.s.mres = mres; - -#ifdef TMC2130_CNSTOFF_E - if (axis == E_AXIS) { - chopconf.s.hstrt = 0; // fd0..2 - chopconf.s.fd = 0; // fd3 - chopconf.s.hend = 0; // sine wave offset - chopconf.s.chm = 0; // constant off time mod - } -#endif //TMC2130_CNSTOFF_E - if (current_r <= 31) - { - chopconf.s.vsense = 1; + bool vsense = 0; + if (current_r <= 31) { + vsense = 1; } else { current_r >>= 1; current_h >>= 1; } + ChopConfU chopconf = ChopConfU(vsense, mres); + + chopconf.s.intpol = getIntpolBit(axis, mres); + chopconf.s.toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) + chopconf.s.hstrt = tmc2130_chopper_config[axis].hstr; // initial 4, modified to 5 + chopconf.s.hend = tmc2130_chopper_config[axis].hend; // original value = 1 + chopconf.s.tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 + +#ifdef TMC2130_CNSTOFF_E + if (axis == E_AXIS) { + chopconf.s.hstrt = 0; // fd0..2 + chopconf.s.hend = 0; // sine wave offset + } +#endif //TMC2130_CNSTOFF_E + tmc2130_wr_CHOPCONF(axis, chopconf.dw); tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | ((current_r & 0x1f) << 8) | (current_h & 0x1f)); } From a87faba2bdd8e7ceabdfdf660182bdeba354913f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 21 Jul 2023 16:25:50 +0000 Subject: [PATCH 108/148] tmc2130: pull TMC2130_CNSTOFF_E outside tmc2130_setup_chopper We can probably improve tmc2130_chopper_config further by adding a constructor. No change in memory --- Firmware/tmc2130.cpp | 51 +++++++++++++++++++++++++++++++++----------- Firmware/tmc2130.h | 2 +- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index eca7d3dca..4dd8ca50e 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -143,11 +143,45 @@ uint8_t tmc2130_home_fsteps[2] = {48, 48}; uint8_t tmc2130_wave_fac[4] = {0, 0, 0, 0}; -tmc2130_chopper_config_t tmc2130_chopper_config[4] = { - {TMC2130_TOFF_XYZ, 5, 1, 2, 0}, - {TMC2130_TOFF_XYZ, 5, 1, 2, 0}, - {TMC2130_TOFF_XYZ, 5, 1, 2, 0}, - {TMC2130_TOFF_E, 5, 1, 2, 0} +tmc2130_chopper_config_t tmc2130_chopper_config[NUM_AXIS] = { + { // X axis + .toff = TMC2130_TOFF_XYZ, + .hstr = 5, + .hend = 1, + .tbl = 2, + .res = 0 + }, + { // Y axis + .toff = TMC2130_TOFF_XYZ, + .hstr = 5, + .hend = 1, + .tbl = 2, + .res = 0 + }, + { // Z axis + .toff = TMC2130_TOFF_XYZ, + .hstr = 5, + .hend = 1, + .tbl = 2, + .res = 0 + }, +#ifdef TMC2130_CNSTOFF_E + { // E axis + .toff = TMC2130_TOFF_E, + .hstr = 0, + .hend = 0, + .tbl = 2, + .res = 0 + } +#else // !TMC2130_CNSTOFF_E + { // E axis + .toff = TMC2130_TOFF_E, + .hstr = 5, + .hend = 1, + .tbl = 2, + .res = 0 + } +#endif }; bool tmc2130_sg_stop_on_crash = true; @@ -500,13 +534,6 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ chopconf.s.hend = tmc2130_chopper_config[axis].hend; // original value = 1 chopconf.s.tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 -#ifdef TMC2130_CNSTOFF_E - if (axis == E_AXIS) { - chopconf.s.hstrt = 0; // fd0..2 - chopconf.s.hend = 0; // sine wave offset - } -#endif //TMC2130_CNSTOFF_E - tmc2130_wr_CHOPCONF(axis, chopconf.dw); tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | ((current_r & 0x1f) << 8) | (current_h & 0x1f)); } diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index 30aa1b2db..09e1f59f4 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -58,7 +58,7 @@ typedef struct } tmc2130_chopper_config_t; #pragma pack(pop) -extern tmc2130_chopper_config_t tmc2130_chopper_config[4]; +extern tmc2130_chopper_config_t tmc2130_chopper_config[NUM_AXIS]; //initialize tmc2130 From 3819f7a4736e6e5cf6064649d32343cfa3ac1fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Jul 2023 00:24:30 +0000 Subject: [PATCH 109/148] tmc2130: Refactor code for setting/changing currents - Always re-calculate the Vsense flag when the currents are changed - Make sure Hold current is not larger than Run current - Added SetCurrents() function from MMU FW - Added MotorCurrents structure from MMU FW - Various code size optimisations e.g. in power panic Change in memory: Flash: -10 bytes SRAM: +4 bytes --- Firmware/Marlin_main.cpp | 36 ++++++++++-------- Firmware/power_panic.cpp | 15 +++++--- Firmware/tmc2130.cpp | 82 ++++++++++++++++++++++++++-------------- Firmware/tmc2130.h | 18 +++++++-- 4 files changed, 98 insertions(+), 53 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index abb7b2002..f315a959a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1084,10 +1084,10 @@ void setup() farm_mode_init(); #ifdef TMC2130 - if( FarmOrUserECool() ){ - //increased extruder current (PFW363) - tmc2130_current_h[E_AXIS] = TMC2130_CURRENTS_FARM; - tmc2130_current_r[E_AXIS] = TMC2130_CURRENTS_FARM; + if(FarmOrUserECool()) { + //increased extruder current (PFW363) + currents[E_AXIS].iRun = TMC2130_CURRENTS_FARM; + currents[E_AXIS].iHold = TMC2130_CURRENTS_FARM; } #endif //TMC2130 @@ -4090,7 +4090,7 @@ void process_commands() tmc2130_chopper_config[axis].hstr = chop1 & 7; tmc2130_chopper_config[axis].hend = chop2 & 15; tmc2130_chopper_config[axis].tbl = chop3 & 3; - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); //printf_P(_N("TMC_SET_CHOP_%c %d %d %d %d\n"), "xyze"[axis], chop0, chop1, chop2, chop3); } } @@ -8066,9 +8066,9 @@ Sigma_Exit: } long cur_mA = code_value_long(); uint8_t val = tmc2130_cur2val(cur_mA); - tmc2130_set_current_h(i, val); - tmc2130_set_current_r(i, val); - //if (i == E_AXIS) printf_P(PSTR("E-axis current=%ldmA\n"), cur_mA); + currents[i].iHold = val; + currents[i].iRun = val; + tmc2130_setup_chopper(i, tmc2130_mres[i]); } } #else //TMC2130 @@ -8140,10 +8140,12 @@ Sigma_Exit: */ case 911: { - if (code_seen('X')) tmc2130_set_current_h(0, code_value()); - if (code_seen('Y')) tmc2130_set_current_h(1, code_value()); - if (code_seen('Z')) tmc2130_set_current_h(2, code_value()); - if (code_seen('E')) tmc2130_set_current_h(3, code_value()); + for (uint8_t axis = 0; axis < NUM_AXIS; axis++) { + if (code_seen(axis_codes[axis])) { + currents[axis].iHold = code_value_uint8(); + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); + } + } } break; @@ -8162,10 +8164,12 @@ Sigma_Exit: */ case 912: { - if (code_seen('X')) tmc2130_set_current_r(0, code_value()); - if (code_seen('Y')) tmc2130_set_current_r(1, code_value()); - if (code_seen('Z')) tmc2130_set_current_r(2, code_value()); - if (code_seen('E')) tmc2130_set_current_r(3, code_value()); + for (uint8_t axis = 0; axis < NUM_AXIS; axis++) { + if (code_seen(axis_codes[axis])) { + currents[axis].iRun = code_value_uint8(); + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); + } + } } break; diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 7797a8b66..935915355 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -61,10 +61,12 @@ void uvlo_() { // Minimise Z and E motor currents (Hold and Run) #ifdef TMC2130 - tmc2130_set_current_h(Z_AXIS, 20); - tmc2130_set_current_r(Z_AXIS, 20); - tmc2130_set_current_h(E_AXIS, 20); - tmc2130_set_current_r(E_AXIS, 20); + currents[Z_AXIS].iHold = 20; + currents[Z_AXIS].iRun = 20; + tmc2130_setup_chopper(Z_AXIS, tmc2130_mres[Z_AXIS]); + currents[E_AXIS].iHold = 20; + currents[E_AXIS].iRun = 20; + tmc2130_setup_chopper(E_AXIS, tmc2130_mres[E_AXIS]); #endif //TMC2130 if (!sd_print_saved_in_ram && !isPartialBackupAvailable) @@ -225,8 +227,9 @@ static void uvlo_tiny() { disable_e0(); #ifdef TMC2130 - tmc2130_set_current_h(Z_AXIS, 20); - tmc2130_set_current_r(Z_AXIS, 20); + currents[Z_AXIS].iHold = 20; + currents[Z_AXIS].iRun = 20; + tmc2130_setup_chopper(Z_AXIS, tmc2130_mres[Z_AXIS]); #endif //TMC2130 // Stop all heaters diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 4dd8ca50e..5caed6650 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -37,6 +37,13 @@ uint8_t tmc2130_current_r[4] = TMC2130_CURRENTS_R; //running currents for homing static uint8_t tmc2130_current_r_home[4] = TMC2130_CURRENTS_R_HOME; +MotorCurrents currents[NUM_AXIS] = { + MotorCurrents(tmc2130_current_r[0], tmc2130_current_h[0]), + MotorCurrents(tmc2130_current_r[1], tmc2130_current_h[1]), + MotorCurrents(tmc2130_current_r[2], tmc2130_current_h[2]), + MotorCurrents(tmc2130_current_r[3], tmc2130_current_h[3]) +}; + union ChopConfU { struct __attribute__((packed)) S { uint32_t toff : 4; @@ -267,9 +274,6 @@ void tmc2130_wr_THIGH(uint8_t axis, uint32_t val32); static void tmc2130_tx(uint8_t axis, uint8_t addr, uint32_t wval); static uint8_t tmc2130_rx(uint8_t axis, uint8_t addr, uint32_t* rval); - -void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r); - uint16_t __tcoolthrs(uint8_t axis) { switch (axis) @@ -301,7 +305,7 @@ static void tmc2130_XYZ_reg_init(uint8_t axis) tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); } - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); } @@ -332,7 +336,7 @@ void tmc2130_init(TMCInitParams params) } // E axis - tmc2130_setup_chopper(E_AXIS, tmc2130_mres[E_AXIS], tmc2130_current_h[E_AXIS], tmc2130_current_r[E_AXIS]); + tmc2130_setup_chopper(E_AXIS, tmc2130_mres[E_AXIS]); tmc2130_wr(E_AXIS, TMC2130_REG_TPOWERDOWN, 0x00000000); #ifndef TMC2130_STEALTH_E if( ! params.enableECool ){ @@ -420,7 +424,8 @@ void tmc2130_home_enter(uint8_t axes_mask) tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_NORMAL); tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr_home[axis]) << 16)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, __tcoolthrs(axis)); - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r_home[axis]); + currents[axis].iRun = tmc2130_current_r_home[axis]; + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); //stallguard output DIAG1, DIAG1 = pushpull } } @@ -516,17 +521,38 @@ static constexpr bool getIntpolBit([[maybe_unused]]const uint8_t axis, const uin return (mres != 0); // intpol to 256 only if microsteps aren't 256 } -void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r) -{ - bool vsense = 0; - if (current_r <= 31) { - vsense = 1; - } else { - current_r >>= 1; - current_h >>= 1; - } +static void SetCurrents(const uint8_t axis) { + uint8_t iHold = currents[axis].iHold; + const uint8_t iRun = currents[axis].iRun; - ChopConfU chopconf = ChopConfU(vsense, mres); + union IHoldRun { + struct S { + uint8_t iHold; + uint8_t iRun; + uint16_t iHoldDelay; + constexpr S(uint8_t ih, uint8_t ir) + : iHold(ih) + , iRun(ir) + , iHoldDelay(15 & 0x0F) {} + } s; + uint32_t dw; + constexpr IHoldRun(uint8_t ih, uint8_t ir) + : s(ih, ir) {} + }; + + // also, make sure iHold never exceeds iRun at runtime + IHoldRun ihold_irun((iHold > iRun ? iRun : iHold) & 0x1f, iRun & 0x1f); + + tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, ihold_irun.dw); +} + +void tmc2130_setup_chopper(uint8_t axis, uint8_t mres) +{ + // Update the currents, this will re-calculate the Vsense flag + currents[axis] = MotorCurrents(currents[axis].iRun, currents[axis].iHold); + + // Initialise the chopper configuration + ChopConfU chopconf = ChopConfU(currents[axis].vSense, mres); chopconf.s.intpol = getIntpolBit(axis, mres); chopconf.s.toff = tmc2130_chopper_config[axis].toff; // toff = 3 (fchop = 27.778kHz) @@ -535,30 +561,30 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_ chopconf.s.tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 tmc2130_wr_CHOPCONF(axis, chopconf.dw); - tmc2130_wr(axis, TMC2130_REG_IHOLD_IRUN, 0x000f0000 | ((current_r & 0x1f) << 8) | (current_h & 0x1f)); + SetCurrents(axis); } void tmc2130_set_current_h(uint8_t axis, uint8_t current) { // DBG(_n("tmc2130_set_current_h(axis=%d, current=%d\n"), axis, current); - tmc2130_current_h[axis] = current; - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + currents[axis].iHold = current; + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); } void tmc2130_set_current_r(uint8_t axis, uint8_t current) { // DBG(_n("tmc2130_set_current_r(axis=%d, current=%d\n"), axis, current); - tmc2130_current_r[axis] = current; - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + currents[axis].iRun = current; + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); } void tmc2130_print_currents() { printf_P(_n("tmc2130_print_currents()\n\tH\tR\nX\t%d\t%d\nY\t%d\t%d\nZ\t%d\t%d\nE\t%d\t%d\n"), - tmc2130_current_h[0], tmc2130_current_r[0], - tmc2130_current_h[1], tmc2130_current_r[1], - tmc2130_current_h[2], tmc2130_current_r[2], - tmc2130_current_h[3], tmc2130_current_r[3] + currents[0].iHold, currents[0].iRun, + currents[1].iHold, currents[1].iRun, + currents[2].iHold, currents[2].iRun, + currents[3].iHold, currents[3].iRun ); } @@ -731,7 +757,7 @@ void tmc2130_set_res(uint8_t axis, uint16_t res) { tmc2130_mres[axis] = tmc2130_usteps2mres(res); // uint32_t u = _micros(); - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); // u = _micros() - u; // printf_P(PSTR("tmc2130_setup_chopper %c %lu us"), "XYZE"[axis], u); } @@ -858,7 +884,7 @@ void tmc2130_get_wave(uint8_t axis, uint8_t* data, FILE* stream) { uint8_t pwr = tmc2130_get_pwr(axis); tmc2130_set_pwr(axis, 0); - tmc2130_setup_chopper(axis, tmc2130_usteps2mres(256), tmc2130_current_h[axis], tmc2130_current_r[axis]); + tmc2130_setup_chopper(axis, tmc2130_usteps2mres(256)); tmc2130_goto_step(axis, 0, 2, 100, 256); tmc2130_set_dir(axis, tmc2130_get_inv(axis)?0:1); for (unsigned int i = 0; i <= 255; i++) @@ -877,7 +903,7 @@ void tmc2130_get_wave(uint8_t axis, uint8_t* data, FILE* stream) tmc2130_do_step(axis); delayMicroseconds(100); } - tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); + tmc2130_setup_chopper(axis, tmc2130_mres[axis]); tmc2130_set_pwr(axis, pwr); } diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index 09e1f59f4..6760fcaef 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -2,11 +2,10 @@ #define TMC2130_H #include +#include "Configuration_var.h" //mode extern uint8_t tmc2130_mode; -extern uint8_t tmc2130_current_h[4]; -extern uint8_t tmc2130_current_r[4]; //microstep resolution (0 means 256usteps, 8 means 1ustep extern uint8_t tmc2130_mres[4]; @@ -60,6 +59,19 @@ typedef struct extern tmc2130_chopper_config_t tmc2130_chopper_config[NUM_AXIS]; +struct MotorCurrents { + bool vSense; ///< VSense current scaling + uint8_t iRun; ///< Running current + uint8_t iHold; ///< Holding current + + constexpr inline __attribute__((always_inline)) MotorCurrents(uint8_t ir, uint8_t ih) + : vSense((ir < 32) ? 1 : 0) + , iRun((ir < 32) ? ir : (ir >> 1)) + , iHold((ir < 32) ? ih : (ih >> 1)) {} +}; + +extern MotorCurrents currents[NUM_AXIS]; + //initialize tmc2130 struct TMCInitParams { @@ -94,7 +106,7 @@ extern void tmc2130_sg_measure_start(uint8_t axis); //stop current stallguard measuring and report result extern uint16_t tmc2130_sg_measure_stop(); -extern void tmc2130_setup_chopper(uint8_t axis, uint8_t mres, uint8_t current_h, uint8_t current_r); +extern void tmc2130_setup_chopper(uint8_t axis, uint8_t mres); //set holding current for any axis (M911) extern void tmc2130_set_current_h(uint8_t axis, uint8_t current); From ed13d008d98bc8be54043332af76a22ab0c92a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Jul 2023 14:55:24 +0000 Subject: [PATCH 110/148] tmc2130: minor code cleanup Using tmc2130_wr() instead makes the code a bit more aligned and easier to read IMO No change in memory --- Firmware/tmc2130.cpp | 47 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 5caed6650..1a95605ff 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -263,11 +263,6 @@ uint16_t tmc2130_rd_TSTEP(uint8_t axis); uint16_t tmc2130_rd_MSCNT(uint8_t axis); uint32_t tmc2130_rd_MSCURACT(uint8_t axis); -void tmc2130_wr_CHOPCONF(uint8_t axis, uint32_t conf); -void tmc2130_wr_PWMCONF(uint8_t axis, uint32_t conf); -void tmc2130_wr_TPWMTHRS(uint8_t axis, uint32_t val32); -void tmc2130_wr_THIGH(uint8_t axis, uint32_t val32); - #define tmc2130_rd(axis, addr, rval) tmc2130_rx(axis, addr, rval) #define tmc2130_wr(axis, addr, wval) tmc2130_tx(axis, (addr) | 0x80, wval) @@ -293,8 +288,8 @@ static void tmc2130_XYZ_reg_init(uint8_t axis) tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, isStealth ? 0 : __tcoolthrs(axis)); tmc2130_wr(axis, TMC2130_REG_GCONF, isStealth ? TMC2130_GCONF_SILENT : TMC2130_GCONF_DYNAMIC_SGSENS); - tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); - tmc2130_wr_TPWMTHRS(axis, isStealth ? 0 : 0xFFFF0); + tmc2130_wr(axis, TMC2130_REG_PWMCONF, pwmconf[axis].dw); + tmc2130_wr(axis, TMC2130_REG_TPWMTHRS, isStealth ? 0 : 0xFFFF0); #else // TMC2130_STEALTH_Z tmc2130_wr(axis, TMC2130_REG_GCONF, TMC2130_GCONF_SGSENS); #endif // TMC2130_STEALTH_Z @@ -302,8 +297,8 @@ static void tmc2130_XYZ_reg_init(uint8_t axis) tmc2130_wr(axis, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[axis]) << 16) | ((uint32_t)1 << 24)); tmc2130_wr(axis, TMC2130_REG_TCOOLTHRS, isStealth ? 0 : __tcoolthrs(axis)); tmc2130_wr(axis, TMC2130_REG_GCONF, isStealth ? TMC2130_GCONF_SILENT : TMC2130_GCONF_SGSENS); - tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); - tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); + tmc2130_wr(axis, TMC2130_REG_PWMCONF, pwmconf[axis].dw); + tmc2130_wr(axis, TMC2130_REG_TPWMTHRS, TMC2130_TPWMTHRS); } tmc2130_setup_chopper(axis, tmc2130_mres[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -345,16 +340,16 @@ void tmc2130_init(TMCInitParams params) tmc2130_wr(E_AXIS, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[E_AXIS]) << 16)); tmc2130_wr(E_AXIS, TMC2130_REG_TCOOLTHRS, 0); tmc2130_wr(E_AXIS, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); - tmc2130_wr_PWMCONF(E_AXIS, pwmconf_Ecool.dw); - tmc2130_wr_TPWMTHRS(E_AXIS, TMC2130_TPWMTHRS_E); + tmc2130_wr(E_AXIS, TMC2130_REG_PWMCONF, pwmconf_Ecool.dw); + tmc2130_wr(E_AXIS, TMC2130_REG_TPWMTHRS, TMC2130_TPWMTHRS_E); SERIAL_ECHOLNRPGM(eMotorCurrentScalingEnabled); } #else //TMC2130_STEALTH_E tmc2130_wr(E_AXIS, TMC2130_REG_COOLCONF, (((uint32_t)tmc2130_sg_thr[E_AXIS]) << 16)); tmc2130_wr(E_AXIS, TMC2130_REG_TCOOLTHRS, 0); tmc2130_wr(E_AXIS, TMC2130_REG_GCONF, TMC2130_GCONF_SILENT); - tmc2130_wr_PWMCONF(E_AXIS, pwmconf[E_AXIS].dw); - tmc2130_wr_TPWMTHRS(E_AXIS, TMC2130_TPWMTHRS); + tmc2130_wr(E_AXIS, TMC2130_REG_PWMCONF, pwmconf[E_AXIS].dw); + tmc2130_wr(E_AXIS, TMC2130_REG_TPWMTHRS, TMC2130_TPWMTHRS); #endif //TMC2130_STEALTH_E #ifdef TMC2130_LINEARITY_CORRECTION @@ -560,7 +555,7 @@ void tmc2130_setup_chopper(uint8_t axis, uint8_t mres) chopconf.s.hend = tmc2130_chopper_config[axis].hend; // original value = 1 chopconf.s.tbl = tmc2130_chopper_config[axis].tbl; //blanking time, original value = 2 - tmc2130_wr_CHOPCONF(axis, chopconf.dw); + tmc2130_wr(axis, TMC2130_REG_CHOPCONF, chopconf.dw); SetCurrents(axis); } @@ -592,14 +587,14 @@ void tmc2130_set_pwm_ampl(uint8_t axis, uint8_t pwm_ampl) { pwmconf[axis].s.pwm_ampl = pwm_ampl; if (((axis == X_AXIS) || (axis == Y_AXIS)) && (tmc2130_mode == TMC2130_MODE_SILENT)) - tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); + tmc2130_wr(axis, TMC2130_REG_PWMCONF, pwmconf[axis].dw); } void tmc2130_set_pwm_grad(uint8_t axis, uint8_t pwm_grad) { pwmconf[axis].s.pwm_grad = pwm_grad; if (((axis == X_AXIS) || (axis == Y_AXIS)) && (tmc2130_mode == TMC2130_MODE_SILENT)) - tmc2130_wr_PWMCONF(axis, pwmconf[axis].dw); + tmc2130_wr(axis, TMC2130_REG_PWMCONF, pwmconf[axis].dw); } uint16_t tmc2130_rd_TSTEP(uint8_t axis) @@ -653,26 +648,6 @@ void tmc2130_wr_MSLUT(uint8_t axis, uint8_t i, uint32_t val) //printf_P(PSTR("MSLUT[%d]=%08lx\n"), i, val); } -void tmc2130_wr_CHOPCONF(uint8_t axis, uint32_t conf) -{ - tmc2130_wr(axis, TMC2130_REG_CHOPCONF, conf); -} - -void tmc2130_wr_PWMCONF(uint8_t axis, uint32_t conf) -{ - tmc2130_wr(axis, TMC2130_REG_PWMCONF, conf); -} - -void tmc2130_wr_TPWMTHRS(uint8_t axis, uint32_t val32) -{ - tmc2130_wr(axis, TMC2130_REG_TPWMTHRS, val32); -} - -void tmc2130_wr_THIGH(uint8_t axis, uint32_t val32) -{ - tmc2130_wr(axis, TMC2130_REG_THIGH, val32); -} - uint8_t tmc2130_usteps2mres(uint16_t usteps) { uint8_t mres = 8; while (usteps >>= 1) mres--; From 0ab10a9df6315ec889c11e4bbfe9c326299ad101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Jul 2023 15:43:28 +0000 Subject: [PATCH 111/148] tmc2130: chopconf: add comments to structure --- Firmware/tmc2130.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 1a95605ff..ee804c5f2 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -46,31 +46,31 @@ MotorCurrents currents[NUM_AXIS] = { union ChopConfU { struct __attribute__((packed)) S { - uint32_t toff : 4; - uint32_t hstrt : 3; - uint32_t hend : 4; + uint32_t toff : 4; // Off time and driver enable + uint32_t hstrt : 3; // Hysteresis start value added to HEND + uint32_t hend : 4; // HEND hysteresis low value (chm = 0) or OFFSET sine wave offset (chm = 1) uint32_t fd : 1; - uint32_t disfdcc : 1; - uint32_t rndtf : 1; - uint32_t chm : 1; - uint32_t tbl : 2; - uint32_t vsense : 1; - uint32_t vhighfs : 1; - uint32_t vhighchm : 1; - uint32_t sync : 4; - uint32_t mres : 4; - uint32_t intpol : 1; - uint32_t dedge : 1; - uint32_t diss2g : 1; - uint32_t reserved : 1; + uint32_t disfdcc : 1; // Fast decay mode + uint32_t rndtf : 1; // Random TOFF time + uint32_t chm : 1; // Chopper mode + uint32_t tbl : 2; // Blank time select + uint32_t vsense : 1; // Sense resistor voltage based current scaling + uint32_t vhighfs : 1; // High velocity fullstep selection + uint32_t vhighchm : 1; // High velocity chopper mode + uint32_t sync : 4; // PWM synchronization clock + uint32_t mres : 4; // Micro step resolution + uint32_t intpol : 1; // Interpolation to 256 microsteps + uint32_t dedge : 1; // Enable double edgestep pulses + uint32_t diss2g : 1; // Short to GND protection disable + uint32_t reserved : 1; // Reserved, set to 0 constexpr S(bool vsense, uint8_t mres) : toff(TMC2130_TOFF_XYZ) , hstrt(5) , hend(1) , fd(0) , disfdcc(0) - , rndtf(0) - , chm(0) + , rndtf(0) // Chopper off time is fixed as set by TOFF + , chm(0) // Standard mode (spreadCycle) , tbl(2) , vsense(vsense) , vhighfs(0) @@ -79,7 +79,7 @@ union ChopConfU { , mres(mres) , intpol(0) , dedge(default_dedge_bit) - , diss2g(0) + , diss2g(0) // Short to GND protection is on , reserved(0) {} } s; uint32_t dw; From c067318427426be726c4c9803935de13c92dc5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 23 Apr 2023 11:05:07 +0000 Subject: [PATCH 112/148] cleanup language menu Change in memory: Flash: -50 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2bb1fb40b..4bfc26538 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3415,18 +3415,15 @@ static void crash_mode_switch() #endif //TMC2130 #if (LANG_MODE != 0) - -void menu_setlang(unsigned char lang) +static void menu_setlang(uint8_t lang) { if (!lang_select(lang)) { if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, LCD_LEFT_BUTTON_CHOICE) == LCD_LEFT_BUTTON_CHOICE)////MSG_COPY_SEL_LANG c=20 r=3 lang_boot_update_start(lang); lcd_update_enable(true); - lcd_clear(); menu_goto(lcd_language_menu, 0, true, true); lcd_timeoutToStatus.stop(); //infinite timeout - lcd_draw_update = 2; } } @@ -3437,7 +3434,7 @@ static void lcd_community_language_menu() MENU_BEGIN(); uint8_t cnt = lang_get_count(); MENU_ITEM_BACK_P(_T(MSG_SELECT_LANGUAGE)); //Back to previous Menu - for (int i = 8; i < cnt; i++) //all community languages + for (uint8_t i = 8; i < cnt; i++) //all community languages if (menu_item_text_P(lang_get_name_by_code(lang_get_code(i)))) { menu_setlang(i); @@ -3448,8 +3445,6 @@ static void lcd_community_language_menu() #endif //XFLASH #endif //COMMUNITY_LANGUAGE_SUPPORT && W52X20CL - - static void lcd_language_menu() { MENU_BEGIN(); @@ -3470,9 +3465,9 @@ static void lcd_language_menu() } } else - for (int i = 2; i < 8; i++) //skip seconday language - solved in lang_select (MK3) 'i < 8' for 7 official languages + for (uint8_t i = 2; i < 8; i++) //skip seconday language - solved in lang_select (MK3) 'i < 8' for 7 official languages #else //XFLASH - for (int i = 1; i < cnt; i++) //all seconday languages (MK2/25) + for (uint8_t i = 1; i < cnt; i++) //all seconday languages (MK2/25) #endif //XFLASH if (menu_item_text_P(lang_get_name_by_code(lang_get_code(i)))) { @@ -3490,7 +3485,6 @@ static void lcd_language_menu() } #endif //(LANG_MODE != 0) - void lcd_mesh_bedleveling() { enquecommand_P(PSTR("G80")); @@ -3570,15 +3564,9 @@ void lcd_first_layer_calibration_reset() menu_goto(lcd_v2_calibration, 0, true, !lcd_clicked()); } - if (lcd_encoder > 0) - { - menuData->reset = true; - lcd_encoder = 1; - } - else if (lcd_encoder < 1) - { - menuData->reset = false; - lcd_encoder = 0; + if (lcd_encoder) { + menuData->reset = lcd_encoder > 0; + lcd_encoder = 0; // Reset } char sheet_name[sizeof(Sheet::name)]; @@ -3653,10 +3641,8 @@ void lcd_wizard() { void lcd_language() { lcd_update_enable(true); - lcd_clear(); menu_goto(lcd_language_menu, 0, true, true); lcd_timeoutToStatus.stop(); //infinite timeout - lcd_draw_update = 2; while ((menu_menu != lcd_status_screen) && (!lang_is_selected())) { delay_keep_alive(50); From 1984091c10389ea79d387d43a11e9e707b6975c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 23 May 2023 18:46:21 +0000 Subject: [PATCH 113/148] Rename axis_steps_per_sqr_second to max_acceleration_steps_per_s2 --- Firmware/Marlin_main.cpp | 2 +- Firmware/planner.cpp | 20 ++++++++++---------- Firmware/planner.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f315a959a..f9d6680fd 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6334,7 +6334,7 @@ Sigma_Exit: float factor = cs.axis_steps_per_unit[i] / value; // increase e constants if M92 E14 is given for netfab. cs.max_jerk[E_AXIS] *= factor; max_feedrate[i] *= factor; - axis_steps_per_sqr_second[i] *= factor; + max_acceleration_steps_per_s2[i] *= factor; } cs.axis_steps_per_unit[i] = value; #if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index b68b6e2f1..eb41e2fea 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -82,7 +82,7 @@ float* max_feedrate = cs.max_feedrate_normal; // Use M201 to override by software unsigned long* max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal; -unsigned long axis_steps_per_sqr_second[NUM_AXIS]; +unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; #ifdef ENABLE_AUTO_BED_LEVELING // this holds the required transform to compensate for bed level @@ -1064,14 +1064,14 @@ Having the real displacement of the head, we can calculate the total movement le // Limit acceleration per axis //FIXME Vojtech: One shall rather limit a projection of the acceleration vector instead of using the limit. - if(((float)accel * (float)block->steps_x.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[X_AXIS]) - { accel = axis_steps_per_sqr_second[X_AXIS]; } - if(((float)accel * (float)block->steps_y.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[Y_AXIS]) - { accel = axis_steps_per_sqr_second[Y_AXIS]; } - if(((float)accel * (float)block->steps_e.wide / (float)block->step_event_count.wide) > axis_steps_per_sqr_second[E_AXIS]) - { accel = axis_steps_per_sqr_second[E_AXIS]; } - if(((float)accel * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > axis_steps_per_sqr_second[Z_AXIS]) - { accel = axis_steps_per_sqr_second[Z_AXIS]; } + if(((float)accel * (float)block->steps_x.wide / (float)block->step_event_count.wide) > max_acceleration_steps_per_s2[X_AXIS]) + { accel = max_acceleration_steps_per_s2[X_AXIS]; } + if(((float)accel * (float)block->steps_y.wide / (float)block->step_event_count.wide) > max_acceleration_steps_per_s2[Y_AXIS]) + { accel = max_acceleration_steps_per_s2[Y_AXIS]; } + if(((float)accel * (float)block->steps_e.wide / (float)block->step_event_count.wide) > max_acceleration_steps_per_s2[E_AXIS]) + { accel = max_acceleration_steps_per_s2[E_AXIS]; } + if(((float)accel * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > max_acceleration_steps_per_s2[Z_AXIS]) + { accel = max_acceleration_steps_per_s2[Z_AXIS]; } } // Acceleration of the segment, in mm/sec^2 block->acceleration_steps_per_s2 = accel; @@ -1372,7 +1372,7 @@ void set_extrude_min_temp(int temp) void reset_acceleration_rates() { for(int8_t i=0; i < NUM_AXIS; i++) - axis_steps_per_sqr_second[i] = max_acceleration_units_per_sq_second[i] * cs.axis_steps_per_unit[i]; + max_acceleration_steps_per_s2[i] = max_acceleration_units_per_sq_second[i] * cs.axis_steps_per_unit[i]; } #ifdef TMC2130 diff --git a/Firmware/planner.h b/Firmware/planner.h index 8785e794e..1e0aeb94a 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -188,7 +188,7 @@ extern float* max_feedrate; // Use M201 to override by software extern unsigned long* max_acceleration_units_per_sq_second; -extern unsigned long axis_steps_per_sqr_second[NUM_AXIS]; +extern unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; extern long position[NUM_AXIS]; From d5f4f6700d81c93d18bf8304e4b69dd15b3fb889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 26 May 2023 19:11:24 +0000 Subject: [PATCH 114/148] Optimise the acceleration limit checks Kudos goes to Marlin FW Change in memory: Flash: -314 bytes SRAM: 0 bytes --- Firmware/planner.cpp | 67 ++++++++++++++++++++++---------------------- Firmware/planner.h | 2 +- Firmware/stepper.cpp | 36 ++++++++++++------------ 3 files changed, 52 insertions(+), 53 deletions(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index eb41e2fea..20bf76522 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -483,10 +483,10 @@ void getHighESpeed() uint8_t block_index = block_buffer_tail; while(block_index != block_buffer_head) { - if((block_buffer[block_index].steps_x.wide != 0) || - (block_buffer[block_index].steps_y.wide != 0) || - (block_buffer[block_index].steps_z.wide != 0)) { - float se=(float(block_buffer[block_index].steps_e.wide)/float(block_buffer[block_index].step_event_count.wide))*block_buffer[block_index].nominal_speed; + if((block_buffer[block_index].steps[X_AXIS].wide != 0) || + (block_buffer[block_index].steps[Y_AXIS].wide != 0) || + (block_buffer[block_index].steps[Z_AXIS].wide != 0)) { + float se=(float(block_buffer[block_index].steps[E_AXIS].wide)/float(block_buffer[block_index].step_event_count.wide))*block_buffer[block_index].nominal_speed; //se; mm/sec; if(se>high) { @@ -521,7 +521,7 @@ bool e_active() while(block_index != block_buffer_head) { block = &block_buffer[block_index]; - if(block->steps_e.wide != 0) e_active++; + if(block->steps[E_AXIS].wide != 0) e_active++; block_index = (block_index+1) & (BLOCK_BUFFER_SIZE - 1); } } @@ -544,10 +544,10 @@ void check_axes_activity() while(block_index != block_buffer_head) { block = &block_buffer[block_index]; - if(block->steps_x.wide != 0) x_active++; - if(block->steps_y.wide != 0) y_active++; - if(block->steps_z.wide != 0) z_active++; - if(block->steps_e.wide != 0) e_active++; + if(block->steps[X_AXIS].wide != 0) x_active++; + if(block->steps[Y_AXIS].wide != 0) y_active++; + if(block->steps[Z_AXIS].wide != 0) z_active++; + if(block->steps[E_AXIS].wide != 0) e_active++; block_index = (block_index+1) & (BLOCK_BUFFER_SIZE - 1); } } @@ -862,17 +862,17 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate // Number of steps for each axis #ifndef COREXY // default non-h-bot planning -block->steps_x.wide = labs(dx); -block->steps_y.wide = labs(dy); +block->steps[X_AXIS].wide = labs(dx); +block->steps[Y_AXIS].wide = labs(dy); #else // corexy planning // these equations follow the form of the dA and dB equations on http://www.corexy.com/theory.html -block->steps_x.wide = labs(dx + dy); -block->steps_y.wide = labs(dx - dy); +block->steps[X_AXIS].wide = labs(dx + dy); +block->steps[Y_AXIS].wide = labs(dx - dy); #endif - block->steps_z.wide = labs(dz); - block->steps_e.wide = labs(de); - block->step_event_count.wide = max(block->steps_x.wide, max(block->steps_y.wide, max(block->steps_z.wide, block->steps_e.wide))); + block->steps[Z_AXIS].wide = labs(dz); + block->steps[E_AXIS].wide = labs(de); + block->step_event_count.wide = max(block->steps[X_AXIS].wide, max(block->steps[Y_AXIS].wide, max(block->steps[Z_AXIS].wide, block->steps[E_AXIS].wide))); // Bail if this is a zero-length block if (block->step_event_count.wide <= dropsegments) @@ -899,19 +899,19 @@ block->steps_y.wide = labs(dx - dy); //enable active axes #ifdef COREXY - if((block->steps_x.wide != 0) || (block->steps_y.wide != 0)) + if((block->steps[X_AXIS].wide != 0) || (block->steps[Y_AXIS].wide != 0)) { enable_x(); enable_y(); } #else - if(block->steps_x.wide != 0) enable_x(); - if(block->steps_y.wide != 0) enable_y(); + if(block->steps[X_AXIS].wide != 0) enable_x(); + if(block->steps[Y_AXIS].wide != 0) enable_y(); #endif - if(block->steps_z.wide != 0) enable_z(); - if(block->steps_e.wide != 0) enable_e0(); + if(block->steps[Z_AXIS].wide != 0) enable_z(); + if(block->steps[E_AXIS].wide != 0) enable_e0(); - if (block->steps_e.wide == 0) + if (block->steps[E_AXIS].wide == 0) { if(feed_ratesteps_x.wide <=dropsegments && block->steps_y.wide <=dropsegments && block->steps_z.wide <=dropsegments ) + if ( block->steps[X_AXIS].wide <=dropsegments && block->steps[Y_AXIS].wide <=dropsegments && block->steps[Z_AXIS].wide <=dropsegments ) { block->millimeters = fabs(delta_mm[E_AXIS]); } @@ -1006,7 +1006,7 @@ Having the real displacement of the head, we can calculate the total movement le // block->millimeters ... Euclidian length of the XYZ movement or the E length, if no XYZ movement. float steps_per_mm = block->step_event_count.wide/block->millimeters; uint32_t accel; - if(block->steps_x.wide == 0 && block->steps_y.wide == 0 && block->steps_z.wide == 0) + if(block->steps[X_AXIS].wide == 0 && block->steps[Y_AXIS].wide == 0 && block->steps[Z_AXIS].wide == 0) { accel = ceil(cs.retract_acceleration * steps_per_mm); // convert to: acceleration steps/sec^2 #ifdef LIN_ADVANCE @@ -1015,7 +1015,7 @@ Having the real displacement of the head, we can calculate the total movement le } else { - accel = ceil((block->steps_e.wide ? cs.acceleration : cs.travel_acceleration) * steps_per_mm); // convert to: acceleration steps/sec^2 + accel = ceil((block->steps[E_AXIS].wide ? cs.acceleration : cs.travel_acceleration) * steps_per_mm); // convert to: acceleration steps/sec^2 #ifdef LIN_ADVANCE /** @@ -1063,15 +1063,14 @@ Having the real displacement of the head, we can calculate the total movement le #endif // Limit acceleration per axis - //FIXME Vojtech: One shall rather limit a projection of the acceleration vector instead of using the limit. - if(((float)accel * (float)block->steps_x.wide / (float)block->step_event_count.wide) > max_acceleration_steps_per_s2[X_AXIS]) - { accel = max_acceleration_steps_per_s2[X_AXIS]; } - if(((float)accel * (float)block->steps_y.wide / (float)block->step_event_count.wide) > max_acceleration_steps_per_s2[Y_AXIS]) - { accel = max_acceleration_steps_per_s2[Y_AXIS]; } - if(((float)accel * (float)block->steps_e.wide / (float)block->step_event_count.wide) > max_acceleration_steps_per_s2[E_AXIS]) - { accel = max_acceleration_steps_per_s2[E_AXIS]; } - if(((float)accel * (float)block->steps_z.wide / (float)block->step_event_count.wide ) > max_acceleration_steps_per_s2[Z_AXIS]) - { accel = max_acceleration_steps_per_s2[Z_AXIS]; } + for (uint8_t axis = 0; axis < NUM_AXIS; axis++) + { + if(block->steps[axis].wide && max_acceleration_steps_per_s2[axis] < accel) + { + const float max_possible = float(max_acceleration_steps_per_s2[axis]) * float(block->step_event_count.wide) / float(block->steps[axis].wide); + if (max_possible < accel) accel = max_possible; + } + } } // Acceleration of the segment, in mm/sec^2 block->acceleration_steps_per_s2 = accel; diff --git a/Firmware/planner.h b/Firmware/planner.h index 1e0aeb94a..ae90428e9 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -71,7 +71,7 @@ union dda_usteps_t typedef struct { // Fields used by the bresenham algorithm for tracing the line // steps_x.y,z, step_event_count, acceleration_rate, direction_bits and active_extruder are set by plan_buffer_line(). - dda_isteps_t steps_x, steps_y, steps_z, steps_e; // Step count along each axis + dda_isteps_t steps[NUM_AXIS]; // Step count along each axis dda_usteps_t step_event_count; // The number of step events required to complete this block uint32_t acceleration_rate; // The acceleration rate used for acceleration calculation unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h) diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 7e511c7a3..1d1658d0e 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -324,7 +324,7 @@ FORCE_INLINE void stepper_next_block() current_block = plan_get_current_block(); if (current_block != NULL) { #ifdef BACKLASH_X - if (current_block->steps_x.wide) + if (current_block->steps[X_AXIS].wide) { //X-axis movement if ((current_block->direction_bits ^ last_dir_bits) & 1) { @@ -347,7 +347,7 @@ FORCE_INLINE void stepper_next_block() } #endif #ifdef BACKLASH_Y - if (current_block->steps_y.wide) + if (current_block->steps[Y_AXIS].wide) { //Y-axis movement if ((current_block->direction_bits ^ last_dir_bits) & 2) { @@ -401,7 +401,7 @@ FORCE_INLINE void stepper_next_block() counter_z.lo = counter_x.lo; counter_e.lo = counter_x.lo; #ifdef LIN_ADVANCE - e_extruding = current_block->steps_e.lo != 0; + e_extruding = current_block->steps[E_AXIS].lo != 0; #endif } else { counter_x.wide = -(current_block->step_event_count.wide >> 1); @@ -409,7 +409,7 @@ FORCE_INLINE void stepper_next_block() counter_z.wide = counter_x.wide; counter_e.wide = counter_x.wide; #ifdef LIN_ADVANCE - e_extruding = current_block->steps_e.wide != 0; + e_extruding = current_block->steps[E_AXIS].wide != 0; #endif } step_events_completed.wide = 0; @@ -488,7 +488,7 @@ FORCE_INLINE void stepper_check_endstops() // Normal homing SET_BIT_TO(_endstop, X_AXIS, (READ(X_MIN_PIN) != X_MIN_ENDSTOP_INVERTING)); #endif - if((_endstop & _old_endstop & _BV(X_AXIS)) && (current_block->steps_x.wide > 0)) { + if((_endstop & _old_endstop & _BV(X_AXIS)) && (current_block->steps[X_AXIS].wide > 0)) { #ifdef VERBOSE_CHECK_HIT_ENDSTOPS endstops_trigsteps[X_AXIS] = count_position[X_AXIS]; #endif //VERBOSE_CHECK_HIT_ENDSTOPS @@ -505,7 +505,7 @@ FORCE_INLINE void stepper_check_endstops() // Normal homing SET_BIT_TO(_endstop, X_AXIS + 4, (READ(X_MAX_PIN) != X_MAX_ENDSTOP_INVERTING)); #endif - if((_endstop & _old_endstop & _BV(X_AXIS + 4)) && (current_block->steps_x.wide > 0)){ + if((_endstop & _old_endstop & _BV(X_AXIS + 4)) && (current_block->steps[X_AXIS].wide > 0)){ #ifdef VERBOSE_CHECK_HIT_ENDSTOPS endstops_trigsteps[X_AXIS] = count_position[X_AXIS]; #endif //VERBOSE_CHECK_HIT_ENDSTOPS @@ -529,7 +529,7 @@ FORCE_INLINE void stepper_check_endstops() // Normal homing SET_BIT_TO(_endstop, Y_AXIS, (READ(Y_MIN_PIN) != Y_MIN_ENDSTOP_INVERTING)); #endif - if((_endstop & _old_endstop & _BV(Y_AXIS)) && (current_block->steps_y.wide > 0)) { + if((_endstop & _old_endstop & _BV(Y_AXIS)) && (current_block->steps[Y_AXIS].wide > 0)) { #ifdef VERBOSE_CHECK_HIT_ENDSTOPS endstops_trigsteps[Y_AXIS] = count_position[Y_AXIS]; #endif //VERBOSE_CHECK_HIT_ENDSTOPS @@ -546,7 +546,7 @@ FORCE_INLINE void stepper_check_endstops() // Normal homing SET_BIT_TO(_endstop, Y_AXIS + 4, (READ(Y_MAX_PIN) != Y_MAX_ENDSTOP_INVERTING)); #endif - if((_endstop & _old_endstop & _BV(Y_AXIS + 4)) && (current_block->steps_y.wide > 0)){ + if((_endstop & _old_endstop & _BV(Y_AXIS + 4)) && (current_block->steps[Y_AXIS].wide > 0)){ #ifdef VERBOSE_CHECK_HIT_ENDSTOPS endstops_trigsteps[Y_AXIS] = count_position[Y_AXIS]; #endif //VERBOSE_CHECK_HIT_ENDSTOPS @@ -571,7 +571,7 @@ FORCE_INLINE void stepper_check_endstops() #else SET_BIT_TO(_endstop, Z_AXIS, (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING)); #endif //TMC2130_SG_HOMING - if((_endstop & _old_endstop & _BV(Z_AXIS)) && (current_block->steps_z.wide > 0)) { + if((_endstop & _old_endstop & _BV(Z_AXIS)) && (current_block->steps[Z_AXIS].wide > 0)) { #ifdef VERBOSE_CHECK_HIT_ENDSTOPS endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS]; #endif //VERBOSE_CHECK_HIT_ENDSTOPS @@ -593,7 +593,7 @@ FORCE_INLINE void stepper_check_endstops() #else SET_BIT_TO(_endstop, Z_AXIS + 4, (READ(Z_MAX_PIN) != Z_MAX_ENDSTOP_INVERTING)); #endif //TMC2130_SG_HOMING - if((_endstop & _old_endstop & _BV(Z_AXIS + 4)) && (current_block->steps_z.wide > 0)) { + if((_endstop & _old_endstop & _BV(Z_AXIS + 4)) && (current_block->steps[Z_AXIS].wide > 0)) { #ifdef VERBOSE_CHECK_HIT_ENDSTOPS endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS]; #endif //VERBOSE_CHECK_HIT_ENDSTOPS @@ -646,7 +646,7 @@ FORCE_INLINE void stepper_tick_lowres() for (uint8_t i=0; i < step_loops; ++ i) { // Take multiple steps per interrupt (For high speed moves) MSerial.checkRx(); // Check for serial chars. // Step in X axis - counter_x.lo += current_block->steps_x.lo; + counter_x.lo += current_block->steps[X_AXIS].lo; if (counter_x.lo > 0) { STEP_NC_HI(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN @@ -660,7 +660,7 @@ FORCE_INLINE void stepper_tick_lowres() #endif //DEBUG_XSTEP_DUP_PIN } // Step in Y axis - counter_y.lo += current_block->steps_y.lo; + counter_y.lo += current_block->steps[Y_AXIS].lo; if (counter_y.lo > 0) { STEP_NC_HI(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN @@ -674,7 +674,7 @@ FORCE_INLINE void stepper_tick_lowres() #endif //DEBUG_YSTEP_DUP_PIN } // Step in Z axis - counter_z.lo += current_block->steps_z.lo; + counter_z.lo += current_block->steps[Z_AXIS].lo; if (counter_z.lo > 0) { STEP_NC_HI(Z_AXIS); counter_z.lo -= current_block->step_event_count.lo; @@ -682,7 +682,7 @@ FORCE_INLINE void stepper_tick_lowres() STEP_NC_LO(Z_AXIS); } // Step in E axis - counter_e.lo += current_block->steps_e.lo; + counter_e.lo += current_block->steps[E_AXIS].lo; if (counter_e.lo > 0) { #ifndef LIN_ADVANCE STEP_NC_HI(E_AXIS); @@ -708,7 +708,7 @@ FORCE_INLINE void stepper_tick_highres() for (uint8_t i=0; i < step_loops; ++ i) { // Take multiple steps per interrupt (For high speed moves) MSerial.checkRx(); // Check for serial chars. // Step in X axis - counter_x.wide += current_block->steps_x.wide; + counter_x.wide += current_block->steps[X_AXIS].wide; if (counter_x.wide > 0) { STEP_NC_HI(X_AXIS); #ifdef DEBUG_XSTEP_DUP_PIN @@ -722,7 +722,7 @@ FORCE_INLINE void stepper_tick_highres() #endif //DEBUG_XSTEP_DUP_PIN } // Step in Y axis - counter_y.wide += current_block->steps_y.wide; + counter_y.wide += current_block->steps[Y_AXIS].wide; if (counter_y.wide > 0) { STEP_NC_HI(Y_AXIS); #ifdef DEBUG_YSTEP_DUP_PIN @@ -736,7 +736,7 @@ FORCE_INLINE void stepper_tick_highres() #endif //DEBUG_YSTEP_DUP_PIN } // Step in Z axis - counter_z.wide += current_block->steps_z.wide; + counter_z.wide += current_block->steps[Z_AXIS].wide; if (counter_z.wide > 0) { STEP_NC_HI(Z_AXIS); counter_z.wide -= current_block->step_event_count.wide; @@ -744,7 +744,7 @@ FORCE_INLINE void stepper_tick_highres() STEP_NC_LO(Z_AXIS); } // Step in E axis - counter_e.wide += current_block->steps_e.wide; + counter_e.wide += current_block->steps[E_AXIS].wide; if (counter_e.wide > 0) { #ifndef LIN_ADVANCE STEP_NC_HI(E_AXIS); From 5d880919f8085f7230d98e8855dc4f8f1eed166f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 22 Jul 2023 13:39:18 +0000 Subject: [PATCH 115/148] Align comment --- Firmware/planner.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/planner.h b/Firmware/planner.h index ae90428e9..cd1cd2d34 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -71,7 +71,7 @@ union dda_usteps_t typedef struct { // Fields used by the bresenham algorithm for tracing the line // steps_x.y,z, step_event_count, acceleration_rate, direction_bits and active_extruder are set by plan_buffer_line(). - dda_isteps_t steps[NUM_AXIS]; // Step count along each axis + dda_isteps_t steps[NUM_AXIS]; // Step count along each axis dda_usteps_t step_event_count; // The number of step events required to complete this block uint32_t acceleration_rate; // The acceleration rate used for acceleration calculation unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h) From dece5d268f4c4a77e2b2e54ea252d7a4444663ea Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 20 Aug 2022 16:00:03 +0200 Subject: [PATCH 116/148] Consider any lcd_custom_command to be "ACTIVE" All custom commands are transitory and eventually switch back to Idle state by themselves. It doesn't make any sense to explicitly check for Layer1Cal: any non-idle state is active by design. Fix this check in the main menu. This is probably incomplete (Layer1Cal is incorrectly used in several other places). --- Firmware/Marlin_main.cpp | 3 +-- Firmware/ultralcd.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f9d6680fd..cf72c0bf3 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -513,9 +513,8 @@ bool __attribute__((noinline)) printJobOngoing() { bool __attribute__((noinline)) printer_active() { return printJobOngoing() || isPrintPaused - || (custom_message_type == CustomMsg::TempCal) || saved_printing - || (lcd_commands_type == LcdCommands::Layer1Cal) + || (lcd_commands_type != LcdCommands::Idle) || MMU2::mmu2.MMU_PRINT_SAVED() || homing_flag || mesh_bed_leveling_flag; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4bfc26538..25a193f3a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5179,9 +5179,9 @@ static void lcd_main_menu() } #endif #ifdef SDSUPPORT //!@todo SDSUPPORT undefined creates several issues in source code - if (card.cardOK || lcd_commands_type == LcdCommands::Layer1Cal) { + if (card.cardOK || lcd_commands_type != LcdCommands::Idle) { if (!card.isFileOpen()) { - if (!usb_timer.running() && (lcd_commands_type != LcdCommands::Layer1Cal)) { + if (!usb_timer.running() && (lcd_commands_type == LcdCommands::Idle)) { bMain=true; // flag ('fake parameter') for 'lcd_sdcard_menu()' function MENU_ITEM_SUBMENU_P(_T(MSG_CARD_MENU), lcd_sdcard_menu); } @@ -5198,7 +5198,7 @@ static void lcd_main_menu() } #endif //SDSUPPORT - if(!isPrintPaused && !printJobOngoing() && (lcd_commands_type != LcdCommands::Layer1Cal)) { + if(!isPrintPaused && !printJobOngoing() && (lcd_commands_type == LcdCommands::Idle)) { if (!farm_mode) { const int8_t sheet = eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)); const int8_t nextSheet = eeprom_next_initialized_sheet(sheet); @@ -5208,7 +5208,7 @@ static void lcd_main_menu() } } - if ( ! ( printJobOngoing() || (lcd_commands_type == LcdCommands::Layer1Cal || Stopped) ) ) { + if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || Stopped) ) { if (MMU2::mmu2.Enabled()) { if(!MMU2::mmu2.FindaDetectsFilament() && !fsensor.getFilamentPresent()) { // The MMU 'Load filament' state machine will reject the command if any @@ -5239,7 +5239,7 @@ static void lcd_main_menu() if(!isPrintPaused) MENU_ITEM_SUBMENU_P(_T(MSG_CALIBRATION), lcd_calibration_menu); } - if (!usb_timer.running() && (lcd_commands_type != LcdCommands::Layer1Cal)) { + if (!usb_timer.running() && (lcd_commands_type == LcdCommands::Idle)) { MENU_ITEM_SUBMENU_P(_i("Statistics"), lcd_menu_statistics);////MSG_STATISTICS c=18 } From 170dddfd7174ed3320571b54fc751d1d3445b128 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 20 Aug 2022 16:04:29 +0200 Subject: [PATCH 117/148] Set/clear loading_flag also during unload --- Firmware/ultralcd.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 25a193f3a..e193a30f7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1867,7 +1867,10 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad } if (eFilamentAction == FilamentAction::UnLoad) - enquecommand_P(MSG_M702); // unload filament + { + loading_flag = true; + enquecommand_P(MSG_M702); // unload filament + } } break; case FilamentAction::MmuLoad: @@ -4886,6 +4889,7 @@ void unload_filament(float unloadLength) lcd_setstatuspgm(MSG_WELCOME); custom_message_type = CustomMsg::Status; eFilamentAction = FilamentAction::None; + loading_flag = false; } /// @brief Set print fan speed From e3fd6a4902d2c5315a79bed2778a45a89bfc27c0 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 20 Aug 2022 16:04:57 +0200 Subject: [PATCH 118/148] Do not allow filament actions while an existing one is taking place --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e193a30f7..1bd2e47d9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5212,7 +5212,7 @@ static void lcd_main_menu() } } - if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || Stopped) ) { + if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || loading_flag || Stopped ) ) { if (MMU2::mmu2.Enabled()) { if(!MMU2::mmu2.FindaDetectsFilament() && !fsensor.getFilamentPresent()) { // The MMU 'Load filament' state machine will reject the command if any From 05b536947b6c8f65cdca68297be105a0337f31c4 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 20 Aug 2022 16:09:10 +0200 Subject: [PATCH 119/148] Refuse to start a SD print until filament loading is complete Do not blidnly clear the loading_flag, check for it! Just disallowing the SD menu while loading is being performed is not sufficient, since the menu can be entered also by inserting card while loading is taking place. This is also nicer in behavior, as we allow to navigate the SD card while loading. --- Firmware/ultralcd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1bd2e47d9..f6b9b244c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6917,7 +6917,8 @@ static bool check_file(const char* filename) { static void menu_action_sdfile(const char* filename) { - loading_flag = false; + if(loading_flag) return; + char cmd[30]; char* c; bool result = true; From 074b5d380f98ccdd3bea1f169c9df6c7ebebd3b6 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 13 Dec 2022 13:35:45 +0100 Subject: [PATCH 120/148] Consistently replace loading_flag with eFilamentAction Remove loading_flag and check for eFilamentAction instead which already flags both load/unload (in addition to mmu actions). Correctly transition from AutoLoad to Load as soon as the operation cannot be cancelled anymore as opposed to resetting it. --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 4 +--- Firmware/Prusa_farm.cpp | 6 ++--- Firmware/ultralcd.cpp | 52 ++++++++++++++++++++-------------------- 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 66abdaf12..24ce1c9bb 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -278,7 +278,6 @@ extern uint32_t start_pause_print; // milliseconds extern ShortTimer usb_timer; extern bool processing_tcode; extern bool homing_flag; -extern bool loading_flag; extern uint32_t total_filament_used; // mm/100 or 10um /// @brief Save print statistics to EEPROM diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index cf72c0bf3..fa2d3b8e8 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -179,7 +179,6 @@ bool mesh_bed_leveling_flag = false; uint32_t total_filament_used; HeatingStatus heating_status; -bool loading_flag = false; int fan_edge_counter[2]; int fan_speed[2]; @@ -3579,13 +3578,12 @@ void gcode_M701(float fastLoadLength, uint8_t mmuSlotIndex){ Sound_MakeCustom(50, 500, false); - if (!farm_mode && loading_flag) { + if (!farm_mode && (eFilamentAction != FilamentAction::None)) { lcd_load_filament_color_check(); } lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(MSG_WELCOME); - loading_flag = false; custom_message_type = CustomMsg::Status; } diff --git a/Firmware/Prusa_farm.cpp b/Firmware/Prusa_farm.cpp index 5ff6a8c66..88a3ba481 100644 --- a/Firmware/Prusa_farm.cpp +++ b/Firmware/Prusa_farm.cpp @@ -242,7 +242,7 @@ void prusa_statistics(uint8_t _message) { else if (isPrintPaused) { prusa_statistics_case0(14); } - else if (IS_SD_PRINTING || loading_flag) { + else if (IS_SD_PRINTING || (eFilamentAction != FilamentAction::None)) { prusa_statistics_case0(4); } else { @@ -270,7 +270,7 @@ void prusa_statistics(uint8_t _message) { status_number = 3; farm_timer = 1; - if (IS_SD_PRINTING || loading_flag) { + if (IS_SD_PRINTING || (eFilamentAction != FilamentAction::None)) { SERIAL_ECHO('{'); prusa_stat_printerstatus(4); prusa_stat_farm_number(); @@ -374,7 +374,7 @@ void prusa_statistics_update_from_status_screen() { switch (farm_timer) { case 8: prusa_statistics(21); - if(loading_flag) + if(eFilamentAction != FilamentAction::None) prusa_statistics(22); break; case 5: diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f6b9b244c..00d02349c 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1796,10 +1796,10 @@ switch(eFilamentAction) switch(eFilamentAction) { case FilamentAction::AutoLoad: - eFilamentAction=FilamentAction::None; // i.e. non-autoLoad + // loading no longer cancellable + eFilamentAction = FilamentAction::Load; // FALLTHRU case FilamentAction::Load: - loading_flag=true; enquecommand_P(MSG_M701); // load filament break; case FilamentAction::UnLoad: @@ -1818,6 +1818,17 @@ switch(eFilamentAction) } } +void mFilamentBack() +{ + if (eFilamentAction == FilamentAction::AutoLoad || + eFilamentAction == FilamentAction::Preheat || + eFilamentAction == FilamentAction::Lay1Cal) + { + // filament action has been cancelled + eFilamentAction = FilamentAction::None; + } +} + void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) { uint8_t nLevel; @@ -1860,17 +1871,16 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) { nLevel = bFilamentPreheatState ? 1 : 2; menu_back(nLevel); - if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) - { - loading_flag = true; + + if (eFilamentAction == FilamentAction::AutoLoad) { + // loading no longer cancellable + eFilamentAction = FilamentAction::Load; + } + + if (eFilamentAction == FilamentAction::Load) enquecommand_P(MSG_M701); // load filament - if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad - } - if (eFilamentAction == FilamentAction::UnLoad) - { - loading_flag = true; + else if (eFilamentAction == FilamentAction::UnLoad) enquecommand_P(MSG_M702); // unload filament - } } break; case FilamentAction::MmuLoad: @@ -1971,7 +1981,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) menu_back(); } menu_back(); - if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad + mFilamentBack(); } } } @@ -2047,16 +2057,6 @@ static void mFilamentItem_PVB() mFilamentItem(PVB_PREHEAT_HOTEND_TEMP, PVB_PREHEAT_HPB_TEMP); } -void mFilamentBack() -{ - if (eFilamentAction == FilamentAction::AutoLoad || - eFilamentAction == FilamentAction::Preheat || - eFilamentAction == FilamentAction::Lay1Cal) - { - eFilamentAction = FilamentAction::None; // i.e. non-autoLoad - } -} - void lcd_generic_preheat_menu() { MENU_BEGIN(); @@ -3681,13 +3681,14 @@ static void lcd_wizard_load() { // NOTE: a full screen message showing which filament is being inserted // is performed by M701. For this reason MSG_LOADING_FILAMENT is not // used here when a MMU is used. + eFilamentAction = FilamentAction::MmuLoad; } else { lcd_show_fullscreen_message_and_wait_P( _i("Please insert filament into the extruder, then press the knob to load it.")); ////MSG_WIZARD_LOAD_FILAMENT c=20 r=6 lcd_update_enable(false); lcd_clear(); lcd_puts_at_P(0, 2, _T(MSG_LOADING_FILAMENT)); - loading_flag = true; + eFilamentAction = FilamentAction::Load; } // When MMU is disabled P parameter is ignored @@ -4889,7 +4890,6 @@ void unload_filament(float unloadLength) lcd_setstatuspgm(MSG_WELCOME); custom_message_type = CustomMsg::Status; eFilamentAction = FilamentAction::None; - loading_flag = false; } /// @brief Set print fan speed @@ -5212,7 +5212,7 @@ static void lcd_main_menu() } } - if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || loading_flag || Stopped ) ) { + if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || (eFilamentAction != FilamentAction::None) || Stopped ) ) { if (MMU2::mmu2.Enabled()) { if(!MMU2::mmu2.FindaDetectsFilament() && !fsensor.getFilamentPresent()) { // The MMU 'Load filament' state machine will reject the command if any @@ -6917,7 +6917,7 @@ static bool check_file(const char* filename) { static void menu_action_sdfile(const char* filename) { - if(loading_flag) return; + if(eFilamentAction != FilamentAction::None) return; char cmd[30]; char* c; From 3485c2046484d6f622bb48a0319db7e3e1e87bf6 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 13 Dec 2022 13:42:34 +0100 Subject: [PATCH 121/148] Improve FilamentAction comments --- Firmware/ultralcd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 541215853..a2ae49cee 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -175,17 +175,17 @@ void lcd_hw_setup_menu(void); // NOT static due to using ins enum class FilamentAction : uint_least8_t { - None, //!< 'none' state is used as flag for (filament) autoLoad (i.e. opposite for 'autoLoad' state) + None, // no filament action is taking place Load, - AutoLoad, + AutoLoad, // triggered by insertion, cancellable until it transitions to Load UnLoad, MmuLoad, MmuUnLoad, MmuEject, MmuCut, MmuLoadingTest, - Preheat, - Lay1Cal, + Preheat, // triggered by preheat (cancellable) + Lay1Cal, // triggered by 1st layer calibration (cancellable) }; extern FilamentAction eFilamentAction; From 5288d615f8d5d01857952d865beb1812ddc3b774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 10:57:00 +0000 Subject: [PATCH 122/148] optimisation: lcd avoid streams Author: leptun Change in memory: Flash: -124 bytes SRAM: 0 bytes --- Firmware/Dcodes.cpp | 2 +- Firmware/Marlin_main.cpp | 5 +++-- Firmware/bootapp.c | 14 ++++++-------- Firmware/language.c | 4 ++-- Firmware/language.h | 2 +- Firmware/pat9125.cpp | 4 ---- Firmware/tmc2130.cpp | 13 +++++-------- Firmware/tmc2130.h | 2 +- Firmware/ultralcd.cpp | 4 ++-- 9 files changed, 21 insertions(+), 29 deletions(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index a172e7d60..f01697029 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -822,7 +822,7 @@ void dcode_2130() } else if (strcmp(strchr_pointer + 7, "wave") == 0) { - tmc2130_get_wave(axis, 0, stdout); + tmc2130_get_wave(axis, 0); } } else if (strchr_pointer[1+5] == '!') diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f9d6680fd..6c5a99daa 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -898,7 +898,8 @@ void update_sec_lang_from_external_flash() if (lang_get_header(lang, &header, &src_addr)) { lcd_puts_at_P(1,0,PSTR("Language update")); - for (uint8_t i = 0; i < state; i++) fputc('.', lcdout); + for (uint8_t i = 0; i < state; i++) + lcd_print('.'); _delay(100); boot_reserved = (boot_reserved & 0xF8) | ((state + 1) & 0x07); if ((state * LANGBOOT_BLOCKSIZE) < header.size) @@ -1441,7 +1442,7 @@ void setup() uint16_t sec_lang_code = lang_get_code(1); uint16_t ui = _SEC_LANG_TABLE; //table pointer printf_P(_n("lang_selected=%d\nlang_table=0x%04x\nSEC_LANG_CODE=0x%04x (%c%c)\n"), lang_selected, ui, sec_lang_code, sec_lang_code >> 8, sec_lang_code & 0xff); - lang_print_sec_lang(uartout); + lang_print_sec_lang(); #endif //DEBUG_SEC_LANG #endif //(LANG_MODE != 0) diff --git a/Firmware/bootapp.c b/Firmware/bootapp.c index 78614d8f7..67ab5b32c 100644 --- a/Firmware/bootapp.c +++ b/Firmware/bootapp.c @@ -6,19 +6,17 @@ #include -extern FILE _uartout; -#define uartout (&_uartout) extern void softReset(); void bootapp_print_vars(void) { - fprintf_P(uartout, PSTR("boot_src_addr =0x%08lx\n"), boot_src_addr); - fprintf_P(uartout, PSTR("boot_dst_addr =0x%08lx\n"), boot_dst_addr); - fprintf_P(uartout, PSTR("boot_copy_size =0x%04x\n"), boot_copy_size); - fprintf_P(uartout, PSTR("boot_reserved =0x%02x\n"), boot_reserved); - fprintf_P(uartout, PSTR("boot_app_flags =0x%02x\n"), boot_app_flags); - fprintf_P(uartout, PSTR("boot_app_magic =0x%08lx\n"), boot_app_magic); + printf_P(PSTR("boot_src_addr =0x%08lx\n"), boot_src_addr); + printf_P(PSTR("boot_dst_addr =0x%08lx\n"), boot_dst_addr); + printf_P(PSTR("boot_copy_size =0x%04x\n"), boot_copy_size); + printf_P(PSTR("boot_reserved =0x%02x\n"), boot_reserved); + printf_P(PSTR("boot_app_flags =0x%02x\n"), boot_app_flags); + printf_P(PSTR("boot_app_magic =0x%08lx\n"), boot_app_magic); } diff --git a/Firmware/language.c b/Firmware/language.c index ca54a221a..e0aa162dc 100644 --- a/Firmware/language.c +++ b/Firmware/language.c @@ -276,7 +276,7 @@ const char* lang_get_sec_lang_str_by_id(uint16_t id) return ui + pgm_read_word(((uint16_t*)(ui + 16 + id * 2))); //read relative offset and return calculated pointer } -uint16_t lang_print_sec_lang(FILE* out) +uint16_t lang_print_sec_lang() { printf_P(_n("&_SEC_LANG = 0x%04x\n"), &_SEC_LANG); printf_P(_n("sizeof(_SEC_LANG) = 0x%04x\n"), sizeof(_SEC_LANG)); @@ -298,7 +298,7 @@ uint16_t lang_print_sec_lang(FILE* out) puts_P(_n(" strings:\n")); uint16_t ui = _SEC_LANG_TABLE; //table pointer for (ui = 0; ui < _lt_count; ui++) - fprintf_P(out, _n(" %3d %S\n"), ui, lang_get_sec_lang_str_by_id(ui)); + printf_P(_n(" %3d %S\n"), ui, lang_get_sec_lang_str_by_id(ui)); return _lt_count; } #endif //DEBUG_SEC_LANG diff --git a/Firmware/language.h b/Firmware/language.h index db5c53a9d..57d770cf8 100644 --- a/Firmware/language.h +++ b/Firmware/language.h @@ -171,7 +171,7 @@ extern uint8_t lang_is_selected(void); #ifdef DEBUG_SEC_LANG extern const char* lang_get_sec_lang_str_by_id(uint16_t id); -extern uint16_t lang_print_sec_lang(FILE* out); +extern uint16_t lang_print_sec_lang(); #endif //DEBUG_SEC_LANG extern void lang_boot_update_start(uint8_t lang); diff --git a/Firmware/pat9125.cpp b/Firmware/pat9125.cpp index e62ee1b46..e15907628 100644 --- a/Firmware/pat9125.cpp +++ b/Firmware/pat9125.cpp @@ -100,10 +100,6 @@ static void pat9125_wr_reg(uint8_t addr, uint8_t data); static uint8_t pat9125_wr_reg_verify(uint8_t addr, uint8_t data); static uint8_t pat9125_wr_seq(const uint8_t* seq); -extern FILE _uartout; -#define uartout (&_uartout) - - uint8_t pat9125_probe() { #if defined(PAT9125_SWI2C) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index ee804c5f2..620779e47 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -855,7 +855,7 @@ void tmc2130_goto_step(uint8_t axis, uint8_t step, uint8_t dir, uint16_t delay_u } } -void tmc2130_get_wave(uint8_t axis, uint8_t* data, FILE* stream) +void tmc2130_get_wave(uint8_t axis, uint8_t* data) { uint8_t pwr = tmc2130_get_pwr(axis); tmc2130_set_pwr(axis, 0); @@ -867,13 +867,10 @@ void tmc2130_get_wave(uint8_t axis, uint8_t* data, FILE* stream) uint32_t val = tmc2130_rd_MSCURACT(axis); uint16_t mscnt = tmc2130_rd_MSCNT(axis); int curA = (val & 0xff) | ((val << 7) & 0x8000); - if (stream) - { - if (mscnt == i) - fprintf_P(stream, PSTR("%d\t%d\n"), i, curA); - else //TODO - remove this check - fprintf_P(stream, PSTR("!! (i=%d MSCNT=%d)\n"), i, mscnt); - } + if (mscnt == i) + printf_P(PSTR("%d\t%d\n"), i, curA); + else //TODO - remove this check + printf_P(PSTR("!! (i=%d MSCNT=%d)\n"), i, mscnt); if (data) *(data++) = curA; tmc2130_do_step(axis); delayMicroseconds(100); diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h index 6760fcaef..fe60f0516 100644 --- a/Firmware/tmc2130.h +++ b/Firmware/tmc2130.h @@ -139,7 +139,7 @@ extern void tmc2130_set_dir(uint8_t axis, uint8_t dir); extern void tmc2130_do_step(uint8_t axis); extern void tmc2130_do_steps(uint8_t axis, uint16_t steps, uint8_t dir, uint16_t delay_us); extern void tmc2130_goto_step(uint8_t axis, uint8_t step, uint8_t dir, uint16_t delay_us, uint16_t microstep_resolution); -extern void tmc2130_get_wave(uint8_t axis, uint8_t* data, FILE* stream); +extern void tmc2130_get_wave(uint8_t axis, uint8_t* data); extern void tmc2130_set_wave(uint8_t axis, uint8_t amp, uint8_t fac1000); extern bool tmc2130_home_calibrate(uint8_t axis); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4bfc26538..3627bd71d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3335,7 +3335,7 @@ static void lcd_crash_mode_info() if ((tim + 1000) < _millis()) { lcd_clear(); - fputs_P(_i("Crash detection can\nbe turned on only in\nNormal mode"), lcdout);////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 + lcd_puts_P(_i("Crash detection can\nbe turned on only in\nNormal mode"));////MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 tim = _millis(); } menu_back_if_clicked(); @@ -3348,7 +3348,7 @@ static void lcd_crash_mode_info2() if ((tim + 1000) < _millis()) { lcd_clear(); - fputs_P(_i("WARNING:\nCrash detection\ndisabled in\nStealth mode"), lcdout);////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 + lcd_puts_P(_i("WARNING:\nCrash detection\ndisabled in\nStealth mode"));////MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 tim = _millis(); } menu_back_if_clicked(); From 6623d45af9adf3d1e401c269b49ac81ecd241490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:04:12 +0000 Subject: [PATCH 123/148] optimisation: Tighter LCD timing Author: leptun Change in memory: Flash: -14 bytes SRAM: 0 bytes --- Firmware/lcd.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index 39d84c4bf..5715ca97d 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -129,18 +129,17 @@ static void lcd_send(uint8_t data, uint8_t flags, uint16_t duration = LCD_DEFAUL _delay_us(5); lcd_writebits(data); #ifndef LCD_8BIT - if (!(flags & LCD_HALF_FLAG)) - { - _delay_us(LCD_DEFAULT_DELAY); - lcd_writebits(data<<4); + if (!(flags & LCD_HALF_FLAG)) { + // _delay_us(LCD_DEFAULT_DELAY); // should not be needed when sending a two nibble instruction. + lcd_writebits((data << 4) | (data >> 4)); //force efficient swap opcode even though the lower nibble is ignored in this case } #endif delayMicroseconds(duration); } -static void lcd_command(uint8_t value, uint16_t delayExtra = 0) +static void lcd_command(uint8_t value, uint16_t duration = LCD_DEFAULT_DELAY) { - lcd_send(value, LOW, LCD_DEFAULT_DELAY + delayExtra); + lcd_send(value, LOW, duration); } static void lcd_write(uint8_t value) From 7029af05fad3baeb5103cff26a14b853037a89b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:05:27 +0000 Subject: [PATCH 124/148] optimisation: reduce code size in pid_extruder() Author: leptun Change in memory: Flash: -14 bytes SRAM: 0 bytes --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3627bd71d..f14674737 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2686,7 +2686,7 @@ void pid_extruder() lcd_puts_at_P(0, 0, _i("Set temperature:"));////MSG_SET_TEMPERATURE c=20 pid_temp += lcd_encoder; if (pid_temp > HEATER_0_MAXTEMP) pid_temp = HEATER_0_MAXTEMP; - if (pid_temp < HEATER_0_MINTEMP) pid_temp = HEATER_0_MINTEMP; + else if (pid_temp < HEATER_0_MINTEMP) pid_temp = HEATER_0_MINTEMP; lcd_encoder = 0; lcd_set_cursor(1, 2); lcd_printf_P(PSTR("%3u"), pid_temp); From 53c8bfa9285a5da6afd06f808361f045755de374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:06:37 +0000 Subject: [PATCH 125/148] cleanup: remove unused variable No change in memory --- Firmware/planner.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 20bf76522..f9b804725 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -690,7 +690,6 @@ void plan_set_position_curposXYZE(){ plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); } -float junction_deviation = 0.1; // Add a new linear movement to the buffer. steps_x, _y and _z is the absolute position in // mm. Microseconds specify how many microseconds the move should take to perform. To aid acceleration // calculation the caller must also provide the physical length of the line in millimeters. From c090868fa23bc52d4ce622cd95a60b4a4f850028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:08:32 +0000 Subject: [PATCH 126/148] optimisation: reduce code size in M907 Change in memory: Flash: -4 bytes SRAM: 0 bytes --- 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 6c5a99daa..d06d42392 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8065,7 +8065,7 @@ Sigma_Exit: SERIAL_ECHOLNPGM(", M907 E ignored"); continue; } - long cur_mA = code_value_long(); + float cur_mA = code_value(); uint8_t val = tmc2130_cur2val(cur_mA); currents[i].iHold = val; currents[i].iRun = val; From 9d15a4e63b4fc458176942be37f465ee10ff907b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:15:58 +0000 Subject: [PATCH 127/148] optimisation: reduce code size in M916, M917, M918 Change in memory: Flash: -148 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 48 +++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d06d42392..738b7988c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8210,8 +8210,8 @@ Sigma_Exit: break; /*! - ### M916 - Set TMC2130 Stallguard sensitivity threshold M916: Set TMC2130 Stallguard sensitivity threshold - Not active in default, only if `TMC2130_SERVICE_CODES_M910_M918` is defined in source code. + ### M916 - Set TMC2130 Stallguard sensitivity threshold M916: Set TMC2130 Stallguard sensitivity threshold + Not active in default, only if `TMC2130_SERVICE_CODES_M910_M918` is defined in source code. #### Usage M916 [ X | Y | Z | E ] @@ -8222,20 +8222,20 @@ Sigma_Exit: - `Z` - Z stepper driver stallguard sensitivity threshold value - `E` - Extruder stepper driver stallguard sensitivity threshold value */ - case 916: + case 916: { - if (code_seen('X')) tmc2130_sg_thr[X_AXIS] = code_value(); - if (code_seen('Y')) tmc2130_sg_thr[Y_AXIS] = code_value(); - if (code_seen('Z')) tmc2130_sg_thr[Z_AXIS] = code_value(); - if (code_seen('E')) tmc2130_sg_thr[E_AXIS] = code_value(); - for (uint8_t a = X_AXIS; a <= E_AXIS; a++) - printf_P(_N("tmc2130_sg_thr[%c]=%d\n"), "XYZE"[a], tmc2130_sg_thr[a]); + for (uint8_t axis = 0; axis < NUM_AXIS; axis++) { + if (code_seen(axis_codes[axis])) { + tmc2130_sg_thr[axis] = code_value_uint8(); + } + printf_P(_N("tmc2130_sg_thr[%c]=%d\n"), "XYZE"[axis], tmc2130_sg_thr[axis]); + } } break; /*! - ### M917 - Set TMC2130 PWM amplitude offset (pwm_ampl) M917: Set TMC2130 PWM amplitude offset (pwm_ampl) - Not active in default, only if `TMC2130_SERVICE_CODES_M910_M918` is defined in source code. + ### M917 - Set TMC2130 PWM amplitude offset (pwm_ampl) M917: Set TMC2130 PWM amplitude offset (pwm_ampl) + Not active in default, only if `TMC2130_SERVICE_CODES_M910_M918` is defined in source code. #### Usage M917 [ X | Y | Z | E ] @@ -8246,18 +8246,19 @@ Sigma_Exit: - `Z` - Z stepper driver PWM amplitude offset value - `E` - Extruder stepper driver PWM amplitude offset value */ - case 917: + case 917: { - if (code_seen('X')) tmc2130_set_pwm_ampl(0, code_value()); - if (code_seen('Y')) tmc2130_set_pwm_ampl(1, code_value()); - if (code_seen('Z')) tmc2130_set_pwm_ampl(2, code_value()); - if (code_seen('E')) tmc2130_set_pwm_ampl(3, code_value()); + for (uint8_t axis = 0; axis < NUM_AXIS; axis++) { + if (code_seen(axis_codes[axis])) { + tmc2130_set_pwm_ampl(axis, code_value_uint8()); + } + } } break; /*! - ### M918 - Set TMC2130 PWM amplitude gradient (pwm_grad) M918: Set TMC2130 PWM amplitude gradient (pwm_grad) - Not active in default, only if `TMC2130_SERVICE_CODES_M910_M918` is defined in source code. + ### M918 - Set TMC2130 PWM amplitude gradient (pwm_grad) M918: Set TMC2130 PWM amplitude gradient (pwm_grad) + Not active in default, only if `TMC2130_SERVICE_CODES_M910_M918` is defined in source code. #### Usage M918 [ X | Y | Z | E ] @@ -8268,12 +8269,13 @@ Sigma_Exit: - `Z` - Z stepper driver PWM amplitude gradient value - `E` - Extruder stepper driver PWM amplitude gradient value */ - case 918: + case 918: { - if (code_seen('X')) tmc2130_set_pwm_grad(0, code_value()); - if (code_seen('Y')) tmc2130_set_pwm_grad(1, code_value()); - if (code_seen('Z')) tmc2130_set_pwm_grad(2, code_value()); - if (code_seen('E')) tmc2130_set_pwm_grad(3, code_value()); + for (uint8_t axis = 0; axis < NUM_AXIS; axis++) { + if (code_seen(axis_codes[axis])) { + tmc2130_set_pwm_grad(axis, code_value_uint8()); + } + } } break; From fa6aae60dbf93be17ea5ef8ac6e73dbcbc374948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:21:59 +0000 Subject: [PATCH 128/148] optimisation: use SERIAL_PROTOCOLLN Change in memory: Flash: -12 bytes SRAM: 0 bytes --- 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 738b7988c..f29fbeeac 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4597,8 +4597,7 @@ void process_commands() SERIAL_PROTOCOLPGM(" Y: "); SERIAL_PROTOCOL(current_position[Y_AXIS]); SERIAL_PROTOCOLPGM(" Z: "); - SERIAL_PROTOCOL(current_position[Z_AXIS]); - SERIAL_PROTOCOLPGM("\n"); + SERIAL_PROTOCOLLN(current_position[Z_AXIS]); clean_up_after_endstop_move(l_feedmultiply); } @@ -7217,8 +7216,7 @@ Sigma_Exit: SERIAL_PROTOCOLPGM(" i:"); SERIAL_PROTOCOL(unscalePID_i(cs.Ki)); SERIAL_PROTOCOLPGM(" d:"); - SERIAL_PROTOCOL(unscalePID_d(cs.Kd)); - SERIAL_PROTOCOLLN(); + SERIAL_PROTOCOLLN(unscalePID_d(cs.Kd)); } break; #endif //PIDTEMP From 5b8813bf181336fb4b98e2cbaf91ef9f06131391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 14:12:43 +0000 Subject: [PATCH 129/148] tmc2130: fix octoprint error --- Firmware/tmc2130.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 620779e47..10ffb14c6 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -870,7 +870,7 @@ void tmc2130_get_wave(uint8_t axis, uint8_t* data) if (mscnt == i) printf_P(PSTR("%d\t%d\n"), i, curA); else //TODO - remove this check - printf_P(PSTR("!! (i=%d MSCNT=%d)\n"), i, mscnt); + printf_P(PSTR("! (i=%d MSCNT=%d)\n"), i, mscnt); if (data) *(data++) = curA; tmc2130_do_step(axis); delayMicroseconds(100); From ff1cd2bfb2b591249bc51223ea18dce2f5618dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 14:15:45 +0000 Subject: [PATCH 130/148] dcodes: fix build when DEBUG_DCODES is enabled --- Firmware/Dcodes.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index f01697029..695dc437b 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -3,6 +3,7 @@ #include "Configuration.h" #include "language.h" #include "cmdqueue.h" +#include "util.h" #include #include From 21faa52aabd959f512e5fec9b2e1e34edd16078d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 23 May 2023 18:37:06 +0000 Subject: [PATCH 131/148] Rename axis_steps_per_unit to axis_steps_per_mm --- Firmware/ConfigurationStore.cpp | 6 +-- Firmware/ConfigurationStore.h | 2 +- Firmware/Dcodes.cpp | 8 ++-- Firmware/Filament_sensor.cpp | 2 +- Firmware/Marlin_main.cpp | 44 +++++++++++----------- Firmware/mesh_bed_calibration.cpp | 6 +-- Firmware/planner.cpp | 62 +++++++++++++++---------------- Firmware/power_panic.cpp | 6 +-- Firmware/stepper.cpp | 8 ++-- Firmware/ultralcd.cpp | 6 +-- 10 files changed, 75 insertions(+), 75 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 2b3971a8c..3c439df68 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -30,7 +30,7 @@ void Config_PrintSettings(uint8_t level) "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%.2f X%.2f Y%.2f Z%.2f E%.2f\n" "%SHome offset (mm):\n%S M206 X%.2f Y%.2f Z%.2f\n" ), - echomagic, echomagic, cs.axis_steps_per_unit[X_AXIS], cs.axis_steps_per_unit[Y_AXIS], cs.axis_steps_per_unit[Z_AXIS], cs.axis_steps_per_unit[E_AXIS], + echomagic, echomagic, cs.axis_steps_per_mm[X_AXIS], cs.axis_steps_per_mm[Y_AXIS], cs.axis_steps_per_mm[Z_AXIS], cs.axis_steps_per_mm[E_AXIS], echomagic, echomagic, cs.axis_ustep_resolution[X_AXIS], cs.axis_ustep_resolution[Y_AXIS], cs.axis_ustep_resolution[Z_AXIS], cs.axis_ustep_resolution[E_AXIS], echomagic, echomagic, cs.max_feedrate_normal[X_AXIS], cs.max_feedrate_normal[Y_AXIS], cs.max_feedrate_normal[Z_AXIS], cs.max_feedrate_normal[E_AXIS], echomagic, echomagic, cs.max_feedrate_silent[X_AXIS], cs.max_feedrate_silent[Y_AXIS], cs.max_feedrate_silent[Z_AXIS], cs.max_feedrate_silent[E_AXIS], @@ -48,7 +48,7 @@ void Config_PrintSettings(uint8_t level) "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%.2f X%.2f Y%.2f Z%.2f E%.2f\n" "%SHome offset (mm):\n%S M206 X%.2f Y%.2f Z%.2f\n" ), - echomagic, echomagic, cs.axis_steps_per_unit[X_AXIS], cs.axis_steps_per_unit[Y_AXIS], cs.axis_steps_per_unit[Z_AXIS], cs.axis_steps_per_unit[E_AXIS], + echomagic, echomagic, cs.axis_steps_per_mm[X_AXIS], cs.axis_steps_per_mm[Y_AXIS], cs.axis_steps_per_mm[Z_AXIS], cs.axis_steps_per_mm[E_AXIS], echomagic, echomagic, max_feedrate[X_AXIS], max_feedrate[Y_AXIS], max_feedrate[Z_AXIS], max_feedrate[E_AXIS], echomagic, echomagic, max_acceleration_units_per_sq_second[X_AXIS], max_acceleration_units_per_sq_second[Y_AXIS], max_acceleration_units_per_sq_second[Z_AXIS], max_acceleration_units_per_sq_second[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, @@ -114,7 +114,7 @@ void Config_PrintSettings(uint8_t level) static_assert (EXTRUDERS == 1, "ConfigurationStore M500_conf not implemented for more extruders, fix filament_size array size."); static_assert (NUM_AXIS == 4, "ConfigurationStore M500_conf not implemented for more axis." - "Fix axis_steps_per_unit max_feedrate_normal max_acceleration_units_per_sq_second_normal max_jerk max_feedrate_silent" + "Fix axis_steps_per_mm max_feedrate_normal max_acceleration_units_per_sq_second_normal max_jerk max_feedrate_silent" " max_acceleration_units_per_sq_second_silent array size."); #ifdef ENABLE_AUTO_BED_LEVELING static_assert (false, "zprobe_zoffset was not initialized in printers in field to -(Z_PROBE_OFFSET_FROM_EXTRUDER), so it contains" diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index f3c61ce8c..de6bc0645 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -9,7 +9,7 @@ typedef struct { char version[4]; - float axis_steps_per_unit[4]; + float axis_steps_per_mm[4]; float max_feedrate_normal[4]; unsigned long max_acceleration_units_per_sq_second_normal[4]; float acceleration; //!< Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index 695dc437b..755a9a212 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -193,7 +193,7 @@ void dcode_3() #if 0 extern float current_temperature_pinda; -extern float axis_steps_per_unit[NUM_AXIS]; +extern float axis_steps_per_mm[NUM_AXIS]; #define LOG(args...) printf(args) @@ -479,7 +479,7 @@ void dcode_8() { uint16_t offs = 0; if (i > 0) offs = eeprom_read_word(((uint16_t*)EEPROM_PROBE_TEMP_SHIFT) + (i - 1)); - float foffs = ((float)offs) / cs.axis_steps_per_unit[Z_AXIS]; + float foffs = ((float)offs) / cs.axis_steps_per_mm[Z_AXIS]; offs = 1000 * foffs; printf_P(PSTR("temp_pinda=%dC temp_shift=%dum\n"), 35 + i * 5, offs); } @@ -844,9 +844,9 @@ void dcode_2130() uint16_t res_new = tmc2130_mres2usteps(mres); tmc2130_set_res(axis, res_new); if (res_new > res) - cs.axis_steps_per_unit[axis] *= (res_new / res); + cs.axis_steps_per_mm[axis] *= (res_new / res); else - cs.axis_steps_per_unit[axis] /= (res / res_new); + cs.axis_steps_per_mm[axis] /= (res / res_new); } } else if (strncmp(strchr_pointer + 7, "wave", 4) == 0) diff --git a/Firmware/Filament_sensor.cpp b/Firmware/Filament_sensor.cpp index 9736d6343..02a82cf56 100644 --- a/Firmware/Filament_sensor.cpp +++ b/Firmware/Filament_sensor.cpp @@ -379,7 +379,7 @@ void PAT9125_sensor::init() { settings_init(); // also sets the state to State::initializing - calcChunkSteps(cs.axis_steps_per_unit[E_AXIS]); // for jam detection + calcChunkSteps(cs.axis_steps_per_mm[E_AXIS]); // for jam detection if (!pat9125_init()) { deinit(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f29fbeeac..35ff46d80 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3386,13 +3386,13 @@ void gcode_M114() SERIAL_PROTOCOL(current_position[E_AXIS]); SERIAL_PROTOCOLRPGM(_n(" Count X: "));////MSG_COUNT_X - SERIAL_PROTOCOL(float(st_get_position(X_AXIS)) / cs.axis_steps_per_unit[X_AXIS]); + SERIAL_PROTOCOL(float(st_get_position(X_AXIS)) / cs.axis_steps_per_mm[X_AXIS]); SERIAL_PROTOCOLPGM(" Y:"); - SERIAL_PROTOCOL(float(st_get_position(Y_AXIS)) / cs.axis_steps_per_unit[Y_AXIS]); + SERIAL_PROTOCOL(float(st_get_position(Y_AXIS)) / cs.axis_steps_per_mm[Y_AXIS]); SERIAL_PROTOCOLPGM(" Z:"); - SERIAL_PROTOCOL(float(st_get_position(Z_AXIS)) / cs.axis_steps_per_unit[Z_AXIS]); + SERIAL_PROTOCOL(float(st_get_position(Z_AXIS)) / cs.axis_steps_per_mm[Z_AXIS]); SERIAL_PROTOCOLPGM(" E:"); - SERIAL_PROTOCOLLN(float(st_get_position(E_AXIS)) / cs.axis_steps_per_unit[E_AXIS]); + SERIAL_PROTOCOLLN(float(st_get_position(E_AXIS)) / cs.axis_steps_per_mm[E_AXIS]); } #if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))) @@ -3777,7 +3777,7 @@ static void gcode_M861_print_pinda_cal_eeprom() { for (uint8_t i = 0; i < 6; i++) { if(i > 0) { usteps = eeprom_read_word((uint16_t*) EEPROM_PROBE_TEMP_SHIFT + (i - 1)); - mm = ((float)usteps) / cs.axis_steps_per_unit[Z_AXIS]; + mm = ((float)usteps) / cs.axis_steps_per_mm[Z_AXIS]; SERIAL_PROTOCOL(i - 1); } else { SERIAL_PROTOCOLRPGM(MSG_NA); @@ -3885,7 +3885,7 @@ extern uint8_t st_backlash_y; //! or use S to specify an inactivity timeout, after which the steppers will be disabled. S0 to disable the timeout. //!@n M85 - Set inactivity shutdown timer with parameter S. To disable set zero (default) //!@n M86 - Set safety timer expiration time with parameter S; M86 S0 will disable safety timer -//!@n M92 - Set axis_steps_per_unit - same syntax as G92 +//!@n M92 - Set axis_steps_per_mm - same syntax as G92 //!@n M104 - Set extruder target temp //!@n M105 - Read current temp //!@n M106 - Fan on @@ -4566,7 +4566,7 @@ void process_commands() // The following code correct the Z height difference from z-probe position and hotend tip position. // The Z height on homing is measured by Z-Probe, but the probe is quite far from the hotend. // When the bed is uneven, this height must be corrected. - real_z = float(st_get_position(Z_AXIS))/cs.axis_steps_per_unit[Z_AXIS]; //get the real Z (since the auto bed leveling is already correcting the plane) + real_z = float(st_get_position(Z_AXIS))/cs.axis_steps_per_mm[Z_AXIS]; //get the real Z (since the auto bed leveling is already correcting the plane) x_tmp = current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER; y_tmp = current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER; z_tmp = current_position[Z_AXIS]; @@ -4829,7 +4829,7 @@ void process_commands() lcd_temp_cal_show_result(find_z_result); break; } - z_shift = (int)((current_position[Z_AXIS] - zero_z)*cs.axis_steps_per_unit[Z_AXIS]); + z_shift = (int)((current_position[Z_AXIS] - zero_z)*cs.axis_steps_per_mm[Z_AXIS]); printf_P(_N("\nPINDA temperature: %.1f Z shift (mm): %.3f"), current_temperature_pinda, current_position[Z_AXIS] - zero_z); @@ -4914,7 +4914,7 @@ void process_commands() plan_buffer_line_curposXYZE(3000 / 60); st_synchronize(); find_bed_induction_sensor_point_z(-1.f); - z_shift = (int)((current_position[Z_AXIS] - zero_z)*cs.axis_steps_per_unit[Z_AXIS]); + z_shift = (int)((current_position[Z_AXIS] - zero_z)*cs.axis_steps_per_mm[Z_AXIS]); printf_P(_N("\nTemperature: %d Z shift (mm): %.3f\n"), t_c, current_position[Z_AXIS] - zero_z); @@ -6331,18 +6331,18 @@ Sigma_Exit: if(i == E_AXIS) { // E float value = code_value(); if(value < 20.0) { - float factor = cs.axis_steps_per_unit[i] / value; // increase e constants if M92 E14 is given for netfab. + float factor = cs.axis_steps_per_mm[i] / value; // increase e constants if M92 E14 is given for netfab. cs.max_jerk[E_AXIS] *= factor; max_feedrate[i] *= factor; max_acceleration_steps_per_s2[i] *= factor; } - cs.axis_steps_per_unit[i] = value; + cs.axis_steps_per_mm[i] = value; #if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125) fsensor.init(); #endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125) } else { - cs.axis_steps_per_unit[i] = code_value(); + cs.axis_steps_per_mm[i] = code_value(); } } } @@ -6708,7 +6708,7 @@ Sigma_Exit: #if 0 // Not used for Sprinter/grbl gen6 case 202: // M202 for(int8_t i=0; i < NUM_AXIS; i++) { - if(code_seen(axis_codes[i])) axis_travel_steps_per_sqr_second[i] = code_value() * cs.axis_steps_per_unit[i]; + if(code_seen(axis_codes[i])) axis_travel_steps_per_sqr_second[i] = code_value() * cs.axis_steps_per_mm[i]; } break; #endif @@ -7720,7 +7720,7 @@ Sigma_Exit: } if (code_seen('Z')){ z_val = code_value(); - zraw = z_val*cs.axis_steps_per_unit[Z_AXIS]; + zraw = z_val*cs.axis_steps_per_mm[Z_AXIS]; if ((zraw < Z_BABYSTEP_MIN) || (zraw > Z_BABYSTEP_MAX)) { SERIAL_PROTOCOLLNPGM(" Z VALUE OUT OF RANGE"); @@ -7731,7 +7731,7 @@ Sigma_Exit: else { zraw = eeprom_read_word(reinterpret_cast(&(EEPROM_Sheets_base->s[iSel].z_offset))); - z_val = ((float)zraw/cs.axis_steps_per_unit[Z_AXIS]); + z_val = ((float)zraw/cs.axis_steps_per_mm[Z_AXIS]); } if (code_seen('L')) @@ -8321,13 +8321,13 @@ Sigma_Exit: if (res_new > res) { uint16_t fac = (res_new / res); - cs.axis_steps_per_unit[i] *= fac; + cs.axis_steps_per_mm[i] *= fac; position[i] *= fac; } else { uint16_t fac = (res / res_new); - cs.axis_steps_per_unit[i] /= fac; + cs.axis_steps_per_mm[i] /= fac; position[i] /= fac; } #if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125) @@ -9387,8 +9387,8 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s float oldepos=current_position[E_AXIS]; float oldedes=destination[E_AXIS]; plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], - destination[E_AXIS]+EXTRUDER_RUNOUT_EXTRUDE*EXTRUDER_RUNOUT_ESTEPS/cs.axis_steps_per_unit[E_AXIS], - EXTRUDER_RUNOUT_SPEED/60.*EXTRUDER_RUNOUT_ESTEPS/cs.axis_steps_per_unit[E_AXIS]); + destination[E_AXIS]+EXTRUDER_RUNOUT_EXTRUDE*EXTRUDER_RUNOUT_ESTEPS/cs.axis_steps_per_mm[E_AXIS], + EXTRUDER_RUNOUT_SPEED/60.*EXTRUDER_RUNOUT_ESTEPS/cs.axis_steps_per_mm[E_AXIS]); current_position[E_AXIS]=oldepos; destination[E_AXIS]=oldedes; plan_set_e_position(oldepos); @@ -10209,10 +10209,10 @@ static void temp_compensation_apply() { if (target_temperature_bed % 10 == 0 && target_temperature_bed >= 60 && target_temperature_bed <= 100) { i_add = (target_temperature_bed - 60) / 10; z_shift = eeprom_read_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + i_add); - z_shift_mm = z_shift / cs.axis_steps_per_unit[Z_AXIS]; + z_shift_mm = z_shift / cs.axis_steps_per_mm[Z_AXIS]; }else { //interpolation - z_shift_mm = temp_comp_interpolation(target_temperature_bed) / cs.axis_steps_per_unit[Z_AXIS]; + z_shift_mm = temp_comp_interpolation(target_temperature_bed) / cs.axis_steps_per_mm[Z_AXIS]; } printf_P(_N("\nZ shift applied:%.3f\n"), z_shift_mm); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] - z_shift_mm, current_position[E_AXIS], homing_feedrate[Z_AXIS] / 40); @@ -10303,7 +10303,7 @@ float temp_compensation_pinda_thermistor_offset(float temperature_pinda) { if (!eeprom_read_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE)) return 0; if (!calibration_status_pinda()) return 0; - return temp_comp_interpolation(temperature_pinda) / cs.axis_steps_per_unit[Z_AXIS]; + return temp_comp_interpolation(temperature_pinda) / cs.axis_steps_per_mm[Z_AXIS]; } #endif //PINDA_THERMISTOR diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 8c82acc91..39dbc5c06 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3055,7 +3055,7 @@ void babystep_load() SERIAL_ECHO(", current Z: "); SERIAL_ECHO(current_position[Z_AXIS]); SERIAL_ECHO("correction: "); - SERIAL_ECHO(float(babystepLoadZ) / float(axis_steps_per_unit[Z_AXIS])); + SERIAL_ECHO(float(babystepLoadZ) / float(axis_steps_per_mm[Z_AXIS])); SERIAL_ECHOLN(""); #endif } @@ -3064,12 +3064,12 @@ void babystep_load() void babystep_apply() { babystep_load(); - shift_z(- float(babystepLoadZ) / float(cs.axis_steps_per_unit[Z_AXIS])); + shift_z(- float(babystepLoadZ) / float(cs.axis_steps_per_mm[Z_AXIS])); } void babystep_undo() { - shift_z(float(babystepLoadZ) / float(cs.axis_steps_per_unit[Z_AXIS])); + shift_z(float(babystepLoadZ) / float(cs.axis_steps_per_mm[Z_AXIS])); babystepLoadZ = 0; } diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index f9b804725..766d383bc 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -94,7 +94,7 @@ matrix_3x3 plan_bed_level_matrix = { #endif // #ifdef ENABLE_AUTO_BED_LEVELING // The current position of the tool in absolute steps -long position[NUM_AXIS]; //rescaled from extern when axis_steps_per_unit are changed by gcode +long position[NUM_AXIS]; //rescaled from extern when axis_steps_per_mm are changed by gcode static float previous_speed[NUM_AXIS]; // Speed of previous path line segment static float previous_nominal_speed; // Nominal speed of previous path line segment static float previous_safe_speed; // Exit speed limited by a jerk to full halt of a previous last segment. @@ -628,9 +628,9 @@ void planner_reset_position() else { float t = float(step_events_completed) / float(current_block->step_event_count); float vec[3] = { - current_block->steps_x / cs.axis_steps_per_unit[X_AXIS], - current_block->steps_y / cs.axis_steps_per_unit[Y_AXIS], - current_block->steps_z / cs.axis_steps_per_unit[Z_AXIS] + current_block->steps_x / cs.axis_steps_per_mm[X_AXIS], + current_block->steps_y / cs.axis_steps_per_mm[Y_AXIS], + current_block->steps_z / cs.axis_steps_per_mm[Z_AXIS] }; float pos1[3], pos2[3]; for (int8_t i = 0; i < 3; ++ i) { @@ -809,18 +809,18 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate // Calculate target position in absolute steps //this should be done after the wait, because otherwise a M92 code within the gcode disrupts this calculation somehow long target[4]; - target[X_AXIS] = lround(x*cs.axis_steps_per_unit[X_AXIS]); - target[Y_AXIS] = lround(y*cs.axis_steps_per_unit[Y_AXIS]); + target[X_AXIS] = lround(x*cs.axis_steps_per_mm[X_AXIS]); + target[Y_AXIS] = lround(y*cs.axis_steps_per_mm[Y_AXIS]); #ifdef MESH_BED_LEVELING if (mbl.active){ - target[Z_AXIS] = lround((z+mbl.get_z(x, y))*cs.axis_steps_per_unit[Z_AXIS]); + target[Z_AXIS] = lround((z+mbl.get_z(x, y))*cs.axis_steps_per_mm[Z_AXIS]); }else{ - target[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]); + target[Z_AXIS] = lround(z*cs.axis_steps_per_mm[Z_AXIS]); } #else - target[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]); + target[Z_AXIS] = lround(z*cs.axis_steps_per_mm[Z_AXIS]); #endif // ENABLE_MESH_BED_LEVELING - target[E_AXIS] = lround(e*cs.axis_steps_per_unit[E_AXIS]); + target[E_AXIS] = lround(e*cs.axis_steps_per_mm[E_AXIS]); // Calculate subtraction to re-use result in many places // This saves memory and speeds up calculations @@ -844,7 +844,7 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate } #ifdef PREVENT_LENGTHY_EXTRUDE - if(labs(de) > cs.axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH) + if(labs(de) > cs.axis_steps_per_mm[E_AXIS]*EXTRUDE_MAXLENGTH) { position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part #ifdef LIN_ADVANCE @@ -928,17 +928,17 @@ Having the real displacement of the head, we can calculate the total movement le */ #ifndef COREXY float delta_mm[4]; - delta_mm[X_AXIS] = dx / cs.axis_steps_per_unit[X_AXIS]; - delta_mm[Y_AXIS] = dy / cs.axis_steps_per_unit[Y_AXIS]; + delta_mm[X_AXIS] = dx / cs.axis_steps_per_mm[X_AXIS]; + delta_mm[Y_AXIS] = dy / cs.axis_steps_per_mm[Y_AXIS]; #else float delta_mm[6]; - delta_mm[X_HEAD] = dx / cs.axis_steps_per_unit[X_AXIS]; - delta_mm[Y_HEAD] = dy / cs.axis_steps_per_unit[Y_AXIS]; - delta_mm[X_AXIS] = (dx + dy) / cs.axis_steps_per_unit[X_AXIS]; - delta_mm[Y_AXIS] = (dx - dy) / cs.axis_steps_per_unit[Y_AXIS]; + delta_mm[X_HEAD] = dx / cs.axis_steps_per_mm[X_AXIS]; + delta_mm[Y_HEAD] = dy / cs.axis_steps_per_mm[Y_AXIS]; + delta_mm[X_AXIS] = (dx + dy) / cs.axis_steps_per_mm[X_AXIS]; + delta_mm[Y_AXIS] = (dx - dy) / cs.axis_steps_per_mm[Y_AXIS]; #endif - delta_mm[Z_AXIS] = dz / cs.axis_steps_per_unit[Z_AXIS]; - delta_mm[E_AXIS] = de / cs.axis_steps_per_unit[E_AXIS]; + delta_mm[Z_AXIS] = dz / cs.axis_steps_per_mm[Z_AXIS]; + delta_mm[E_AXIS] = de / cs.axis_steps_per_mm[E_AXIS]; if ( block->steps[X_AXIS].wide <=dropsegments && block->steps[Y_AXIS].wide <=dropsegments && block->steps[Z_AXIS].wide <=dropsegments ) { block->millimeters = fabs(delta_mm[E_AXIS]); @@ -1206,14 +1206,14 @@ Having the real displacement of the head, we can calculate the total movement le if (block->use_advance_lead) { // calculate the compression ratio for the segment (the required advance steps are computed // during trapezoid planning) - float adv_comp = extruder_advance_K * e_D_ratio * cs.axis_steps_per_unit[E_AXIS]; // (step/(mm/s)) + float adv_comp = extruder_advance_K * e_D_ratio * cs.axis_steps_per_mm[E_AXIS]; // (step/(mm/s)) block->adv_comp = adv_comp / block->speed_factor; // step/(step/min) float advance_speed; if (e_D_ratio > 0) - advance_speed = (extruder_advance_K * e_D_ratio * block->acceleration * cs.axis_steps_per_unit[E_AXIS]); + advance_speed = (extruder_advance_K * e_D_ratio * block->acceleration * cs.axis_steps_per_mm[E_AXIS]); else - advance_speed = cs.max_jerk[E_AXIS] * cs.axis_steps_per_unit[E_AXIS]; + advance_speed = cs.max_jerk[E_AXIS] * cs.axis_steps_per_mm[E_AXIS]; // to save more space we avoid another copy of calc_timer and go through slow division, but we // still need to replicate the *exact* same step grouping policy (see below) @@ -1314,16 +1314,16 @@ void plan_set_position(float x, float y, float z, const float &e) world2machine(x, y); - position[X_AXIS] = lround(x*cs.axis_steps_per_unit[X_AXIS]); - position[Y_AXIS] = lround(y*cs.axis_steps_per_unit[Y_AXIS]); + position[X_AXIS] = lround(x*cs.axis_steps_per_mm[X_AXIS]); + position[Y_AXIS] = lround(y*cs.axis_steps_per_mm[Y_AXIS]); #ifdef MESH_BED_LEVELING position[Z_AXIS] = mbl.active ? - lround((z+mbl.get_z(x, y))*cs.axis_steps_per_unit[Z_AXIS]) : - lround(z*cs.axis_steps_per_unit[Z_AXIS]); + lround((z+mbl.get_z(x, y))*cs.axis_steps_per_mm[Z_AXIS]) : + lround(z*cs.axis_steps_per_mm[Z_AXIS]); #else - position[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]); + position[Z_AXIS] = lround(z*cs.axis_steps_per_mm[Z_AXIS]); #endif // ENABLE_MESH_BED_LEVELING - position[E_AXIS] = lround(e*cs.axis_steps_per_unit[E_AXIS]); + position[E_AXIS] = lround(e*cs.axis_steps_per_mm[E_AXIS]); #ifdef LIN_ADVANCE position_float[X_AXIS] = x; position_float[Y_AXIS] = y; @@ -1341,7 +1341,7 @@ void plan_set_z_position(const float &z) #ifdef LIN_ADVANCE position_float[Z_AXIS] = z; #endif - position[Z_AXIS] = lround(z*cs.axis_steps_per_unit[Z_AXIS]); + position[Z_AXIS] = lround(z*cs.axis_steps_per_mm[Z_AXIS]); st_set_position(position); } @@ -1350,7 +1350,7 @@ void plan_set_e_position(const float &e) #ifdef LIN_ADVANCE position_float[E_AXIS] = e; #endif - position[E_AXIS] = lround(e*cs.axis_steps_per_unit[E_AXIS]); + position[E_AXIS] = lround(e*cs.axis_steps_per_mm[E_AXIS]); st_set_e_position(position[E_AXIS]); } @@ -1370,7 +1370,7 @@ void set_extrude_min_temp(int temp) void reset_acceleration_rates() { for(int8_t i=0; i < NUM_AXIS; i++) - max_acceleration_steps_per_s2[i] = max_acceleration_units_per_sq_second[i] * cs.axis_steps_per_unit[i]; + max_acceleration_steps_per_s2[i] = max_acceleration_units_per_sq_second[i] * cs.axis_steps_per_mm[i]; } #ifdef TMC2130 diff --git a/Firmware/power_panic.cpp b/Firmware/power_panic.cpp index 935915355..8e0897e4b 100644 --- a/Firmware/power_panic.cpp +++ b/Firmware/power_panic.cpp @@ -146,7 +146,7 @@ void uvlo_() { uint16_t z_res = tmc2130_get_res(Z_AXIS); uint16_t z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); current_position[Z_AXIS] += float(1024 - z_microsteps) - / (z_res * cs.axis_steps_per_unit[Z_AXIS]) + / (z_res * cs.axis_steps_per_mm[Z_AXIS]) + UVLO_Z_AXIS_SHIFT; plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS]/60); st_synchronize(); @@ -244,7 +244,7 @@ static void uvlo_tiny() { planner_abort_hard(); // Allow for small roundoffs to be ignored - if(fabs(current_position[Z_AXIS] - eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z))) >= 1.f/cs.axis_steps_per_unit[Z_AXIS]) + if(fabs(current_position[Z_AXIS] - eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z))) >= 1.f/cs.axis_steps_per_mm[Z_AXIS]) { // Clean the input command queue, inhibit serial processing using saved_printing cmdqueue_reset(); @@ -260,7 +260,7 @@ static void uvlo_tiny() { uint16_t z_res = tmc2130_get_res(Z_AXIS); uint16_t z_microsteps = tmc2130_rd_MSCNT(Z_AXIS); current_position[Z_AXIS] += float(1024 - z_microsteps) - / (z_res * cs.axis_steps_per_unit[Z_AXIS]) + / (z_res * cs.axis_steps_per_mm[Z_AXIS]) + UVLO_TINY_Z_AXIS_SHIFT; plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS]/60); st_synchronize(); diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index 1d1658d0e..002372743 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -192,15 +192,15 @@ void checkHitEndstops() SERIAL_ECHO_START; SERIAL_ECHORPGM(MSG_ENDSTOPS_HIT); if(endstop_hit & _BV(X_AXIS)) { - SERIAL_ECHOPAIR(" X:",(float)endstops_trigsteps[X_AXIS]/cs.axis_steps_per_unit[X_AXIS]); + SERIAL_ECHOPAIR(" X:",(float)endstops_trigsteps[X_AXIS]/cs.axis_steps_per_mm[X_AXIS]); // LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("X"))); } if(endstop_hit & _BV(Y_AXIS)) { - SERIAL_ECHOPAIR(" Y:",(float)endstops_trigsteps[Y_AXIS]/cs.axis_steps_per_unit[Y_AXIS]); + SERIAL_ECHOPAIR(" Y:",(float)endstops_trigsteps[Y_AXIS]/cs.axis_steps_per_mm[Y_AXIS]); // LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("Y"))); } if(endstop_hit & _BV(Z_AXIS)) { - SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/cs.axis_steps_per_unit[Z_AXIS]); + SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/cs.axis_steps_per_mm[Z_AXIS]); // LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT),PSTR("Z"))); } SERIAL_ECHOLN(""); @@ -1348,7 +1348,7 @@ void st_get_position_xy(long &x, long &y) float st_get_position_mm(uint8_t axis) { float steper_position_in_steps = st_get_position(axis); - return steper_position_in_steps / cs.axis_steps_per_unit[axis]; + return steper_position_in_steps / cs.axis_steps_per_mm[axis]; } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f14674737..720cd9714 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2562,7 +2562,7 @@ static void lcd_babystep_z() if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) _md->babystepMemZ = 0; - _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_unit[Z_AXIS]; + _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_mm[Z_AXIS]; lcd_draw_update = 1; //SERIAL_ECHO("Z baby step: "); //SERIAL_ECHO(_md->babystepMem[2]); @@ -2576,7 +2576,7 @@ static void lcd_babystep_z() else if (_md->babystepMemZ > Z_BABYSTEP_MAX) _md->babystepMemZ = Z_BABYSTEP_MAX; //0 else babystepsTodoZadd(lcd_encoder); - _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_unit[Z_AXIS]; + _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_mm[Z_AXIS]; _delay(50); lcd_encoder = 0; lcd_draw_update = 1; @@ -3572,7 +3572,7 @@ void lcd_first_layer_calibration_reset() char sheet_name[sizeof(Sheet::name)]; eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name)); lcd_set_cursor(0, 0); - float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS]; + float offset = static_cast(eeprom_read_word(reinterpret_cast(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_mm[Z_AXIS]; lcd_printf_P(_i("Sheet %.7s\nZ offset: %+1.3fmm\n%cContinue\n%cReset"),////MSG_SHEET_OFFSET c=20 r=4 sheet_name, offset, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' ');// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. From 8689a28776b5b7ae7b1ea2fa30d045583df81061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 23 May 2023 18:40:42 +0000 Subject: [PATCH 132/148] Rename max_acceleration_units_per_sq_second to max_acceleration_mm_per_s2 --- Firmware/ConfigurationStore.cpp | 22 +++++++++++----------- Firmware/ConfigurationStore.h | 4 ++-- Firmware/Marlin_main.cpp | 6 +++--- Firmware/la10compat.cpp | 2 +- Firmware/planner.cpp | 8 ++++---- Firmware/planner.h | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 3c439df68..d5a5d10da 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -34,8 +34,8 @@ void Config_PrintSettings(uint8_t level) echomagic, echomagic, cs.axis_ustep_resolution[X_AXIS], cs.axis_ustep_resolution[Y_AXIS], cs.axis_ustep_resolution[Z_AXIS], cs.axis_ustep_resolution[E_AXIS], echomagic, echomagic, cs.max_feedrate_normal[X_AXIS], cs.max_feedrate_normal[Y_AXIS], cs.max_feedrate_normal[Z_AXIS], cs.max_feedrate_normal[E_AXIS], echomagic, echomagic, cs.max_feedrate_silent[X_AXIS], cs.max_feedrate_silent[Y_AXIS], cs.max_feedrate_silent[Z_AXIS], cs.max_feedrate_silent[E_AXIS], - echomagic, echomagic, cs.max_acceleration_units_per_sq_second_normal[X_AXIS], cs.max_acceleration_units_per_sq_second_normal[Y_AXIS], cs.max_acceleration_units_per_sq_second_normal[Z_AXIS], cs.max_acceleration_units_per_sq_second_normal[E_AXIS], - echomagic, echomagic, cs.max_acceleration_units_per_sq_second_silent[X_AXIS], cs.max_acceleration_units_per_sq_second_silent[Y_AXIS], cs.max_acceleration_units_per_sq_second_silent[Z_AXIS], cs.max_acceleration_units_per_sq_second_silent[E_AXIS], + echomagic, echomagic, cs.max_acceleration_mm_per_s2_normal[X_AXIS], cs.max_acceleration_mm_per_s2_normal[Y_AXIS], cs.max_acceleration_mm_per_s2_normal[Z_AXIS], cs.max_acceleration_mm_per_s2_normal[E_AXIS], + echomagic, echomagic, cs.max_acceleration_mm_per_s2_silent[X_AXIS], cs.max_acceleration_mm_per_s2_silent[Y_AXIS], cs.max_acceleration_mm_per_s2_silent[Z_AXIS], cs.max_acceleration_mm_per_s2_silent[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.minsegmenttime, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS] @@ -50,7 +50,7 @@ void Config_PrintSettings(uint8_t level) ), echomagic, echomagic, cs.axis_steps_per_mm[X_AXIS], cs.axis_steps_per_mm[Y_AXIS], cs.axis_steps_per_mm[Z_AXIS], cs.axis_steps_per_mm[E_AXIS], echomagic, echomagic, max_feedrate[X_AXIS], max_feedrate[Y_AXIS], max_feedrate[Z_AXIS], max_feedrate[E_AXIS], - echomagic, echomagic, max_acceleration_units_per_sq_second[X_AXIS], max_acceleration_units_per_sq_second[Y_AXIS], max_acceleration_units_per_sq_second[Z_AXIS], max_acceleration_units_per_sq_second[E_AXIS], + echomagic, echomagic, max_acceleration_mm_per_s2[X_AXIS], max_acceleration_mm_per_s2[Y_AXIS], max_acceleration_mm_per_s2[Z_AXIS], max_acceleration_mm_per_s2[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.minsegmenttime, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS] @@ -114,8 +114,8 @@ void Config_PrintSettings(uint8_t level) static_assert (EXTRUDERS == 1, "ConfigurationStore M500_conf not implemented for more extruders, fix filament_size array size."); static_assert (NUM_AXIS == 4, "ConfigurationStore M500_conf not implemented for more axis." - "Fix axis_steps_per_mm max_feedrate_normal max_acceleration_units_per_sq_second_normal max_jerk max_feedrate_silent" - " max_acceleration_units_per_sq_second_silent array size."); + "Fix axis_steps_per_mm max_feedrate_normal max_acceleration_mm_per_s2_normal max_jerk max_feedrate_silent" + " max_acceleration_mm_per_s2_silent array size."); #ifdef ENABLE_AUTO_BED_LEVELING static_assert (false, "zprobe_zoffset was not initialized in printers in field to -(Z_PROBE_OFFSET_FROM_EXTRUDER), so it contains" "0.0, if this is not acceptable, increment EEPROM_VERSION to force use default_conf"); @@ -210,9 +210,9 @@ bool Config_RetrieveSettings() // Initialize the travel_acceleration in eeprom if not already eeprom_init_default_float(&EEPROM_M500_base->travel_acceleration, pgm_read_float(&default_conf.travel_acceleration)); - // Initialize the max_feedrate_silent and max_acceleration_units_per_sq_second_silent in eeprom if not already + // Initialize the max_feedrate_silent and max_acceleration_mm_per_s2_silent in eeprom if not already eeprom_init_default_block(&EEPROM_M500_base->max_feedrate_silent, sizeof(EEPROM_M500_base->max_feedrate_silent), default_conf.max_feedrate_silent); - eeprom_init_default_block(&EEPROM_M500_base->max_acceleration_units_per_sq_second_silent, sizeof(EEPROM_M500_base->max_acceleration_units_per_sq_second_silent), default_conf.max_acceleration_units_per_sq_second_silent); + eeprom_init_default_block(&EEPROM_M500_base->max_acceleration_mm_per_s2_silent, sizeof(EEPROM_M500_base->max_acceleration_mm_per_s2_silent), default_conf.max_acceleration_mm_per_s2_silent); // load the CS to RAM eeprom_read_block(reinterpret_cast(&cs), reinterpret_cast(EEPROM_M500_base), sizeof(cs)); @@ -225,10 +225,10 @@ bool Config_RetrieveSettings() cs.max_feedrate_normal[j] = NORMAL_MAX_FEEDRATE_XY; if (cs.max_feedrate_silent[j] > SILENT_MAX_FEEDRATE_XY) cs.max_feedrate_silent[j] = SILENT_MAX_FEEDRATE_XY; - if (cs.max_acceleration_units_per_sq_second_normal[j] > NORMAL_MAX_ACCEL_XY) - cs.max_acceleration_units_per_sq_second_normal[j] = NORMAL_MAX_ACCEL_XY; - if (cs.max_acceleration_units_per_sq_second_silent[j] > SILENT_MAX_ACCEL_XY) - cs.max_acceleration_units_per_sq_second_silent[j] = SILENT_MAX_ACCEL_XY; + if (cs.max_acceleration_mm_per_s2_normal[j] > NORMAL_MAX_ACCEL_XY) + cs.max_acceleration_mm_per_s2_normal[j] = NORMAL_MAX_ACCEL_XY; + if (cs.max_acceleration_mm_per_s2_silent[j] > SILENT_MAX_ACCEL_XY) + cs.max_acceleration_mm_per_s2_silent[j] = SILENT_MAX_ACCEL_XY; } if(cs.axis_ustep_resolution[X_AXIS] == 0xff){ cs.axis_ustep_resolution[X_AXIS] = TMC2130_USTEPS_XY; } diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index de6bc0645..08a27413c 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -11,7 +11,7 @@ typedef struct char version[4]; float axis_steps_per_mm[4]; float max_feedrate_normal[4]; - unsigned long max_acceleration_units_per_sq_second_normal[4]; + unsigned long max_acceleration_mm_per_s2_normal[4]; float acceleration; //!< Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX float retract_acceleration; //!< mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX float minimumfeedrate; @@ -36,7 +36,7 @@ typedef struct bool volumetric_enabled; float filament_size[1]; //!< cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder. float max_feedrate_silent[4]; //!< max speeds for silent mode - unsigned long max_acceleration_units_per_sq_second_silent[4]; + unsigned long max_acceleration_mm_per_s2_silent[4]; unsigned char axis_ustep_resolution[4]; float travel_acceleration; //!< travel acceleration mm/s^2 // Arc Interpolation Settings, configurable via M214 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 35ff46d80..e025dd743 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6695,10 +6695,10 @@ Sigma_Exit: if (val_silent > SILENT_MAX_ACCEL_XY) val_silent = SILENT_MAX_ACCEL_XY; } - cs.max_acceleration_units_per_sq_second_normal[i] = val; - cs.max_acceleration_units_per_sq_second_silent[i] = val_silent; + cs.max_acceleration_mm_per_s2_normal[i] = val; + cs.max_acceleration_mm_per_s2_silent[i] = val_silent; #else //TMC2130 - max_acceleration_units_per_sq_second[i] = val; + max_acceleration_mm_per_s2[i] = val; #endif //TMC2130 } } diff --git a/Firmware/la10compat.cpp b/Firmware/la10compat.cpp index d729186fe..060bf2391 100644 --- a/Firmware/la10compat.cpp +++ b/Firmware/la10compat.cpp @@ -74,7 +74,7 @@ float la10c_jerk(float j) // check for a compatible range of values prior to convert (be sure that // a higher E-jerk would still be compatible wrt the E accell range) - if(j < 4.5 && cs.max_acceleration_units_per_sq_second_normal[E_AXIS] < 2000) + if(j < 4.5 && cs.max_acceleration_mm_per_s2_normal[E_AXIS] < 2000) return j; // bring low E-jerk values into equivalent LA 1.5 values by diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 766d383bc..b77c2345d 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -81,7 +81,7 @@ float* max_feedrate = cs.max_feedrate_normal; // Use M201 to override by software -unsigned long* max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal; +unsigned long* max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; #ifdef ENABLE_AUTO_BED_LEVELING @@ -1370,7 +1370,7 @@ void set_extrude_min_temp(int temp) void reset_acceleration_rates() { for(int8_t i=0; i < NUM_AXIS; i++) - max_acceleration_steps_per_s2[i] = max_acceleration_units_per_sq_second[i] * cs.axis_steps_per_mm[i]; + max_acceleration_steps_per_s2[i] = max_acceleration_mm_per_s2[i] * cs.axis_steps_per_mm[i]; } #ifdef TMC2130 @@ -1379,12 +1379,12 @@ void update_mode_profile() if (tmc2130_mode == TMC2130_MODE_NORMAL) { max_feedrate = cs.max_feedrate_normal; - max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_normal; + max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; } else if (tmc2130_mode == TMC2130_MODE_SILENT) { max_feedrate = cs.max_feedrate_silent; - max_acceleration_units_per_sq_second = cs.max_acceleration_units_per_sq_second_silent; + max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_silent; } reset_acceleration_rates(); } diff --git a/Firmware/planner.h b/Firmware/planner.h index cd1cd2d34..32410d67d 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -187,7 +187,7 @@ extern float* max_feedrate; // Use M201 to override by software -extern unsigned long* max_acceleration_units_per_sq_second; +extern unsigned long* max_acceleration_mm_per_s2; extern unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; extern long position[NUM_AXIS]; From a8c75090b2c849e83f8d14b6d07a8093a0d018b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 23 May 2023 18:58:29 +0000 Subject: [PATCH 133/148] Change unsigned long to uint32_t --- Firmware/ConfigurationStore.h | 4 ++-- Firmware/planner.cpp | 4 ++-- Firmware/planner.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index 08a27413c..bbb3d78be 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -11,7 +11,7 @@ typedef struct char version[4]; float axis_steps_per_mm[4]; float max_feedrate_normal[4]; - unsigned long max_acceleration_mm_per_s2_normal[4]; + uint32_t max_acceleration_mm_per_s2_normal[4]; float acceleration; //!< Normal acceleration mm/s^2 THIS IS THE DEFAULT ACCELERATION for all moves. M204 SXXXX float retract_acceleration; //!< mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX float minimumfeedrate; @@ -36,7 +36,7 @@ typedef struct bool volumetric_enabled; float filament_size[1]; //!< cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder. float max_feedrate_silent[4]; //!< max speeds for silent mode - unsigned long max_acceleration_mm_per_s2_silent[4]; + uint32_t max_acceleration_mm_per_s2_silent[4]; unsigned char axis_ustep_resolution[4]; float travel_acceleration; //!< travel acceleration mm/s^2 // Arc Interpolation Settings, configurable via M214 diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index b77c2345d..9d9ba8461 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -81,8 +81,8 @@ float* max_feedrate = cs.max_feedrate_normal; // Use M201 to override by software -unsigned long* max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; -unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; +uint32_t* max_acceleration_mm_per_s2 = cs.max_acceleration_mm_per_s2_normal; +uint32_t max_acceleration_steps_per_s2[NUM_AXIS]; #ifdef ENABLE_AUTO_BED_LEVELING // this holds the required transform to compensate for bed level diff --git a/Firmware/planner.h b/Firmware/planner.h index 32410d67d..aae4a4b21 100644 --- a/Firmware/planner.h +++ b/Firmware/planner.h @@ -187,8 +187,8 @@ extern float* max_feedrate; // Use M201 to override by software -extern unsigned long* max_acceleration_mm_per_s2; -extern unsigned long max_acceleration_steps_per_s2[NUM_AXIS]; +extern uint32_t* max_acceleration_mm_per_s2; +extern uint32_t max_acceleration_steps_per_s2[NUM_AXIS]; extern long position[NUM_AXIS]; From 6c95d340c11cea67cb2cbed78118b8c7c83fc149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 26 May 2023 17:20:05 +0000 Subject: [PATCH 134/148] Remove dead code axis_travel_steps_per_sqr_second --- Firmware/Marlin_main.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e025dd743..ae3f1ee79 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6705,13 +6705,6 @@ Sigma_Exit: // steps per sq second need to be updated to agree with the units per sq second (as they are what is used in the planner) reset_acceleration_rates(); break; - #if 0 // Not used for Sprinter/grbl gen6 - case 202: // M202 - for(int8_t i=0; i < NUM_AXIS; i++) { - if(code_seen(axis_codes[i])) axis_travel_steps_per_sqr_second[i] = code_value() * cs.axis_steps_per_mm[i]; - } - break; - #endif /*! ### M203 - Set Max Feedrate M203: Set maximum feedrate From ec896df62af9b483059cf68d079690e9901ac41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 26 May 2023 17:24:48 +0000 Subject: [PATCH 135/148] Remove commented DEFAULT_AXIS_STEPS_PER_UNIT They serve no function at this point --- Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 4 +--- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 -- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 4 +--- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 -- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index 01f3f54f4..a3fb82b79 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -38,9 +38,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} +#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 751ae579e..4ab1c1c50 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -38,9 +38,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} #define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index 2a44ee101..0cf678323 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -40,9 +40,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} +#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index bc861ed06..a4da19a4d 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -40,9 +40,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} #define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. From 842dcc65605385524c901e83f2046f73419580aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 4 Jun 2023 13:08:17 +0000 Subject: [PATCH 136/148] Remove MAX_E_STEPS_PER_UNIT and MIN_E_STEPS_PER_UNIT These constants are not used anywhere so there is no need to rename them I propose they be removed as cleanup --- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 3 --- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 3 --- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 3 --- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 3 --- Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 --- Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 --- 10 files changed, 30 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index a4721d978..86d541f89 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -444,9 +444,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 470a02c06..b2410900e 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -445,9 +445,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index ae7237305..d01c705a7 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -444,9 +444,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 6e266cc1f..a4b77f12b 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -445,9 +445,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index a3fb82b79..a41ab1541 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -591,9 +591,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 4ab1c1c50..31ad71d38 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -594,9 +594,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index 0cf678323..ae72c4de1 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -595,9 +595,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index a4da19a4d..a7399c03a 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -598,9 +598,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 6aace7ed1..1700e0fc1 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -372,9 +372,6 @@ THERMISTORS SETTINGS #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index b69a405ee..2349385e3 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -371,9 +371,6 @@ THERMISTORS SETTINGS #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 From f40defd2a96af4fbade99b617d3e586154592e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sun, 4 Jun 2023 13:38:30 +0000 Subject: [PATCH 137/148] Rename minsegmenttime --> min_segment_time_us Also fixed wrong unit in Configuration prinout (M500) should be us and not ms Also used %lu format for uint32_t instead of %.2f --- Firmware/ConfigurationStore.cpp | 8 ++++---- Firmware/ConfigurationStore.h | 2 +- Firmware/Marlin_main.cpp | 25 ++++++++++++------------- Firmware/planner.cpp | 4 ++-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index d5a5d10da..b5f2b0ddb 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -27,7 +27,7 @@ void Config_PrintSettings(uint8_t level) "%SMaximum acceleration - normal (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" "%SMaximum acceleration - stealth (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" "%SAcceleration: P=print, R=retract, T=travel\n%S M204 P%.2f R%.2f T%.2f\n" - "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%.2f X%.2f Y%.2f Z%.2f E%.2f\n" + "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (us), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%lu X%.2f Y%.2f Z%.2f E%.2f\n" "%SHome offset (mm):\n%S M206 X%.2f Y%.2f Z%.2f\n" ), echomagic, echomagic, cs.axis_steps_per_mm[X_AXIS], cs.axis_steps_per_mm[Y_AXIS], cs.axis_steps_per_mm[Z_AXIS], cs.axis_steps_per_mm[E_AXIS], @@ -37,7 +37,7 @@ void Config_PrintSettings(uint8_t level) echomagic, echomagic, cs.max_acceleration_mm_per_s2_normal[X_AXIS], cs.max_acceleration_mm_per_s2_normal[Y_AXIS], cs.max_acceleration_mm_per_s2_normal[Z_AXIS], cs.max_acceleration_mm_per_s2_normal[E_AXIS], echomagic, echomagic, cs.max_acceleration_mm_per_s2_silent[X_AXIS], cs.max_acceleration_mm_per_s2_silent[Y_AXIS], cs.max_acceleration_mm_per_s2_silent[Z_AXIS], cs.max_acceleration_mm_per_s2_silent[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, - echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.minsegmenttime, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], + echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.min_segment_time_us, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS] #else //TMC2130 printf_P(PSTR( @@ -45,14 +45,14 @@ void Config_PrintSettings(uint8_t level) "%SMaximum feedrates (mm/s):\n%S M203 X%.2f Y%.2f Z%.2f E%.2f\n" "%SMaximum acceleration (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" "%SAcceleration: P=print, R=retract, T=travel\n%S M204 P%.2f R%.2f T%.2f\n" - "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (ms), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%.2f X%.2f Y%.2f Z%.2f E%.2f\n" + "%SAdvanced variables: S=Min feedrate (mm/s), T=Min travel feedrate (mm/s), B=minimum segment time (us), X=maximum XY jerk (mm/s), Z=maximum Z jerk (mm/s), E=maximum E jerk (mm/s)\n%S M205 S%.2f T%.2f B%lu X%.2f Y%.2f Z%.2f E%.2f\n" "%SHome offset (mm):\n%S M206 X%.2f Y%.2f Z%.2f\n" ), echomagic, echomagic, cs.axis_steps_per_mm[X_AXIS], cs.axis_steps_per_mm[Y_AXIS], cs.axis_steps_per_mm[Z_AXIS], cs.axis_steps_per_mm[E_AXIS], echomagic, echomagic, max_feedrate[X_AXIS], max_feedrate[Y_AXIS], max_feedrate[Z_AXIS], max_feedrate[E_AXIS], echomagic, echomagic, max_acceleration_mm_per_s2[X_AXIS], max_acceleration_mm_per_s2[Y_AXIS], max_acceleration_mm_per_s2[Z_AXIS], max_acceleration_mm_per_s2[E_AXIS], echomagic, echomagic, cs.acceleration, cs.retract_acceleration, cs.travel_acceleration, - echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.minsegmenttime, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], + echomagic, echomagic, cs.minimumfeedrate, cs.mintravelfeedrate, cs.min_segment_time_us, cs.max_jerk[X_AXIS], cs.max_jerk[Y_AXIS], cs.max_jerk[Z_AXIS], cs.max_jerk[E_AXIS], echomagic, echomagic, cs.add_homing[X_AXIS], cs.add_homing[Y_AXIS], cs.add_homing[Z_AXIS] #endif //TMC2130 ); diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index bbb3d78be..098890f0b 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -16,7 +16,7 @@ typedef struct float retract_acceleration; //!< mm/s^2 filament pull-pack and push-forward while standing still in the other axis M204 TXXXX float minimumfeedrate; float mintravelfeedrate; - unsigned long minsegmenttime; + uint32_t min_segment_time_us; //!< (µs) M205 B float max_jerk[4]; //!< Jerk is a maximum immediate velocity change. float add_homing[3]; float zprobe_zoffset; //!< Only used with define ENABLE_AUTO_BED_LEVELING diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ae3f1ee79..e301995bf 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6318,31 +6318,30 @@ Sigma_Exit: M92 [ X | Y | Z | E ] #### Parameters - - `X` - Steps per unit for the X drive - - `Y` - Steps per unit for the Y drive - - `Z` - Steps per unit for the Z drive - - `E` - Steps per unit for the extruder drive + - `X` - Steps per mm for the X drive + - `Y` - Steps per mm for the Y drive + - `Z` - Steps per mm for the Z drive + - `E` - Steps per mm for the extruder drive */ case 92: for(int8_t i=0; i < NUM_AXIS; i++) { if(code_seen(axis_codes[i])) { + float value = code_value(); if(i == E_AXIS) { // E - float value = code_value(); if(value < 20.0) { - float factor = cs.axis_steps_per_mm[i] / value; // increase e constants if M92 E14 is given for netfab. + const float factor = cs.axis_steps_per_mm[E_AXIS] / value; // increase e constants if M92 E14 is given for netfab. cs.max_jerk[E_AXIS] *= factor; - max_feedrate[i] *= factor; - max_acceleration_steps_per_s2[i] *= factor; + max_feedrate[E_AXIS] *= factor; + max_acceleration_steps_per_s2[E_AXIS] *= factor; } - cs.axis_steps_per_mm[i] = value; + cs.axis_steps_per_mm[E_AXIS] = value; #if defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125) fsensor.init(); #endif //defined(FILAMENT_SENSOR) && (FILAMENT_SENSOR_TYPE == FSENSOR_PAT9125) - } - else { - cs.axis_steps_per_mm[i] = code_value(); + } else { + cs.axis_steps_per_mm[i] = value; } } } @@ -6807,7 +6806,7 @@ Sigma_Exit: { if(code_seen('S')) cs.minimumfeedrate = code_value(); if(code_seen('T')) cs.mintravelfeedrate = code_value(); - if(code_seen('B')) cs.minsegmenttime = code_value() ; + if(code_seen('B')) cs.min_segment_time_us = (uint32_t)code_value(); if(code_seen('X')) cs.max_jerk[X_AXIS] = cs.max_jerk[Y_AXIS] = code_value(); if(code_seen('Y')) cs.max_jerk[Y_AXIS] = code_value(); if(code_seen('Z')) cs.max_jerk[Z_AXIS] = code_value(); diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 9d9ba8461..a0a5c103a 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -965,9 +965,9 @@ Having the real displacement of the head, we can calculate the total movement le if (moves_queued > 1 && moves_queued < (BLOCK_BUFFER_SIZE >> 1)) { // segment time in micro seconds unsigned long segment_time = lround(1000000.0/inverse_second); - if (segment_time < cs.minsegmenttime) + if (segment_time < cs.min_segment_time_us) // buffer is draining, add extra time. The amount of time added increases if the buffer is still emptied more. - inverse_second=1000000.0/(segment_time+lround(2*(cs.minsegmenttime-segment_time)/moves_queued)); + inverse_second=1000000.0/(segment_time+lround(2*(cs.min_segment_time_us-segment_time)/moves_queued)); } #endif // SLOWDOWN From c647e4cfa44add7ce0f39ae245d0b2e96861b840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Jul 2023 14:31:09 +0000 Subject: [PATCH 138/148] fix build --- Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h | 7 +------ Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h index 5d5e0fad9..25383c8a0 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h @@ -38,9 +38,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} +#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. @@ -594,9 +592,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h index ec8c5bdef..8cc6b3d8c 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h @@ -40,9 +40,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} +#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. @@ -598,9 +596,6 @@ #define MAX_BED_TEMP_CALIBRATION 50 #define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_E_STEPS_PER_UNIT 250 -#define MIN_E_STEPS_PER_UNIT 100 - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 From 780f2db3d1e8a26204545f003b3a571393dc052d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Tue, 25 Jul 2023 11:55:47 +0000 Subject: [PATCH 139/148] fixup --- Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 2 +- Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h | 2 +- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 2 +- Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index a41ab1541..084e5fc69 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -38,7 +38,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h index 25383c8a0..1985e9132 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h @@ -38,7 +38,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index ae72c4de1..c688ce959 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -40,7 +40,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h index 8cc6b3d8c..8125b93e3 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h @@ -40,7 +40,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_MM {100,100,3200/8,280} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} // Endstop inverting #define X_MIN_ENDSTOP_INVERTING 0 // set to 1 to invert the logic of the endstop. From dac07d11ba2c1dea31a32ca3630211d6e8c768b6 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 08:35:05 +0200 Subject: [PATCH 140/148] Rename lower case `temp_model` to `thermal_model` --- Firmware/ConfigurationStore.cpp | 8 +- Firmware/Marlin_main.cpp | 16 +- Firmware/temp_model.h | 125 --------- Firmware/temp_model/e3d_v6.h | 19 -- Firmware/temperature.cpp | 258 +++++++++--------- Firmware/temperature.h | 24 +- Firmware/ultralcd.cpp | 24 +- Firmware/ultralcd.h | 2 +- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 10 files changed, 168 insertions(+), 312 deletions(-) delete mode 100644 Firmware/temp_model.h delete mode 100644 Firmware/temp_model/e3d_v6.h diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index b5f2b0ddb..9940baa29 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -104,7 +104,7 @@ void Config_PrintSettings(uint8_t level) "%SArc Settings: P:Max length(mm) S:Min length (mm) N:Corrections R:Min segments F:Segments/sec.\n%S M214 P%.2f S%.2f N%d R%d F%d\n"), echomagic, echomagic, cs.mm_per_arc_segment, cs.min_mm_per_arc_segment, cs.n_arc_correction, cs.min_arc_segments, cs.arc_segments_per_sec); #ifdef TEMP_MODEL - temp_model_report_settings(); + thermal_model_report_settings(); #endif } #endif @@ -183,7 +183,7 @@ void Config_StoreSettings() strcpy_P(cs.version, default_conf.version); eeprom_update_block(reinterpret_cast(&cs), reinterpret_cast(EEPROM_M500_base), sizeof(cs)); #ifdef TEMP_MODEL - temp_model_save_settings(); + thermal_model_save_settings(); #endif SERIAL_ECHO_START; @@ -247,7 +247,7 @@ bool Config_RetrieveSettings() // Call updatePID (similar to when we have processed M301) updatePID(); #ifdef TEMP_MODEL - temp_model_load_settings(); + thermal_model_load_settings(); #endif SERIAL_ECHO_START; @@ -277,7 +277,7 @@ void Config_ResetDefault() updatePID(); #endif//PIDTEMP #ifdef TEMP_MODEL - temp_model_reset_settings(); + thermal_model_reset_settings(); #endif calculate_extruder_multipliers(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e301995bf..6973db6f9 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1551,7 +1551,7 @@ void setup() if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) lcd_show_fullscreen_message_and_wait_P(_T(MSG_BABYSTEP_Z_NOT_SET)); #ifdef TEMP_MODEL - if (!calibration_status_get(CALIBRATION_STATUS_TEMP_MODEL) && temp_model_enabled()) + if (!calibration_status_get(CALIBRATION_STATUS_TEMP_MODEL) && thermal_model_enabled()) lcd_show_fullscreen_message_and_wait_P(_T(MSG_TM_NOT_CAL)); #endif //TEMP_MODEL } @@ -7386,23 +7386,23 @@ Sigma_Exit: // report values if nothing has been requested if(isnan(R) && isnan(P) && isnan(U) && isnan(V) && isnan(C) && isnan(D) && isnan(T) && isnan(W) && isnan(E) && I < 0 && S < 0 && B < 0 && A < 0 && L < 0) { - temp_model_report_settings(); + thermal_model_report_settings(); break; } // update all parameters if(B >= 0) - temp_model_set_warn_beep(B); + thermal_model_set_warn_beep(B); if(!isnan(P) || !isnan(U) || !isnan(V) || !isnan(C) || !isnan(D) || (L >= 0) || !isnan(T) || !isnan(W) || !isnan(E)) - temp_model_set_params(P, U, V, C, D, L, T, W, E); + thermal_model_set_params(P, U, V, C, D, L, T, W, E); if(I >= 0 && !isnan(R)) - temp_model_set_resistance(I, R); + thermal_model_set_resistance(I, R); // enable the model last, if requested - if(S >= 0) temp_model_set_enabled(S); + if(S >= 0) thermal_model_set_enabled(S); // run autotune - if(A >= 0) temp_model_autotune(A, F > 0); + if(A >= 0) thermal_model_autotune(A, F > 0); } break; #endif @@ -8890,7 +8890,7 @@ Sigma_Exit: */ case 70: { if(code_seen('S')) - temp_model_log_enable(code_value_short()); + thermal_model_log_enable(code_value_short()); break; } #endif diff --git a/Firmware/temp_model.h b/Firmware/temp_model.h deleted file mode 100644 index 0fb4206a3..000000000 --- a/Firmware/temp_model.h +++ /dev/null @@ -1,125 +0,0 @@ -// model-based temperature safety checker declarations -#ifndef TEMP_MGR_INTV -#error "this file is not a public interface, it should be used *only* within temperature.cpp!" -#endif - -#include "planner.h" - -// shortcuts to get model defaults -#define __TEMP_MODEL_DEF(MODEL, VAR) TEMP_MODEL_##MODEL##_##VAR -#define _TEMP_MODEL_DEF(MODEL, VAR) __TEMP_MODEL_DEF(MODEL, VAR) -#define TEMP_MODEL_DEF(VAR) _TEMP_MODEL_DEF(TEMP_MODEL_DEFAULT, VAR) - -constexpr uint8_t TEMP_MODEL_CAL_S = 60; // Maximum recording length during calibration (s) -constexpr uint8_t TEMP_MODEL_CAL_R_STEP = 4; // Fan interpolation steps during calibration -constexpr float TEMP_MODEL_fE = 0.05; // error filter (1st-order IIR factor) - -// transport delay buffer size (samples) -constexpr uint8_t TEMP_MODEL_MAX_LAG_SIZE = 8; // * TEMP_MGR_INTV = 2160 - -// resistance values for all fan levels -constexpr uint8_t TEMP_MODEL_R_SIZE = (1 << FAN_SOFT_PWM_BITS); -static const float TEMP_MODEL_R_DEFAULT[TEMP_MODEL_R_SIZE] PROGMEM = TEMP_MODEL_DEF(Rv); - -namespace temp_model { - -struct model_data -{ - // temporary buffers - float dT_lag_buf[TEMP_MODEL_MAX_LAG_SIZE]; // transport delay buffer - uint8_t dT_lag_size = 0; // transport delay buffer size - uint8_t dT_lag_idx = 0; // transport delay buffer index - float dT_err_prev = 0; // previous temperature delta error - float T_prev = 0; // last temperature extruder - - // configurable parameters - float P; // heater power (W) - float U; // linear temperature coefficient (W/K/W) - float V; // linear temperature intercept (W/W) - float C; // heatblock capacitance (J/K) - float fS; // sim. 1st order IIR filter factor (f=100/27) - uint16_t L; // sim. response lag (ms) - float R[TEMP_MODEL_R_SIZE]; // heatblock resistance for all fan levels (K/W) - float Ta_corr; // ambient temperature correction (K) - - // thresholds - float warn; // warning threshold (K/s) - float err; // error threshold (K/s) - - // status flags - union - { - bool flags; - struct - { - bool uninitialized: 1; // model is not initialized - bool error: 1; // error threshold set - bool warning: 1; // warning threshold set - } flag_bits; - }; - - // pre-computed values (initialized via reset) - float C_i; // heatblock capacitance (precomputed dT/C) - float warn_s; // warning threshold (per sample) - float err_s; // error threshold (per sample) - - // simulation functions - void reset(uint8_t heater_pwm, uint8_t fan_pwm, float heater_temp, float ambient_temp); - void step(uint8_t heater_pwm, uint8_t fan_pwm, float heater_temp, float ambient_temp); -}; - -static bool enabled; // model check enabled -static bool warn_beep = true; // beep on warning threshold -static model_data data; // default heater data - -static bool calibrated(); // return calibration/model validity status -static void check(); // check and trigger errors or warnings based on current state - -// warning state (updated from from isr context) -volatile static struct -{ - float dT_err; // temperature delta error (per sample) - bool warning: 1; // warning condition - bool assert: 1; // warning is still asserted -} warning_state; - -static void handle_warning(); // handle warnings from user context - -#ifdef TEMP_MODEL_DEBUG -static struct -{ - volatile struct - { - uint32_t stamp; - int8_t delta_ms; - uint8_t counter; - uint8_t cur_pwm; - float cur_temp; - float cur_amb; - } entry; - - uint8_t serial; - bool enabled; -} log_buf; - -static void log_usr(); // user log handler -static void log_isr(); // isr log handler -#endif - -} // namespace temp_model - -namespace temp_model_cal { - -// recording scratch buffer -struct rec_entry -{ - float temp; // heater temperature - uint8_t pwm; // heater PWM -}; - -constexpr uint16_t REC_BUFFER_SIZE = TEMP_MODEL_CAL_S / TEMP_MGR_INTV; -static rec_entry* const rec_buffer = (rec_entry*)block_buffer; // oh-hey, free memory! -static_assert(sizeof(rec_entry[REC_BUFFER_SIZE]) <= sizeof(block_buffer), - "recording length too long to fit within available buffer"); - -} // namespace temp_model_cal diff --git a/Firmware/temp_model/e3d_v6.h b/Firmware/temp_model/e3d_v6.h deleted file mode 100644 index ac75894b7..000000000 --- a/Firmware/temp_model/e3d_v6.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#define TEMP_MODEL_E3D_V6_VER 1 // model parameters version - -#define TEMP_MODEL_E3D_V6_P 38. // heater power (W) -#define TEMP_MODEL_E3D_V6_U 0. // linear temperature coefficient (W/K/power) -#define TEMP_MODEL_E3D_V6_V 1. // linear temperature intercept (W/power) - -#define TEMP_MODEL_E3D_V6_C 12.1 // initial guess for heatblock capacitance (J/K) -#define TEMP_MODEL_E3D_V6_R 20.5 // initial guess for heatblock resistance (K/W) - -#define TEMP_MODEL_E3D_V6_fS 0.065 // sim. 1st order IIR filter factor (f=100/27) -#define TEMP_MODEL_E3D_V6_LAG 2100 // sim. response lag (ms, 0-2160) - -#define TEMP_MODEL_E3D_V6_W 1.2 // Default warning threshold (K/s) -#define TEMP_MODEL_E3D_V6_E 1.74 // Default error threshold (K/s) - -// fall-back resistance vector (R0-15) -#define TEMP_MODEL_E3D_V6_Rv {TEMP_MODEL_E3D_V6_R, 18.4, 16.7, 15.2, 14.1, 13.3, 12.7, 12.1, 11.7, 11.3, 11., 10.8, 10.6, 10.4, 10.2, 10.1} diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 247d0c16e..4f44749ba 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -94,7 +94,7 @@ #ifdef TEMP_MODEL // temperature model interface -#include "temp_model.h" +#include "thermal_model.h" #endif #include "Filament_sensor.h" @@ -556,8 +556,8 @@ void manage_heater() #ifdef TEMP_MODEL // handle model warnings first, so not to override the error handler - if(temp_model::warning_state.warning) - temp_model::handle_warning(); + if(thermal_model::warning_state.warning) + thermal_model::handle_warning(); #endif // handle temperature errors @@ -568,7 +568,7 @@ void manage_heater() checkFans(); #ifdef TEMP_MODEL_DEBUG - temp_model::log_usr(); + thermal_model::log_usr(); #endif } @@ -1962,9 +1962,9 @@ static void temp_mgr_isr() check_temp_raw(); // check min/max temp using raw values check_temp_runaway(); // classic temperature hysteresis check #ifdef TEMP_MODEL - temp_model::check(); // model-based heater check + thermal_model::check(); // model-based heater check #ifdef TEMP_MODEL_DEBUG - temp_model::log_isr(); + thermal_model::log_isr(); #endif #endif @@ -2079,7 +2079,7 @@ static void check_temp_raw() } #ifdef TEMP_MODEL -namespace temp_model { +namespace thermal_model { void model_data::reset(uint8_t heater_pwm _UNUSED, uint8_t fan_pwm _UNUSED, float heater_temp _UNUSED, float ambient_temp _UNUSED) @@ -2165,7 +2165,7 @@ static bool calibrated() if(!(data.L > 0)) return false; if(!(data.Ta_corr != NAN)) return false; for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) { - if(!(temp_model::data.R[i] >= 0)) + if(!(thermal_model::data.R[i] >= 0)) return false; } if(!(data.warn != NAN)) return false; @@ -2198,7 +2198,7 @@ static void check() warning_state.assert = data.flag_bits.warning; if(warning_state.assert) { warning_state.warning = true; - warning_state.dT_err = temp_model::data.dT_err_prev; + warning_state.dT_err = thermal_model::data.dT_err_prev; } } @@ -2281,42 +2281,42 @@ static void log_isr() } #endif -} // namespace temp_model +} // namespace thermal_model -static void temp_model_reset_enabled(bool enabled) +static void thermal_model_reset_enabled(bool enabled) { TempMgrGuard temp_mgr_guard; - temp_model::enabled = enabled; - temp_model::reinitialize(); + thermal_model::enabled = enabled; + thermal_model::reinitialize(); } -bool temp_model_enabled() +bool thermal_model_enabled() { - return temp_model::enabled; + return thermal_model::enabled; } -void temp_model_set_enabled(bool enabled) +void thermal_model_set_enabled(bool enabled) { // set the enabled flag { TempMgrGuard temp_mgr_guard; - temp_model::enabled = enabled; - temp_model::setup(); + thermal_model::enabled = enabled; + thermal_model::setup(); } // verify that the model has been enabled - if(enabled && !temp_model::enabled) + if(enabled && !thermal_model::enabled) SERIAL_ECHOLNPGM("TM: invalid parameters, cannot enable"); } -void temp_model_set_warn_beep(bool enabled) +void thermal_model_set_warn_beep(bool enabled) { - temp_model::warn_beep = enabled; + thermal_model::warn_beep = enabled; } // set the model lag rounding to the effective sample resolution, ensuring the reported/stored lag // matches the current model constraints (future-proofing for model changes) -static void temp_model_set_lag(uint16_t ms) +static void thermal_model_set_lag(uint16_t ms) { static const uint16_t intv_ms = (uint16_t)(TEMP_MGR_INTV * 1000); uint16_t samples = ((ms + intv_ms/2) / intv_ms); @@ -2328,75 +2328,75 @@ static void temp_model_set_lag(uint16_t ms) samples = TEMP_MODEL_MAX_LAG_SIZE; // round back to ms - temp_model::data.L = samples * intv_ms; + thermal_model::data.L = samples * intv_ms; } -void temp_model_set_params(float P, float U, float V, float C, float D, int16_t L, float Ta_corr, float warn, float err) +void thermal_model_set_params(float P, float U, float V, float C, float D, int16_t L, float Ta_corr, float warn, float err) { TempMgrGuard temp_mgr_guard; - if(!isnan(P) && P > 0) temp_model::data.P = P; - if(!isnan(U)) temp_model::data.U = U; - if(!isnan(V)) temp_model::data.V = V; - if(!isnan(C) && C > 0) temp_model::data.C = C; - if(!isnan(D)) temp_model::data.fS = D; - if(L >= 0) temp_model_set_lag(L); - if(!isnan(Ta_corr)) temp_model::data.Ta_corr = Ta_corr; - if(!isnan(warn) && warn > 0) temp_model::data.warn = warn; - if(!isnan(err) && err > 0) temp_model::data.err = err; + if(!isnan(P) && P > 0) thermal_model::data.P = P; + if(!isnan(U)) thermal_model::data.U = U; + if(!isnan(V)) thermal_model::data.V = V; + if(!isnan(C) && C > 0) thermal_model::data.C = C; + if(!isnan(D)) thermal_model::data.fS = D; + if(L >= 0) thermal_model_set_lag(L); + if(!isnan(Ta_corr)) thermal_model::data.Ta_corr = Ta_corr; + if(!isnan(warn) && warn > 0) thermal_model::data.warn = warn; + if(!isnan(err) && err > 0) thermal_model::data.err = err; // ensure warn <= err - if (temp_model::data.warn > temp_model::data.err) - temp_model::data.warn = temp_model::data.err; + if (thermal_model::data.warn > thermal_model::data.err) + thermal_model::data.warn = thermal_model::data.err; - temp_model::setup(); + thermal_model::setup(); } -void temp_model_set_resistance(uint8_t index, float R) +void thermal_model_set_resistance(uint8_t index, float R) { if(index >= TEMP_MODEL_R_SIZE || R <= 0) return; TempMgrGuard temp_mgr_guard; - temp_model::data.R[index] = R; - temp_model::setup(); + thermal_model::data.R[index] = R; + thermal_model::setup(); } -void temp_model_report_settings() +void thermal_model_report_settings() { SERIAL_ECHO_START; SERIAL_ECHOLNPGM("Temperature Model settings:"); for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - printf_P(PSTR("%S M310 I%u R%.2f\n"), echomagic, (unsigned)i, (double)temp_model::data.R[i]); + printf_P(PSTR("%S M310 I%u R%.2f\n"), echomagic, (unsigned)i, (double)thermal_model::data.R[i]); printf_P(PSTR("%S M310 P%.2f U%.4f V%.2f C%.2f D%.4f L%u S%u B%u E%.2f W%.2f T%.2f\n"), - echomagic, (double)temp_model::data.P, (double)temp_model::data.U, (double)temp_model::data.V, - (double)temp_model::data.C, (double)temp_model::data.fS, (unsigned)temp_model::data.L, - (unsigned)temp_model::enabled, (unsigned)temp_model::warn_beep, - (double)temp_model::data.err, (double)temp_model::data.warn, - (double)temp_model::data.Ta_corr); + echomagic, (double)thermal_model::data.P, (double)thermal_model::data.U, (double)thermal_model::data.V, + (double)thermal_model::data.C, (double)thermal_model::data.fS, (unsigned)thermal_model::data.L, + (unsigned)thermal_model::enabled, (unsigned)thermal_model::warn_beep, + (double)thermal_model::data.err, (double)thermal_model::data.warn, + (double)thermal_model::data.Ta_corr); } -void temp_model_reset_settings() +void thermal_model_reset_settings() { TempMgrGuard temp_mgr_guard; - temp_model::data.P = TEMP_MODEL_DEF(P); - temp_model::data.U = TEMP_MODEL_DEF(U); - temp_model::data.V = TEMP_MODEL_DEF(V); - temp_model::data.C = TEMP_MODEL_DEF(C); - temp_model::data.fS = TEMP_MODEL_DEF(fS); - temp_model::data.L = (uint16_t)(TEMP_MODEL_DEF(LAG) / (TEMP_MGR_INTV * 1000) + 0.5) * (uint16_t)(TEMP_MGR_INTV * 1000); + thermal_model::data.P = TEMP_MODEL_DEF(P); + thermal_model::data.U = TEMP_MODEL_DEF(U); + thermal_model::data.V = TEMP_MODEL_DEF(V); + thermal_model::data.C = TEMP_MODEL_DEF(C); + thermal_model::data.fS = TEMP_MODEL_DEF(fS); + thermal_model::data.L = (uint16_t)(TEMP_MODEL_DEF(LAG) / (TEMP_MGR_INTV * 1000) + 0.5) * (uint16_t)(TEMP_MGR_INTV * 1000); for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - temp_model::data.R[i] = pgm_read_float(TEMP_MODEL_R_DEFAULT + i); - temp_model::data.Ta_corr = TEMP_MODEL_Ta_corr; - temp_model::data.warn = TEMP_MODEL_DEF(W); - temp_model::data.err = TEMP_MODEL_DEF(E); - temp_model::warn_beep = true; - temp_model::enabled = true; - temp_model::reinitialize(); + thermal_model::data.R[i] = pgm_read_float(TEMP_MODEL_R_DEFAULT + i); + thermal_model::data.Ta_corr = TEMP_MODEL_Ta_corr; + thermal_model::data.warn = TEMP_MODEL_DEF(W); + thermal_model::data.err = TEMP_MODEL_DEF(E); + thermal_model::warn_beep = true; + thermal_model::enabled = true; + thermal_model::reinitialize(); } -void temp_model_load_settings() +void thermal_model_load_settings() { static_assert(TEMP_MODEL_R_SIZE == 16); // ensure we don't desync with the eeprom table TempMgrGuard temp_mgr_guard; @@ -2409,43 +2409,43 @@ void temp_model_load_settings() eeprom_init_default_word((uint16_t*)EEPROM_TEMP_MODEL_L, TEMP_MODEL_DEF(LAG)); eeprom_init_default_byte((uint8_t*)EEPROM_TEMP_MODEL_VER, TEMP_MODEL_DEF(VER)); - temp_model::enabled = eeprom_read_byte((uint8_t*)EEPROM_TEMP_MODEL_ENABLE); - temp_model::data.P = eeprom_read_float((float*)EEPROM_TEMP_MODEL_P); - temp_model::data.U = eeprom_read_float((float*)EEPROM_TEMP_MODEL_U); - temp_model::data.V = eeprom_read_float((float*)EEPROM_TEMP_MODEL_V); - temp_model::data.C = eeprom_read_float((float*)EEPROM_TEMP_MODEL_C); - temp_model::data.fS = eeprom_read_float((float*)EEPROM_TEMP_MODEL_D); - temp_model_set_lag(eeprom_read_word((uint16_t*)EEPROM_TEMP_MODEL_L)); + thermal_model::enabled = eeprom_read_byte((uint8_t*)EEPROM_TEMP_MODEL_ENABLE); + thermal_model::data.P = eeprom_read_float((float*)EEPROM_TEMP_MODEL_P); + thermal_model::data.U = eeprom_read_float((float*)EEPROM_TEMP_MODEL_U); + thermal_model::data.V = eeprom_read_float((float*)EEPROM_TEMP_MODEL_V); + thermal_model::data.C = eeprom_read_float((float*)EEPROM_TEMP_MODEL_C); + thermal_model::data.fS = eeprom_read_float((float*)EEPROM_TEMP_MODEL_D); + thermal_model_set_lag(eeprom_read_word((uint16_t*)EEPROM_TEMP_MODEL_L)); for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - temp_model::data.R[i] = eeprom_read_float((float*)EEPROM_TEMP_MODEL_R + i); - temp_model::data.Ta_corr = eeprom_read_float((float*)EEPROM_TEMP_MODEL_Ta_corr); - temp_model::data.warn = eeprom_read_float((float*)EEPROM_TEMP_MODEL_W); - temp_model::data.err = eeprom_read_float((float*)EEPROM_TEMP_MODEL_E); + thermal_model::data.R[i] = eeprom_read_float((float*)EEPROM_TEMP_MODEL_R + i); + thermal_model::data.Ta_corr = eeprom_read_float((float*)EEPROM_TEMP_MODEL_Ta_corr); + thermal_model::data.warn = eeprom_read_float((float*)EEPROM_TEMP_MODEL_W); + thermal_model::data.err = eeprom_read_float((float*)EEPROM_TEMP_MODEL_E); - if(!temp_model::calibrated()) { + if(!thermal_model::calibrated()) { SERIAL_ECHOLNPGM("TM: stored calibration invalid, resetting"); - temp_model_reset_settings(); + thermal_model_reset_settings(); } - temp_model::setup(); + thermal_model::setup(); } -void temp_model_save_settings() +void thermal_model_save_settings() { - eeprom_update_byte((uint8_t*)EEPROM_TEMP_MODEL_ENABLE, temp_model::enabled); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_P, temp_model::data.P); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_U, temp_model::data.U); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_V, temp_model::data.V); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_C, temp_model::data.C); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_D, temp_model::data.fS); - eeprom_update_word((uint16_t*)EEPROM_TEMP_MODEL_L, temp_model::data.L); + eeprom_update_byte((uint8_t*)EEPROM_TEMP_MODEL_ENABLE, thermal_model::enabled); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_P, thermal_model::data.P); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_U, thermal_model::data.U); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_V, thermal_model::data.V); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_C, thermal_model::data.C); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_D, thermal_model::data.fS); + eeprom_update_word((uint16_t*)EEPROM_TEMP_MODEL_L, thermal_model::data.L); for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - eeprom_update_float((float*)EEPROM_TEMP_MODEL_R + i, temp_model::data.R[i]); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_Ta_corr, temp_model::data.Ta_corr); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_W, temp_model::data.warn); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_E, temp_model::data.err); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_R + i, thermal_model::data.R[i]); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_Ta_corr, thermal_model::data.Ta_corr); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_W, thermal_model::data.warn); + eeprom_update_float((float*)EEPROM_TEMP_MODEL_E, thermal_model::data.err); } -namespace temp_model_cal { +namespace thermal_model_cal { // set current fan speed for both front/backend static __attribute__((noinline)) void set_fan_speed(uint8_t fan_speed) @@ -2491,7 +2491,7 @@ static void cooldown(float temp) set_fan_speed(255); while(current_temperature[0] >= temp) { if(temp_error_state.v) break; - float ambient = current_temperature_ambient + temp_model::data.Ta_corr; + float ambient = current_temperature_ambient + thermal_model::data.Ta_corr; if(current_temperature[0] < (ambient + TEMP_HYSTERESIS)) { // do not get stuck waiting very close to ambient temperature break; @@ -2539,12 +2539,12 @@ static uint16_t record(uint16_t samples = REC_BUFFER_SIZE) { static float cost_fn(uint16_t samples, float* const var, float v, uint8_t fan_pwm, float ambient) { *var = v; - temp_model::data.reset(rec_buffer[0].pwm, fan_pwm, rec_buffer[0].temp, ambient); + thermal_model::data.reset(rec_buffer[0].pwm, fan_pwm, rec_buffer[0].temp, ambient); float err = 0; uint16_t cnt = 0; for(uint16_t i = 1; i < samples; ++i) { - temp_model::data.step(rec_buffer[i].pwm, fan_pwm, rec_buffer[i].temp, ambient); - float err_v = temp_model::data.dT_err_prev; + thermal_model::data.step(rec_buffer[i].pwm, fan_pwm, rec_buffer[i].temp, ambient); + float err_v = thermal_model::data.dT_err_prev; if(!isnan(err_v)) { err += err_v * err_v; ++cnt; @@ -2569,8 +2569,8 @@ static float estimate(uint16_t samples, { // during estimation we alter the model values without an extra copy to conserve memory // so we cannot keep the main checker active until a value has been found - bool was_enabled = temp_model::enabled; - temp_model_reset_enabled(false); + bool was_enabled = thermal_model::enabled; + thermal_model_reset_enabled(false); float orig = *var; float e = NAN; @@ -2595,14 +2595,14 @@ static float estimate(uint16_t samples, } *var = x; - temp_model_reset_enabled(was_enabled); + thermal_model_reset_enabled(was_enabled); return e; } } SERIAL_ECHOLNPGM("TM estimation did not converge"); *var = orig; - temp_model_reset_enabled(was_enabled); + thermal_model_reset_enabled(was_enabled); return NAN; } @@ -2633,10 +2633,10 @@ static bool autotune(int16_t cal_temp) return true; // we need a high R value for the initial C guess - if(isnan(temp_model::data.R[0])) - temp_model::data.R[0] = TEMP_MODEL_CAL_R_high; + if(isnan(thermal_model::data.R[0])) + thermal_model::data.R[0] = TEMP_MODEL_CAL_R_high; - e = estimate(samples, &temp_model::data.C, + e = estimate(samples, &thermal_model::data.C, TEMP_MODEL_CAL_C_low, TEMP_MODEL_CAL_C_high, TEMP_MODEL_CAL_C_thr, TEMP_MODEL_CAL_C_itr, 0, current_temperature_ambient); @@ -2653,7 +2653,7 @@ static bool autotune(int16_t cal_temp) if(temp_error_state.v || !samples) return true; - e = estimate(samples, &temp_model::data.R[0], + e = estimate(samples, &thermal_model::data.R[0], TEMP_MODEL_CAL_R_low, TEMP_MODEL_CAL_R_high, TEMP_MODEL_CAL_R_thr, TEMP_MODEL_CAL_R_itr, 0, current_temperature_ambient); @@ -2671,7 +2671,7 @@ static bool autotune(int16_t cal_temp) for(int8_t i = TEMP_MODEL_R_SIZE - 1; i > 0; i -= TEMP_MODEL_CAL_R_STEP) { // always disable the checker while estimating fan resistance as the difference // (esp with 3rd-party blowers) can be massive - temp_model::data.R[i] = NAN; + thermal_model::data.R[i] = NAN; uint8_t speed = 256 / TEMP_MODEL_R_SIZE * (i + 1) - 1; set_fan_speed(speed); @@ -2685,8 +2685,8 @@ static bool autotune(int16_t cal_temp) // a fixed fan pwm (the norminal value) is used here, as soft_pwm_fan will be modified // during fan measurements and we'd like to include that skew during normal operation. - e = estimate(samples, &temp_model::data.R[i], - TEMP_MODEL_CAL_R_low, temp_model::data.R[0], TEMP_MODEL_CAL_R_thr, TEMP_MODEL_CAL_R_itr, + e = estimate(samples, &thermal_model::data.R[i], + TEMP_MODEL_CAL_R_low, thermal_model::data.R[0], TEMP_MODEL_CAL_R_thr, TEMP_MODEL_CAL_R_itr, i, current_temperature_ambient); if(isnan(e)) return true; @@ -2703,25 +2703,25 @@ static bool autotune(int16_t cal_temp) int8_t prev = next - TEMP_MODEL_CAL_R_STEP; if(prev < 0) prev = 0; float f = (float)(i - prev) / TEMP_MODEL_CAL_R_STEP; - float d = (temp_model::data.R[next] - temp_model::data.R[prev]); - temp_model::data.R[i] = temp_model::data.R[prev] + d * f; + float d = (thermal_model::data.R[next] - thermal_model::data.R[prev]); + thermal_model::data.R[i] = thermal_model::data.R[prev] + d * f; } return false; } -} // namespace temp_model_cal +} // namespace thermal_model_cal -static bool temp_model_autotune_err = true; +static bool thermal_model_autotune_err = true; -void temp_model_autotune(int16_t temp, bool selftest) +void thermal_model_autotune(int16_t temp, bool selftest) { float orig_C, orig_R[TEMP_MODEL_R_SIZE]; bool orig_enabled; - static_assert(sizeof(orig_R) == sizeof(temp_model::data.R)); + static_assert(sizeof(orig_R) == sizeof(thermal_model::data.R)); // fail-safe error state - temp_model_autotune_err = true; + thermal_model_autotune_err = true; char tm_message[LCD_WIDTH+1]; if(moves_planned() || printer_active()) { @@ -2736,56 +2736,56 @@ void temp_model_autotune(int16_t temp, bool selftest) lcd_return_to_status(); // save the original model data and set the model checking state during self-calibration - orig_C = temp_model::data.C; - memcpy(orig_R, temp_model::data.R, sizeof(temp_model::data.R)); - orig_enabled = temp_model::enabled; - temp_model_reset_enabled(selftest); + orig_C = thermal_model::data.C; + memcpy(orig_R, thermal_model::data.R, sizeof(thermal_model::data.R)); + orig_enabled = thermal_model::enabled; + thermal_model_reset_enabled(selftest); // autotune SERIAL_ECHOLNPGM("TM: calibration start"); - temp_model_autotune_err = temp_model_cal::autotune(temp > 0 ? temp : TEMP_MODEL_CAL_T_high); + thermal_model_autotune_err = thermal_model_cal::autotune(temp > 0 ? temp : TEMP_MODEL_CAL_T_high); // always reset temperature disable_heater(); - if(temp_model_autotune_err) { + if(thermal_model_autotune_err) { sprintf_P(tm_message, PSTR("TM: calibr. failed!")); lcd_setstatus_serial(tm_message); if(temp_error_state.v) - temp_model_cal::set_fan_speed(255); + thermal_model_cal::set_fan_speed(255); // show calibrated values before overwriting them - temp_model_report_settings(); + thermal_model_report_settings(); // restore original state - temp_model::data.C = orig_C; - memcpy(temp_model::data.R, orig_R, sizeof(temp_model::data.R)); - temp_model_set_enabled(orig_enabled); + thermal_model::data.C = orig_C; + memcpy(thermal_model::data.R, orig_R, sizeof(thermal_model::data.R)); + thermal_model_set_enabled(orig_enabled); } else { calibration_status_set(CALIBRATION_STATUS_TEMP_MODEL); lcd_setstatuspgm(MSG_WELCOME); - temp_model_cal::set_fan_speed(0); - temp_model_set_enabled(orig_enabled); - temp_model_report_settings(); + thermal_model_cal::set_fan_speed(0); + thermal_model_set_enabled(orig_enabled); + thermal_model_report_settings(); } lcd_consume_click(); menu_unset_block(MENU_BLOCK_TEMP_MODEL_AUTOTUNE); } -bool temp_model_autotune_result() +bool thermal_model_autotune_result() { - return !temp_model_autotune_err; + return !thermal_model_autotune_err; } #ifdef TEMP_MODEL_DEBUG -void temp_model_log_enable(bool enable) +void thermal_model_log_enable(bool enable) { if(enable) { TempMgrGuard temp_mgr_guard; - temp_model::log_buf.entry.stamp = _millis(); + thermal_model::log_buf.entry.stamp = _millis(); } - temp_model::log_buf.enabled = enable; + thermal_model::log_buf.enabled = enable; } #endif #endif diff --git a/Firmware/temperature.h b/Firmware/temperature.h index 1e0a5c148..07a05bba9 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -175,23 +175,23 @@ FORCE_INLINE void autotempShutdown(){ void PID_autotune(float temp, int extruder, int ncycles); #ifdef TEMP_MODEL -bool temp_model_enabled(); // return temperature model state -void temp_model_set_enabled(bool enabled); -void temp_model_set_warn_beep(bool enabled); -void temp_model_set_params(float P=NAN, float U=NAN, float V=NAN, float C=NAN, float D=NAN, +bool thermal_model_enabled(); // return temperature model state +void thermal_model_set_enabled(bool enabled); +void thermal_model_set_warn_beep(bool enabled); +void thermal_model_set_params(float P=NAN, float U=NAN, float V=NAN, float C=NAN, float D=NAN, int16_t L=-1, float Ta_corr=NAN, float warn=NAN, float err=NAN); -void temp_model_set_resistance(uint8_t index, float R); +void thermal_model_set_resistance(uint8_t index, float R); -void temp_model_report_settings(); -void temp_model_reset_settings(); -void temp_model_load_settings(); -void temp_model_save_settings(); +void thermal_model_report_settings(); +void thermal_model_reset_settings(); +void thermal_model_load_settings(); +void thermal_model_save_settings(); -void temp_model_autotune(int16_t temp = 0, bool selftest = false); -bool temp_model_autotune_result(); // return true if the last autotune was complete and successful +void thermal_model_autotune(int16_t temp = 0, bool selftest = false); +bool thermal_model_autotune_result(); // return true if the last autotune was complete and successful #ifdef TEMP_MODEL_DEBUG -void temp_model_log_enable(bool enable); +void thermal_model_log_enable(bool enable); #endif #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 720cd9714..366cc3654 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -908,13 +908,13 @@ void lcd_commands() break; case 3: - temp_model_set_warn_beep(false); + thermal_model_set_warn_beep(false); enquecommand_P(PSTR("M310 A F1")); lcd_commands_step = 2; break; case 2: - if (temp_model_autotune_result()) + if (thermal_model_autotune_result()) enquecommand_P(MSG_M500); lcd_commands_step = 1; break; @@ -922,8 +922,8 @@ void lcd_commands() case 1: lcd_commands_step = 0; lcd_commands_type = LcdCommands::Idle; - temp_model_set_warn_beep(true); - bool res = temp_model_autotune_result(); + thermal_model_set_warn_beep(true); + bool res = thermal_model_autotune_result(); if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE)) { // resume the wizard lcd_wizard(res ? WizState::Restore : WizState::Failed); @@ -954,8 +954,8 @@ void lcd_commands() enquecommand_P(PSTR("G1 X125 Z200 F1000")); enquecommand_P(PSTR("M109 S280")); #ifdef TEMP_MODEL - was_enabled = temp_model_enabled(); - temp_model_set_enabled(false); + was_enabled = thermal_model_enabled(); + thermal_model_set_enabled(false); #endif //TEMP_MODEL lcd_commands_step = 2; break; @@ -970,7 +970,7 @@ void lcd_commands() if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_CHANGED), false) == LCD_LEFT_BUTTON_CHOICE) { setTargetHotend(0); #ifdef TEMP_MODEL - temp_model_set_enabled(was_enabled); + thermal_model_set_enabled(was_enabled); #endif //TEMP_MODEL lcd_commands_step = 1; } @@ -4552,7 +4552,7 @@ static void lcd_calibration_menu() #endif } #ifdef TEMP_MODEL - MENU_ITEM_SUBMENU_P(_n("Thermal Model cal."), lcd_temp_model_cal); + MENU_ITEM_SUBMENU_P(_n("Thermal Model cal."), lcd_thermal_model_cal); #endif //TEMP_MODEL MENU_END(); @@ -5592,7 +5592,7 @@ void lcd_print_stop() } #ifdef TEMP_MODEL -void lcd_temp_model_cal() +void lcd_thermal_model_cal() { lcd_commands_type = LcdCommands::TempModel; lcd_return_to_status(); @@ -6448,8 +6448,8 @@ static bool lcd_selfcheck_check_heater(bool _isbed) target_temperature[0] = (_isbed) ? 0 : 200; target_temperature_bed = (_isbed) ? 100 : 0; #ifdef TEMP_MODEL - bool tm_was_enabled = temp_model_enabled(); - temp_model_set_enabled(false); + bool tm_was_enabled = thermal_model_enabled(); + thermal_model_set_enabled(false); #endif //TEMP_MODEL manage_heater(); manage_inactivity(true); @@ -6500,7 +6500,7 @@ static bool lcd_selfcheck_check_heater(bool _isbed) } #ifdef TEMP_MODEL - temp_model_set_enabled(tm_was_enabled); + thermal_model_set_enabled(tm_was_enabled); #endif //TEMP_MODEL manage_heater(); manage_inactivity(true); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 541215853..ea1681837 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -51,7 +51,7 @@ void lcd_resume_print(); void lcd_print_stop(); // interactive print stop void print_stop(bool interactive=false); #ifdef TEMP_MODEL -void lcd_temp_model_cal(); +void lcd_thermal_model_cal(); #endif //TEMP_MODEL void lcd_load_filament_color_check(); diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 31ad71d38..fe2f82432 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -402,7 +402,7 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction -#include "temp_model/e3d_v6.h" +#include "thermal_model/e3d_v6.h" #define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index a7399c03a..50fa2be55 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -406,7 +406,7 @@ #define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction -#include "temp_model/e3d_v6.h" +#include "thermal_model/e3d_v6.h" #define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters From 44ae8033eb520f90c08d1448048704352029fbf4 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 08:36:42 +0200 Subject: [PATCH 141/148] Rename upper case `TEMP_MODEL` to `THERMAL_MODEL` --- Firmware/ConfigurationStore.cpp | 8 +- Firmware/Marlin_main.cpp | 10 +- Firmware/eeprom.h | 52 +++--- Firmware/menu.h | 4 +- Firmware/messages.cpp | 2 +- Firmware/messages.h | 2 +- Firmware/temperature.cpp | 158 +++++++++--------- Firmware/temperature.h | 4 +- Firmware/ultralcd.cpp | 44 ++--- Firmware/ultralcd.h | 12 +- Firmware/util.h | 8 +- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 28 ++-- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 28 ++-- 13 files changed, 180 insertions(+), 180 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 9940baa29..aaa2089b2 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -103,7 +103,7 @@ void Config_PrintSettings(uint8_t level) printf_P(PSTR( "%SArc Settings: P:Max length(mm) S:Min length (mm) N:Corrections R:Min segments F:Segments/sec.\n%S M214 P%.2f S%.2f N%d R%d F%d\n"), echomagic, echomagic, cs.mm_per_arc_segment, cs.min_mm_per_arc_segment, cs.n_arc_correction, cs.min_arc_segments, cs.arc_segments_per_sec); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL thermal_model_report_settings(); #endif } @@ -182,7 +182,7 @@ void Config_StoreSettings() { strcpy_P(cs.version, default_conf.version); eeprom_update_block(reinterpret_cast(&cs), reinterpret_cast(EEPROM_M500_base), sizeof(cs)); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL thermal_model_save_settings(); #endif @@ -246,7 +246,7 @@ bool Config_RetrieveSettings() // Call updatePID (similar to when we have processed M301) updatePID(); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL thermal_model_load_settings(); #endif @@ -276,7 +276,7 @@ void Config_ResetDefault() #ifdef PIDTEMP updatePID(); #endif//PIDTEMP -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL thermal_model_reset_settings(); #endif diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 6973db6f9..ffb2d75d4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1550,10 +1550,10 @@ void setup() // warn about other important steps individually if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) lcd_show_fullscreen_message_and_wait_P(_T(MSG_BABYSTEP_Z_NOT_SET)); -#ifdef TEMP_MODEL - if (!calibration_status_get(CALIBRATION_STATUS_TEMP_MODEL) && thermal_model_enabled()) +#ifdef THERMAL_MODEL + if (!calibration_status_get(CALIBRATION_STATUS_THERMAL_MODEL) && thermal_model_enabled()) lcd_show_fullscreen_message_and_wait_P(_T(MSG_TM_NOT_CAL)); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL } } @@ -7330,7 +7330,7 @@ Sigma_Exit: } break; -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL /*! ### M310 - Temperature model settings M310: Temperature model settings #### Usage @@ -8878,7 +8878,7 @@ Sigma_Exit: }; #endif -#ifdef TEMP_MODEL_DEBUG +#ifdef THERMAL_MODEL_DEBUG /*! ## D70 - Enable low-level temperature model logging for offline simulation #### Usage diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index aefc50628..d6358773c 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -336,14 +336,14 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 03h 3 | ^ | bad_isr | ^ | ^ | ^ | ^ | ^ | 04h 4 | ^ | bad_pullup_temp_isr | ^ | ^ | ^ | ^ | ^ | 05h 5 | ^ | bad_pullup_step_isr | ^ | ^ -| 0x0D02 3330 | uint8 | EEPROM_TEMP_MODEL_ENABLE | 00h 0 | ff/00 | Temp model deactivated | Temp model | D3 Ax0d02 C1 +| 0x0D02 3330 | uint8 | EEPROM_THERMAL_MODEL_ENABLE | 00h 0 | ff/00 | Temp model deactivated | Temp model | D3 Ax0d02 C1 | ^ | ^ | ^ | 01h 1 | ^ | Temp model activated | ^ | ^ -| 0x0CFE 3326 | float | EEPROM_TEMP_MODEL_P | ??? | ff ff ff ffh | Temp model power (W) | Temp model | D3 Ax0cfe C4 -| 0x0CFA 3322 | float | EEPROM_TEMP_MODEL_C | ??? | ff ff ff ffh | Temp model capacitance (J/K) | Temp model | D3 Ax0cfa C4 -| 0x0CBA 3258 |float[16]| EEPROM_TEMP_MODEL_R | ??? | ff ff ff ffh | Temp model resistance (K/W) | Temp model | D3 Ax0cba C64 -| 0x0CB6 3254 | float | EEPROM_TEMP_MODEL_Ta_corr | ??? | ff ff ff ffh | Temp model ambient temperature correction (K) | Temp model | D3 Ax0cb6 C4 -| 0x0CB2 3250 | float | EEPROM_TEMP_MODEL_W | ??? | ff ff ff ffh | Temp model warning threshold (K/s) | Temp model | D3 Ax0cb2 C4 -| 0x0CAE 3246 | float | EEPROM_TEMP_MODEL_E | ??? | ff ff ff ffh | Temp model error threshold (K/s) | Temp model | D3 Ax0cae C4 +| 0x0CFE 3326 | float | EEPROM_THERMAL_MODEL_P | ??? | ff ff ff ffh | Temp model power (W) | Temp model | D3 Ax0cfe C4 +| 0x0CFA 3322 | float | EEPROM_THERMAL_MODEL_C | ??? | ff ff ff ffh | Temp model capacitance (J/K) | Temp model | D3 Ax0cfa C4 +| 0x0CBA 3258 |float[16]| EEPROM_THERMAL_MODEL_R | ??? | ff ff ff ffh | Temp model resistance (K/W) | Temp model | D3 Ax0cba C64 +| 0x0CB6 3254 | float | EEPROM_THERMAL_MODEL_Ta_corr | ??? | ff ff ff ffh | Temp model ambient temperature correction (K) | Temp model | D3 Ax0cb6 C4 +| 0x0CB2 3250 | float | EEPROM_THERMAL_MODEL_W | ??? | ff ff ff ffh | Temp model warning threshold (K/s) | Temp model | D3 Ax0cb2 C4 +| 0x0CAE 3246 | float | EEPROM_THERMAL_MODEL_E | ??? | ff ff ff ffh | Temp model error threshold (K/s) | Temp model | D3 Ax0cae C4 | 0x0CAD 3245 | uint8 | EEPROM_FSENSOR_JAM_DETECTION | 01h 1 | ff/01 | fsensor pat9125 jam detection feature | LCD menu | D3 Ax0cad C1 | 0x0CAC 3244 | uint8 | EEPROM_MMU_ENABLED | 00h 0 | ff/00 | MMU enabled | LCD menu | D3 Ax0cac C1 | 0x0CA8 3240 | uint32 | EEPROM_MMU_MATERIAL_CHANGES | ??? | ff ff ff ffh | MMU toolchange counter over printers lifetime | LCD statistic| D3 Ax0ca8 C4 @@ -359,11 +359,11 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 20h 32 | ^ | Free bit | ^ | ^ | ^ | ^ | ^ | 40h 64 | ^ | Free bit | ^ | ^ | ^ | ^ | ^ | 80h 128 | ^ | Unknown | ^ | ^ -| 0x0CA2 3234 | float | EEPROM_TEMP_MODEL_U | ??? | ff ff ff ffh | Temp model linear temperature coefficient (W/K/W) | Temp model | D3 Ax0ca2 C4 -| 0x0C9E 3230 | float | EEPROM_TEMP_MODEL_V | ??? | ff ff ff ffh | Temp model linear temperature intercept (W/W) | Temp model | D3 Ax0c9e C4 -| 0x0C9A 3226 | float | EEPROM_TEMP_MODEL_D | ??? | ff ff ff ffh | Temp model sim. 1st order IIR filter factor | Temp model | D3 Ax0c9a C4 -| 0x0C98 3224 | uint16 | EEPROM_TEMP_MODEL_L | 0-2160 | ff ffh | Temp model sim. response lag (ms) | Temp model | D3 Ax0c98 C2 -| 0x0C97 3223 | uint8 | EEPROM_TEMP_MODEL_VER | 0-255 | ffh | Temp model Version | Temp model | D3 Ax0c97 C1 +| 0x0CA2 3234 | float | EEPROM_THERMAL_MODEL_U | ??? | ff ff ff ffh | Temp model linear temperature coefficient (W/K/W) | Temp model | D3 Ax0ca2 C4 +| 0x0C9E 3230 | float | EEPROM_THERMAL_MODEL_V | ??? | ff ff ff ffh | Temp model linear temperature intercept (W/W) | Temp model | D3 Ax0c9e C4 +| 0x0C9A 3226 | float | EEPROM_THERMAL_MODEL_D | ??? | ff ff ff ffh | Temp model sim. 1st order IIR filter factor | Temp model | D3 Ax0c9a C4 +| 0x0C98 3224 | uint16 | EEPROM_THERMAL_MODEL_L | 0-2160 | ff ffh | Temp model sim. response lag (ms) | Temp model | D3 Ax0c98 C2 +| 0x0C97 3223 | uint8 | EEPROM_THERMAL_MODEL_VER | 0-255 | ffh | Temp model Version | Temp model | D3 Ax0c97 C1 | 0x0C95 3221 | PGM_P | EEPROM_KILL_MESSAGE | 0-65535 | ff ffh | Kill message PGM pointer | kill() | D3 Ax0c95 C2 | 0x0C94 3220 | uint8 | EEPROM_KILL_PENDING_FLAG | 42h, ffh | ffh | Kill pending flag (0x42 magic value) | kill() | D3 Ax0c94 C1 @@ -581,27 +581,27 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE); #define EEPROM_ECOOL_ENABLE (EEPROM_JOB_ID-1) // uint8_t #define EEPROM_FW_CRASH_FLAG (EEPROM_ECOOL_ENABLE-1) // uint8_t -#define EEPROM_TEMP_MODEL_ENABLE (EEPROM_FW_CRASH_FLAG-1) // uint8_t -#define EEPROM_TEMP_MODEL_P (EEPROM_TEMP_MODEL_ENABLE-4) // float -#define EEPROM_TEMP_MODEL_C (EEPROM_TEMP_MODEL_P-4) // float -#define EEPROM_TEMP_MODEL_R (EEPROM_TEMP_MODEL_C-4*16) // float[16] -#define EEPROM_TEMP_MODEL_Ta_corr (EEPROM_TEMP_MODEL_R-4) // float -#define EEPROM_TEMP_MODEL_W (EEPROM_TEMP_MODEL_Ta_corr-4) // float -#define EEPROM_TEMP_MODEL_E (EEPROM_TEMP_MODEL_W-4) // float +#define EEPROM_THERMAL_MODEL_ENABLE (EEPROM_FW_CRASH_FLAG-1) // uint8_t +#define EEPROM_THERMAL_MODEL_P (EEPROM_THERMAL_MODEL_ENABLE-4) // float +#define EEPROM_THERMAL_MODEL_C (EEPROM_THERMAL_MODEL_P-4) // float +#define EEPROM_THERMAL_MODEL_R (EEPROM_THERMAL_MODEL_C-4*16) // float[16] +#define EEPROM_THERMAL_MODEL_Ta_corr (EEPROM_THERMAL_MODEL_R-4) // float +#define EEPROM_THERMAL_MODEL_W (EEPROM_THERMAL_MODEL_Ta_corr-4) // float +#define EEPROM_THERMAL_MODEL_E (EEPROM_THERMAL_MODEL_W-4) // float -#define EEPROM_FSENSOR_JAM_DETECTION (EEPROM_TEMP_MODEL_E-1) // uint8_t +#define EEPROM_FSENSOR_JAM_DETECTION (EEPROM_THERMAL_MODEL_E-1) // uint8_t #define EEPROM_MMU_ENABLED (EEPROM_FSENSOR_JAM_DETECTION-1) // uint8_t #define EEPROM_MMU_MATERIAL_CHANGES (EEPROM_MMU_ENABLED-4) // uint32_t #define EEPROM_HEAT_BED_ON_LOAD_FILAMENT (EEPROM_MMU_MATERIAL_CHANGES-1) //uint8 #define EEPROM_CALIBRATION_STATUS_V2 (EEPROM_HEAT_BED_ON_LOAD_FILAMENT-1) //uint8 -#define EEPROM_TEMP_MODEL_U (EEPROM_CALIBRATION_STATUS_V2-4) //float -#define EEPROM_TEMP_MODEL_V (EEPROM_TEMP_MODEL_U-4) //float -#define EEPROM_TEMP_MODEL_D (EEPROM_TEMP_MODEL_V-4) //float -#define EEPROM_TEMP_MODEL_L (EEPROM_TEMP_MODEL_D-2) //uint16_t -#define EEPROM_TEMP_MODEL_VER (EEPROM_TEMP_MODEL_L-1) //uint8_t +#define EEPROM_THERMAL_MODEL_U (EEPROM_CALIBRATION_STATUS_V2-4) //float +#define EEPROM_THERMAL_MODEL_V (EEPROM_THERMAL_MODEL_U-4) //float +#define EEPROM_THERMAL_MODEL_D (EEPROM_THERMAL_MODEL_V-4) //float +#define EEPROM_THERMAL_MODEL_L (EEPROM_THERMAL_MODEL_D-2) //uint16_t +#define EEPROM_THERMAL_MODEL_VER (EEPROM_THERMAL_MODEL_L-1) //uint8_t -#define EEPROM_KILL_MESSAGE (EEPROM_TEMP_MODEL_VER-2) //PGM_P +#define EEPROM_KILL_MESSAGE (EEPROM_THERMAL_MODEL_VER-2) //PGM_P #define EEPROM_KILL_PENDING_FLAG (EEPROM_KILL_MESSAGE-1) //uint8 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items. diff --git a/Firmware/menu.h b/Firmware/menu.h index d89b11365..02692984e 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -35,8 +35,8 @@ extern uint8_t menu_depth; enum ESeriousErrors { MENU_BLOCK_NONE = 0, MENU_BLOCK_THERMAL_ERROR = 0x01, -#ifdef TEMP_MODEL - MENU_BLOCK_TEMP_MODEL_AUTOTUNE = 0x02, +#ifdef THERMAL_MODEL + MENU_BLOCK_THERMAL_MODEL_AUTOTUNE = 0x02, #endif MENU_BLOCK_STATUS_SCREEN_M0 = 0x04, }; // and possibly others in the future. diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index a1647d329..56c03257e 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -173,7 +173,7 @@ const char MSG_IR_03_OR_OLDER[] PROGMEM_I1 = ISTR(" 0.3 or older");////MSG_IR_03 const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////MSG_IR_UNKNOWN c=18 #endif extern const char MSG_PAUSED_THERMAL_ERROR[] PROGMEM_I1 = ISTR("PAUSED THERMAL ERROR");////MSG_PAUSED_THERMAL_ERROR c=20 -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL extern const char MSG_THERMAL_ANOMALY[] PROGMEM_I1 = ISTR("THERMAL ANOMALY");////MSG_THERMAL_ANOMALY c=20 extern const char MSG_TM_NOT_CAL[] PROGMEM_I1 = ISTR("Thermal model not calibrated yet.");////MSG_TM_NOT_CAL c=20 r=4 extern const char MSG_TM_ACK_ERROR[] PROGMEM_I1 = ISTR("Clear TM error");////MSG_TM_ACK_ERROR c=18 diff --git a/Firmware/messages.h b/Firmware/messages.h index 0d770371c..59a7d63fa 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -177,7 +177,7 @@ extern const char MSG_IR_03_OR_OLDER[]; extern const char MSG_IR_UNKNOWN[]; #endif extern const char MSG_PAUSED_THERMAL_ERROR[]; -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL extern const char MSG_THERMAL_ANOMALY[]; extern const char MSG_TM_NOT_CAL[]; extern const char MSG_TM_ACK_ERROR[]; diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 4f44749ba..684ea8d04 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -92,7 +92,7 @@ #define ENABLE_TEMP_MGR_INTERRUPT() TIMSKx |= (1< 0)) return false; if(!(data.Ta_corr != NAN)) return false; - for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) { + for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i) { if(!(thermal_model::data.R[i] >= 0)) return false; } @@ -2234,7 +2234,7 @@ static void handle_warning() } } -#ifdef TEMP_MODEL_DEBUG +#ifdef THERMAL_MODEL_DEBUG static void log_usr() { if(!log_buf.enabled) return; @@ -2324,8 +2324,8 @@ static void thermal_model_set_lag(uint16_t ms) // ensure we do not exceed the maximum lag buffer and have at least one lag sample for filtering if(samples < 1) samples = 1; - else if(samples > TEMP_MODEL_MAX_LAG_SIZE) - samples = TEMP_MODEL_MAX_LAG_SIZE; + else if(samples > THERMAL_MODEL_MAX_LAG_SIZE) + samples = THERMAL_MODEL_MAX_LAG_SIZE; // round back to ms thermal_model::data.L = samples * intv_ms; @@ -2354,7 +2354,7 @@ void thermal_model_set_params(float P, float U, float V, float C, float D, int16 void thermal_model_set_resistance(uint8_t index, float R) { - if(index >= TEMP_MODEL_R_SIZE || R <= 0) + if(index >= THERMAL_MODEL_R_SIZE || R <= 0) return; TempMgrGuard temp_mgr_guard; @@ -2366,7 +2366,7 @@ void thermal_model_report_settings() { SERIAL_ECHO_START; SERIAL_ECHOLNPGM("Temperature Model settings:"); - for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) + for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i) printf_P(PSTR("%S M310 I%u R%.2f\n"), echomagic, (unsigned)i, (double)thermal_model::data.R[i]); printf_P(PSTR("%S M310 P%.2f U%.4f V%.2f C%.2f D%.4f L%u S%u B%u E%.2f W%.2f T%.2f\n"), echomagic, (double)thermal_model::data.P, (double)thermal_model::data.U, (double)thermal_model::data.V, @@ -2380,17 +2380,17 @@ void thermal_model_reset_settings() { TempMgrGuard temp_mgr_guard; - thermal_model::data.P = TEMP_MODEL_DEF(P); - thermal_model::data.U = TEMP_MODEL_DEF(U); - thermal_model::data.V = TEMP_MODEL_DEF(V); - thermal_model::data.C = TEMP_MODEL_DEF(C); - thermal_model::data.fS = TEMP_MODEL_DEF(fS); - thermal_model::data.L = (uint16_t)(TEMP_MODEL_DEF(LAG) / (TEMP_MGR_INTV * 1000) + 0.5) * (uint16_t)(TEMP_MGR_INTV * 1000); - for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - thermal_model::data.R[i] = pgm_read_float(TEMP_MODEL_R_DEFAULT + i); - thermal_model::data.Ta_corr = TEMP_MODEL_Ta_corr; - thermal_model::data.warn = TEMP_MODEL_DEF(W); - thermal_model::data.err = TEMP_MODEL_DEF(E); + thermal_model::data.P = THERMAL_MODEL_DEF(P); + thermal_model::data.U = THERMAL_MODEL_DEF(U); + thermal_model::data.V = THERMAL_MODEL_DEF(V); + thermal_model::data.C = THERMAL_MODEL_DEF(C); + thermal_model::data.fS = THERMAL_MODEL_DEF(fS); + thermal_model::data.L = (uint16_t)(THERMAL_MODEL_DEF(LAG) / (TEMP_MGR_INTV * 1000) + 0.5) * (uint16_t)(TEMP_MGR_INTV * 1000); + for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i) + thermal_model::data.R[i] = pgm_read_float(THERMAL_MODEL_R_DEFAULT + i); + thermal_model::data.Ta_corr = THERMAL_MODEL_Ta_corr; + thermal_model::data.warn = THERMAL_MODEL_DEF(W); + thermal_model::data.err = THERMAL_MODEL_DEF(E); thermal_model::warn_beep = true; thermal_model::enabled = true; thermal_model::reinitialize(); @@ -2398,29 +2398,29 @@ void thermal_model_reset_settings() void thermal_model_load_settings() { - static_assert(TEMP_MODEL_R_SIZE == 16); // ensure we don't desync with the eeprom table + static_assert(THERMAL_MODEL_R_SIZE == 16); // ensure we don't desync with the eeprom table TempMgrGuard temp_mgr_guard; // handle upgrade from a model without UVDL (FW<3.13, TM VER<1): model is retro-compatible, // reset UV to an identity without doing any special handling - eeprom_init_default_float((float*)EEPROM_TEMP_MODEL_U, TEMP_MODEL_DEF(U)); - eeprom_init_default_float((float*)EEPROM_TEMP_MODEL_V, TEMP_MODEL_DEF(V)); - eeprom_init_default_float((float*)EEPROM_TEMP_MODEL_D, TEMP_MODEL_DEF(fS)); - eeprom_init_default_word((uint16_t*)EEPROM_TEMP_MODEL_L, TEMP_MODEL_DEF(LAG)); - eeprom_init_default_byte((uint8_t*)EEPROM_TEMP_MODEL_VER, TEMP_MODEL_DEF(VER)); + eeprom_init_default_float((float*)EEPROM_THERMAL_MODEL_U, THERMAL_MODEL_DEF(U)); + eeprom_init_default_float((float*)EEPROM_THERMAL_MODEL_V, THERMAL_MODEL_DEF(V)); + eeprom_init_default_float((float*)EEPROM_THERMAL_MODEL_D, THERMAL_MODEL_DEF(fS)); + eeprom_init_default_word((uint16_t*)EEPROM_THERMAL_MODEL_L, THERMAL_MODEL_DEF(LAG)); + eeprom_init_default_byte((uint8_t*)EEPROM_THERMAL_MODEL_VER, THERMAL_MODEL_DEF(VER)); - thermal_model::enabled = eeprom_read_byte((uint8_t*)EEPROM_TEMP_MODEL_ENABLE); - thermal_model::data.P = eeprom_read_float((float*)EEPROM_TEMP_MODEL_P); - thermal_model::data.U = eeprom_read_float((float*)EEPROM_TEMP_MODEL_U); - thermal_model::data.V = eeprom_read_float((float*)EEPROM_TEMP_MODEL_V); - thermal_model::data.C = eeprom_read_float((float*)EEPROM_TEMP_MODEL_C); - thermal_model::data.fS = eeprom_read_float((float*)EEPROM_TEMP_MODEL_D); - thermal_model_set_lag(eeprom_read_word((uint16_t*)EEPROM_TEMP_MODEL_L)); - for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - thermal_model::data.R[i] = eeprom_read_float((float*)EEPROM_TEMP_MODEL_R + i); - thermal_model::data.Ta_corr = eeprom_read_float((float*)EEPROM_TEMP_MODEL_Ta_corr); - thermal_model::data.warn = eeprom_read_float((float*)EEPROM_TEMP_MODEL_W); - thermal_model::data.err = eeprom_read_float((float*)EEPROM_TEMP_MODEL_E); + thermal_model::enabled = eeprom_read_byte((uint8_t*)EEPROM_THERMAL_MODEL_ENABLE); + thermal_model::data.P = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_P); + thermal_model::data.U = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_U); + thermal_model::data.V = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_V); + thermal_model::data.C = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_C); + thermal_model::data.fS = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_D); + thermal_model_set_lag(eeprom_read_word((uint16_t*)EEPROM_THERMAL_MODEL_L)); + for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i) + thermal_model::data.R[i] = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_R + i); + thermal_model::data.Ta_corr = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_Ta_corr); + thermal_model::data.warn = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_W); + thermal_model::data.err = eeprom_read_float((float*)EEPROM_THERMAL_MODEL_E); if(!thermal_model::calibrated()) { SERIAL_ECHOLNPGM("TM: stored calibration invalid, resetting"); @@ -2431,18 +2431,18 @@ void thermal_model_load_settings() void thermal_model_save_settings() { - eeprom_update_byte((uint8_t*)EEPROM_TEMP_MODEL_ENABLE, thermal_model::enabled); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_P, thermal_model::data.P); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_U, thermal_model::data.U); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_V, thermal_model::data.V); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_C, thermal_model::data.C); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_D, thermal_model::data.fS); - eeprom_update_word((uint16_t*)EEPROM_TEMP_MODEL_L, thermal_model::data.L); - for(uint8_t i = 0; i != TEMP_MODEL_R_SIZE; ++i) - eeprom_update_float((float*)EEPROM_TEMP_MODEL_R + i, thermal_model::data.R[i]); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_Ta_corr, thermal_model::data.Ta_corr); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_W, thermal_model::data.warn); - eeprom_update_float((float*)EEPROM_TEMP_MODEL_E, thermal_model::data.err); + eeprom_update_byte((uint8_t*)EEPROM_THERMAL_MODEL_ENABLE, thermal_model::enabled); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_P, thermal_model::data.P); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_U, thermal_model::data.U); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_V, thermal_model::data.V); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_C, thermal_model::data.C); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_D, thermal_model::data.fS); + eeprom_update_word((uint16_t*)EEPROM_THERMAL_MODEL_L, thermal_model::data.L); + for(uint8_t i = 0; i != THERMAL_MODEL_R_SIZE; ++i) + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_R + i, thermal_model::data.R[i]); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_Ta_corr, thermal_model::data.Ta_corr); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_W, thermal_model::data.warn); + eeprom_update_float((float*)EEPROM_THERMAL_MODEL_E, thermal_model::data.err); } namespace thermal_model_cal { @@ -2618,10 +2618,10 @@ static bool autotune(int16_t cal_temp) for(uint8_t i = 0; i != 2; ++i) { const char* PROGMEM verb = (i == 0? PSTR("initial"): PSTR("refine")); target_temperature[0] = 0; - if(current_temperature[0] >= TEMP_MODEL_CAL_T_low) { - sprintf_P(tm_message, PSTR("TM: cool down <%dC"), TEMP_MODEL_CAL_T_low); + if(current_temperature[0] >= THERMAL_MODEL_CAL_T_low) { + sprintf_P(tm_message, PSTR("TM: cool down <%dC"), THERMAL_MODEL_CAL_T_low); lcd_setstatus_serial(tm_message); - cooldown(TEMP_MODEL_CAL_T_low); + cooldown(THERMAL_MODEL_CAL_T_low); wait(10000); } @@ -2634,11 +2634,11 @@ static bool autotune(int16_t cal_temp) // we need a high R value for the initial C guess if(isnan(thermal_model::data.R[0])) - thermal_model::data.R[0] = TEMP_MODEL_CAL_R_high; + thermal_model::data.R[0] = THERMAL_MODEL_CAL_R_high; e = estimate(samples, &thermal_model::data.C, - TEMP_MODEL_CAL_C_low, TEMP_MODEL_CAL_C_high, - TEMP_MODEL_CAL_C_thr, TEMP_MODEL_CAL_C_itr, + THERMAL_MODEL_CAL_C_low, THERMAL_MODEL_CAL_C_high, + THERMAL_MODEL_CAL_C_thr, THERMAL_MODEL_CAL_C_itr, 0, current_temperature_ambient); if(isnan(e)) return true; @@ -2654,8 +2654,8 @@ static bool autotune(int16_t cal_temp) return true; e = estimate(samples, &thermal_model::data.R[0], - TEMP_MODEL_CAL_R_low, TEMP_MODEL_CAL_R_high, - TEMP_MODEL_CAL_R_thr, TEMP_MODEL_CAL_R_itr, + THERMAL_MODEL_CAL_R_low, THERMAL_MODEL_CAL_R_high, + THERMAL_MODEL_CAL_R_thr, THERMAL_MODEL_CAL_R_itr, 0, current_temperature_ambient); if(isnan(e)) return true; @@ -2668,12 +2668,12 @@ static bool autotune(int16_t cal_temp) set_fan_speed(255); wait(30000); - for(int8_t i = TEMP_MODEL_R_SIZE - 1; i > 0; i -= TEMP_MODEL_CAL_R_STEP) { + for(int8_t i = THERMAL_MODEL_R_SIZE - 1; i > 0; i -= THERMAL_MODEL_CAL_R_STEP) { // always disable the checker while estimating fan resistance as the difference // (esp with 3rd-party blowers) can be massive thermal_model::data.R[i] = NAN; - uint8_t speed = 256 / TEMP_MODEL_R_SIZE * (i + 1) - 1; + uint8_t speed = 256 / THERMAL_MODEL_R_SIZE * (i + 1) - 1; set_fan_speed(speed); wait(10000); @@ -2686,7 +2686,7 @@ static bool autotune(int16_t cal_temp) // a fixed fan pwm (the norminal value) is used here, as soft_pwm_fan will be modified // during fan measurements and we'd like to include that skew during normal operation. e = estimate(samples, &thermal_model::data.R[i], - TEMP_MODEL_CAL_R_low, thermal_model::data.R[0], TEMP_MODEL_CAL_R_thr, TEMP_MODEL_CAL_R_itr, + THERMAL_MODEL_CAL_R_low, thermal_model::data.R[0], THERMAL_MODEL_CAL_R_thr, THERMAL_MODEL_CAL_R_itr, i, current_temperature_ambient); if(isnan(e)) return true; @@ -2694,15 +2694,15 @@ static bool autotune(int16_t cal_temp) // interpolate remaining steps to speed-up calibration // TODO: verify that the sampled values are monotically increasing? - int8_t next = TEMP_MODEL_R_SIZE - 1; - for(uint8_t i = TEMP_MODEL_R_SIZE - 2; i != 0; --i) { - if(!((TEMP_MODEL_R_SIZE - i - 1) % TEMP_MODEL_CAL_R_STEP)) { + int8_t next = THERMAL_MODEL_R_SIZE - 1; + for(uint8_t i = THERMAL_MODEL_R_SIZE - 2; i != 0; --i) { + if(!((THERMAL_MODEL_R_SIZE - i - 1) % THERMAL_MODEL_CAL_R_STEP)) { next = i; continue; } - int8_t prev = next - TEMP_MODEL_CAL_R_STEP; + int8_t prev = next - THERMAL_MODEL_CAL_R_STEP; if(prev < 0) prev = 0; - float f = (float)(i - prev) / TEMP_MODEL_CAL_R_STEP; + float f = (float)(i - prev) / THERMAL_MODEL_CAL_R_STEP; float d = (thermal_model::data.R[next] - thermal_model::data.R[prev]); thermal_model::data.R[i] = thermal_model::data.R[prev] + d * f; } @@ -2716,7 +2716,7 @@ static bool thermal_model_autotune_err = true; void thermal_model_autotune(int16_t temp, bool selftest) { - float orig_C, orig_R[TEMP_MODEL_R_SIZE]; + float orig_C, orig_R[THERMAL_MODEL_R_SIZE]; bool orig_enabled; static_assert(sizeof(orig_R) == sizeof(thermal_model::data.R)); @@ -2732,7 +2732,7 @@ void thermal_model_autotune(int16_t temp, bool selftest) // lockout the printer during calibration KEEPALIVE_STATE(IN_PROCESS); - menu_set_block(MENU_BLOCK_TEMP_MODEL_AUTOTUNE); + menu_set_block(MENU_BLOCK_THERMAL_MODEL_AUTOTUNE); lcd_return_to_status(); // save the original model data and set the model checking state during self-calibration @@ -2743,7 +2743,7 @@ void thermal_model_autotune(int16_t temp, bool selftest) // autotune SERIAL_ECHOLNPGM("TM: calibration start"); - thermal_model_autotune_err = thermal_model_cal::autotune(temp > 0 ? temp : TEMP_MODEL_CAL_T_high); + thermal_model_autotune_err = thermal_model_cal::autotune(temp > 0 ? temp : THERMAL_MODEL_CAL_T_high); // always reset temperature disable_heater(); @@ -2762,7 +2762,7 @@ void thermal_model_autotune(int16_t temp, bool selftest) memcpy(thermal_model::data.R, orig_R, sizeof(thermal_model::data.R)); thermal_model_set_enabled(orig_enabled); } else { - calibration_status_set(CALIBRATION_STATUS_TEMP_MODEL); + calibration_status_set(CALIBRATION_STATUS_THERMAL_MODEL); lcd_setstatuspgm(MSG_WELCOME); thermal_model_cal::set_fan_speed(0); thermal_model_set_enabled(orig_enabled); @@ -2770,7 +2770,7 @@ void thermal_model_autotune(int16_t temp, bool selftest) } lcd_consume_click(); - menu_unset_block(MENU_BLOCK_TEMP_MODEL_AUTOTUNE); + menu_unset_block(MENU_BLOCK_THERMAL_MODEL_AUTOTUNE); } bool thermal_model_autotune_result() @@ -2778,7 +2778,7 @@ bool thermal_model_autotune_result() return !thermal_model_autotune_err; } -#ifdef TEMP_MODEL_DEBUG +#ifdef THERMAL_MODEL_DEBUG void thermal_model_log_enable(bool enable) { if(enable) { diff --git a/Firmware/temperature.h b/Firmware/temperature.h index 07a05bba9..1264439ee 100755 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -174,7 +174,7 @@ FORCE_INLINE void autotempShutdown(){ void PID_autotune(float temp, int extruder, int ncycles); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL bool thermal_model_enabled(); // return temperature model state void thermal_model_set_enabled(bool enabled); void thermal_model_set_warn_beep(bool enabled); @@ -190,7 +190,7 @@ void thermal_model_save_settings(); void thermal_model_autotune(int16_t temp = 0, bool selftest = false); bool thermal_model_autotune_result(); // return true if the last autotune was complete and successful -#ifdef TEMP_MODEL_DEBUG +#ifdef THERMAL_MODEL_DEBUG void thermal_model_log_enable(bool enable); #endif #endif diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 366cc3654..e980bf7ff 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -887,7 +887,7 @@ void lcd_commands() } } -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL if (lcd_commands_type == LcdCommands::TempModel && cmd_buffer_empty()) { switch (lcd_commands_step) @@ -931,15 +931,15 @@ void lcd_commands() break; } } -#endif //TEMP_MODEL +#endif //THERMAL_MODEL if (lcd_commands_type == LcdCommands::NozzleCNG) { if (!blocks_queued() && cmd_buffer_empty() && !saved_printing) { -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL static bool was_enabled; -#endif //TEMP_MODEL +#endif //THERMAL_MODEL switch(lcd_commands_step) { case 0: @@ -953,10 +953,10 @@ void lcd_commands() enquecommand_P(G28W); enquecommand_P(PSTR("G1 X125 Z200 F1000")); enquecommand_P(PSTR("M109 S280")); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL was_enabled = thermal_model_enabled(); thermal_model_set_enabled(false); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL lcd_commands_step = 2; break; case 2: @@ -969,9 +969,9 @@ void lcd_commands() lcd_update_enabled = false; //hack to avoid lcd_update recursion. if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_CHANGED), false) == LCD_LEFT_BUTTON_CHOICE) { setTargetHotend(0); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL thermal_model_set_enabled(was_enabled); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL lcd_commands_step = 1; } lcd_update_enabled = true; @@ -3802,10 +3802,10 @@ void lcd_wizard(WizState state) state = S::Xyz; } else if (!calibration_status_get(CALIBRATION_STATUS_Z)) { state = S::Z; -#ifdef TEMP_MODEL - } else if (!calibration_status_get(CALIBRATION_STATUS_TEMP_MODEL)) { +#ifdef THERMAL_MODEL + } else if (!calibration_status_get(CALIBRATION_STATUS_THERMAL_MODEL)) { state = S::TempModel; -#endif //TEMP_MODEL +#endif //THERMAL_MODEL } else if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) { state = S::IsFil; } else { @@ -3847,13 +3847,13 @@ void lcd_wizard(WizState state) state = S::Restore; } break; -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL case S::TempModel: lcd_show_fullscreen_message_and_wait_P(_i("Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"));////MSG_TM_CAL c=20 r=4 lcd_commands_type = LcdCommands::TempModel; end = true; // Leave wizard temporarily for TM cal. break; -#endif //TEMP_MODEL +#endif //THERMAL_MODEL case S::IsFil: //start to preheat nozzle and bed to save some time later setTargetHotend(PLA_PREHEAT_HOTEND_TEMP); @@ -4551,9 +4551,9 @@ static void lcd_calibration_menu() MENU_ITEM_FUNCTION_P(_T(MSG_PINDA_CALIBRATION), lcd_calibrate_pinda); #endif } -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL MENU_ITEM_SUBMENU_P(_n("Thermal Model cal."), lcd_thermal_model_cal); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL MENU_END(); } @@ -5173,7 +5173,7 @@ static void lcd_main_menu() if((printJobOngoing() || isPrintPaused) && (custom_message_type != CustomMsg::MeshBedLeveling) && !processing_tcode) { MENU_ITEM_SUBMENU_P(_T(MSG_STOP_PRINT), lcd_sdcard_stop); } -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL else if(Stopped) { MENU_ITEM_SUBMENU_P(_T(MSG_TM_ACK_ERROR), lcd_print_stop); } @@ -5591,13 +5591,13 @@ void lcd_print_stop() print_stop(true); } -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL void lcd_thermal_model_cal() { lcd_commands_type = LcdCommands::TempModel; lcd_return_to_status(); } -#endif //TEMP_MODEL +#endif //THERMAL_MODEL void lcd_sdcard_stop() { @@ -6447,10 +6447,10 @@ static bool lcd_selfcheck_check_heater(bool _isbed) target_temperature[0] = (_isbed) ? 0 : 200; target_temperature_bed = (_isbed) ? 100 : 0; -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL bool tm_was_enabled = thermal_model_enabled(); thermal_model_set_enabled(false); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL manage_heater(); manage_inactivity(true); @@ -6499,9 +6499,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed) lcd_selftest_error(TestError::Bed, "", ""); } -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL thermal_model_set_enabled(tm_was_enabled); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL manage_heater(); manage_inactivity(true); return _stepresult; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index ea1681837..441f6b5c0 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -50,9 +50,9 @@ void lcd_pause_usb_print(); void lcd_resume_print(); void lcd_print_stop(); // interactive print stop void print_stop(bool interactive=false); -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL void lcd_thermal_model_cal(); -#endif //TEMP_MODEL +#endif //THERMAL_MODEL void lcd_load_filament_color_check(); extern void lcd_belttest(); @@ -117,9 +117,9 @@ enum class LcdCommands : uint_least8_t LongPause, PidExtruder, Layer1Cal, -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL TempModel, -#endif //TEMP_MODEL +#endif //THERMAL_MODEL NozzleCNG, }; @@ -225,9 +225,9 @@ enum class WizState : uint8_t Selftest, //!< self test Xyz, //!< xyz calibration Z, //!< z calibration -#ifdef TEMP_MODEL +#ifdef THERMAL_MODEL TempModel, //!< Temp model calibration -#endif //TEMP_MODEL +#endif //THERMAL_MODEL IsFil, //!< Is filament loaded? First step of 1st layer calibration Preheat, //!< Preheat for any material LoadFilCold, //!< Load filament for MMU diff --git a/Firmware/util.h b/Firmware/util.h index 20f03388b..26deb782a 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -106,8 +106,8 @@ typedef uint8_t CalibrationStatus; const CalibrationStatus CALIBRATION_STATUS_SELFTEST = 0b00000001; // Selftest const CalibrationStatus CALIBRATION_STATUS_XYZ = 0b00000010; // XYZ calibration const CalibrationStatus CALIBRATION_STATUS_Z = 0b00000100; // Z calibration -#ifdef TEMP_MODEL -const CalibrationStatus CALIBRATION_STATUS_TEMP_MODEL = 0b00001000; // Temperature model calibration +#ifdef THERMAL_MODEL +const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Temperature model calibration #endif const CalibrationStatus CALIBRATION_STATUS_LIVE_ADJUST = 0b00010000; // 1st layer calibration const CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0b10000000; // Freshly assembled or unknown status @@ -117,8 +117,8 @@ const CalibrationStatus CALIBRATION_WIZARD_STEPS = CALIBRATION_STATUS_SELFTEST | CALIBRATION_STATUS_XYZ | CALIBRATION_STATUS_Z | -#ifdef TEMP_MODEL - CALIBRATION_STATUS_TEMP_MODEL | +#ifdef THERMAL_MODEL + CALIBRATION_STATUS_THERMAL_MODEL | #endif CALIBRATION_STATUS_LIVE_ADJUST; diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index fe2f82432..e6ce1915d 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -384,26 +384,26 @@ #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 // model-based temperature check -#define TEMP_MODEL 1 // enable model-based temperature checks -#define TEMP_MODEL_DEBUG 1 // extended runtime logging +#define THERMAL_MODEL 1 // enable model-based temperature checks +#define THERMAL_MODEL_DEBUG 1 // extended runtime logging -#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit -#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit -#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold -#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit +#define THERMAL_MODEL_CAL_C_low 5 // C estimation lower limit +#define THERMAL_MODEL_CAL_C_high 20 // C estimation upper limit +#define THERMAL_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define THERMAL_MODEL_CAL_C_itr 30 // C estimation iteration limit -#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit -#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit -#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold -#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit +#define THERMAL_MODEL_CAL_R_low 5 // R estimation lower limit +#define THERMAL_MODEL_CAL_R_high 50 // R estimation upper limit +#define THERMAL_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define THERMAL_MODEL_CAL_R_itr 30 // R estimation iteration limit -#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) -#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) +#define THERMAL_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define THERMAL_MODEL_CAL_T_high 230 // Default calibration working temperature (C) -#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#define THERMAL_MODEL_Ta_corr -7 // Default ambient temperature correction #include "thermal_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters +#define THERMAL_MODEL_DEFAULT E3D_V6 // Default model parameters /*------------------------------------ diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 50fa2be55..8b9ee71e2 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -388,26 +388,26 @@ #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 // model-based temperature check -#define TEMP_MODEL 1 // enable model-based temperature checks -#define TEMP_MODEL_DEBUG 1 // extended runtime logging +#define THERMAL_MODEL 1 // enable model-based temperature checks +#define THERMAL_MODEL_DEBUG 1 // extended runtime logging -#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit -#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit -#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold -#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit +#define THERMAL_MODEL_CAL_C_low 5 // C estimation lower limit +#define THERMAL_MODEL_CAL_C_high 20 // C estimation upper limit +#define THERMAL_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define THERMAL_MODEL_CAL_C_itr 30 // C estimation iteration limit -#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit -#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit -#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold -#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit +#define THERMAL_MODEL_CAL_R_low 5 // R estimation lower limit +#define THERMAL_MODEL_CAL_R_high 50 // R estimation upper limit +#define THERMAL_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define THERMAL_MODEL_CAL_R_itr 30 // R estimation iteration limit -#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) -#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) +#define THERMAL_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define THERMAL_MODEL_CAL_T_high 230 // Default calibration working temperature (C) -#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#define THERMAL_MODEL_Ta_corr -7 // Default ambient temperature correction #include "thermal_model/e3d_v6.h" -#define TEMP_MODEL_DEFAULT E3D_V6 // Default model parameters +#define THERMAL_MODEL_DEFAULT E3D_V6 // Default model parameters /*------------------------------------ From 600a7a0316e82d6f002d7262e8bf22a6107bb647 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 08:38:24 +0200 Subject: [PATCH 142/148] Rename `Temp Model` to `Thermal Model` --- Firmware/eeprom.h | 30 +++++++++++++++--------------- Firmware/ultralcd.h | 2 +- lang/po/Firmware_sv.po | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index d6358773c..e0a598ab8 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -92,7 +92,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0FF7 4087 | uint8 | EEPROM_CALIBRATION_STATUS_V1 | ffh 255 | ffh 255 | Calibration status ( Date: Wed, 24 May 2023 08:39:24 +0200 Subject: [PATCH 143/148] Rename `TempModel` to `ThermalModel` --- Firmware/ultralcd.cpp | 10 +++++----- Firmware/ultralcd.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e980bf7ff..18b5b8bc5 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -888,7 +888,7 @@ void lcd_commands() } #ifdef THERMAL_MODEL - if (lcd_commands_type == LcdCommands::TempModel && cmd_buffer_empty()) + if (lcd_commands_type == LcdCommands::ThermalModel && cmd_buffer_empty()) { switch (lcd_commands_step) { @@ -3804,7 +3804,7 @@ void lcd_wizard(WizState state) state = S::Z; #ifdef THERMAL_MODEL } else if (!calibration_status_get(CALIBRATION_STATUS_THERMAL_MODEL)) { - state = S::TempModel; + state = S::ThermalModel; #endif //THERMAL_MODEL } else if (!calibration_status_get(CALIBRATION_STATUS_LIVE_ADJUST)) { state = S::IsFil; @@ -3848,9 +3848,9 @@ void lcd_wizard(WizState state) } break; #ifdef THERMAL_MODEL - case S::TempModel: + case S::ThermalModel: lcd_show_fullscreen_message_and_wait_P(_i("Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"));////MSG_TM_CAL c=20 r=4 - lcd_commands_type = LcdCommands::TempModel; + lcd_commands_type = LcdCommands::ThermalModel; end = true; // Leave wizard temporarily for TM cal. break; #endif //THERMAL_MODEL @@ -5594,7 +5594,7 @@ void lcd_print_stop() #ifdef THERMAL_MODEL void lcd_thermal_model_cal() { - lcd_commands_type = LcdCommands::TempModel; + lcd_commands_type = LcdCommands::ThermalModel; lcd_return_to_status(); } #endif //THERMAL_MODEL diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index e74390852..5e5c7dba3 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -118,7 +118,7 @@ enum class LcdCommands : uint_least8_t PidExtruder, Layer1Cal, #ifdef THERMAL_MODEL - TempModel, + ThermalModel, #endif //THERMAL_MODEL NozzleCNG, }; @@ -226,7 +226,7 @@ enum class WizState : uint8_t Xyz, //!< xyz calibration Z, //!< z calibration #ifdef THERMAL_MODEL - TempModel, //!< Thermal Model calibration + ThermalModel, //!< Thermal Model calibration #endif //THERMAL_MODEL IsFil, //!< Is filament loaded? First step of 1st layer calibration Preheat, //!< Preheat for any material From a6b209d36d2f0fa492b5bed1ffc3fe6abeb79a98 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 08:49:23 +0200 Subject: [PATCH 144/148] Rename `Temperature Model` to `Thermal Model` `Temperature model` to `Thermal model` `temperature model` to `thermal model` --- Firmware/Marlin_main.cpp | 6 +++--- Firmware/temperature.cpp | 4 ++-- Firmware/temperature.h | 2 +- Firmware/util.h | 2 +- tools/README.md | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ffb2d75d4..fd819ed25 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3932,7 +3932,7 @@ extern uint8_t st_backlash_y; //!@n M302 - Allow cold extrudes, or set the minimum extrude S. //!@n M303 - PID relay autotune S sets the target temperature. (default target temperature = 150C) //!@n M304 - Set bed PID parameters P I and D -//!@n M310 - Temperature model settings +//!@n M310 - Thermal model settings //!@n M400 - Finish all moves //!@n M401 - Lower z-probe if present //!@n M402 - Raise z-probe if present @@ -7332,7 +7332,7 @@ Sigma_Exit: #ifdef THERMAL_MODEL /*! - ### M310 - Temperature model settings M310: Temperature model settings + ### M310 - Thermal model settings M310: Thermal model settings #### Usage M310 ; report values @@ -8880,7 +8880,7 @@ Sigma_Exit: #ifdef THERMAL_MODEL_DEBUG /*! - ## D70 - Enable low-level temperature model logging for offline simulation + ## D70 - Enable low-level thermal model logging for offline simulation #### Usage D70 [ S ] diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 684ea8d04..82895486a 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -93,7 +93,7 @@ #define DISABLE_TEMP_MGR_INTERRUPT() TIMSKx &= ~(1< Date: Wed, 24 May 2023 08:53:27 +0200 Subject: [PATCH 145/148] Format `eeprom.h` doxygen documentation --- Firmware/eeprom.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index e0a598ab8..4b0446a9e 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -326,7 +326,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0D11 3345 | float | EEPROM_UVLO_ACCELL | ??? | ff ff ff ffh | Power panic saved normal acceleration | ??? | D3 Ax0d11 C4 | 0x0D0D 3341 | float | EEPROM_UVLO_RETRACT_ACCELL | ??? | ff ff ff ffh | Power panic saved retract acceleration | ??? | D3 Ax0d0d C4 | 0x0D09 3337 | float | EEPROM_UVLO_TRAVEL_ACCELL | ??? | ff ff ff ffh | Power panic saved travel acceleration | ??? | D3 Ax0d09 C4 -| 0x0D05 3333 | unint32 | EEPROM_JOB_ID | ??? | 00 00 00 00h | Job ID used by host software | D3 only | D3 Ax0d05 C4 +| 0x0D05 3333 | unint32 | EEPROM_JOB_ID | ??? | 00 00 00 00h | Job ID used by host software | D3 only | D3 Ax0d05 C4 | 0x0D04 3332 | uint8 | EEPROM_ECOOL_ENABLE | ffh 255 | ^ | Disable extruder motor scaling for non-farm print | LCD menu | D3 Ax0d04 C1 | ^ | ^ | ^ | 2ah 42 | ^ | Enable extruder motor scaling for non-farm print | ^ | D3 Ax0d04 C1 | 0x0D03 3331 | uint8 | EEPROM_FW_CRASH_FLAG | ffh 255 | ffh 255 | Last FW crash reason (dump_crash_reason) | D21/D22 | D3 Ax0d03 C1 @@ -336,14 +336,14 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 03h 3 | ^ | bad_isr | ^ | ^ | ^ | ^ | ^ | 04h 4 | ^ | bad_pullup_temp_isr | ^ | ^ | ^ | ^ | ^ | 05h 5 | ^ | bad_pullup_step_isr | ^ | ^ -| 0x0D02 3330 | uint8 | EEPROM_THERMAL_MODEL_ENABLE | 00h 0 | ff/00 | Thermal Model deactivated | Thermal Model | D3 Ax0d02 C1 -| ^ | ^ | ^ | 01h 1 | ^ | Thermal Model activated | ^ | ^ -| 0x0CFE 3326 | float | EEPROM_THERMAL_MODEL_P | ??? | ff ff ff ffh | Thermal Model power (W) | Thermal Model | D3 Ax0cfe C4 -| 0x0CFA 3322 | float | EEPROM_THERMAL_MODEL_C | ??? | ff ff ff ffh | Thermal Model capacitance (J/K) | Thermal Model | D3 Ax0cfa C4 -| 0x0CBA 3258 |float[16]| EEPROM_THERMAL_MODEL_R | ??? | ff ff ff ffh | Thermal Model resistance (K/W) | Thermal Model | D3 Ax0cba C64 -| 0x0CB6 3254 | float | EEPROM_THERMAL_MODEL_Ta_corr | ??? | ff ff ff ffh | Thermal Model ambient temperature correction (K) | Thermal Model | D3 Ax0cb6 C4 -| 0x0CB2 3250 | float | EEPROM_THERMAL_MODEL_W | ??? | ff ff ff ffh | Thermal Model warning threshold (K/s) | Thermal Model | D3 Ax0cb2 C4 -| 0x0CAE 3246 | float | EEPROM_THERMAL_MODEL_E | ??? | ff ff ff ffh | Thermal Model error threshold (K/s) | Thermal Model | D3 Ax0cae C4 +| 0x0D02 3330 | uint8 | EEPROM_THERMAL_MODEL_ENABLE | 00h 0 | ff/00 | Thermal Model deactivated | Thermal Model| D3 Ax0d02 C1 +| ^ | ^ | ^ | 01h 1 | ^ | Thermal Model activated | ^ | ^ +| 0x0CFE 3326 | float | EEPROM_THERMAL_MODEL_P | ??? | ff ff ff ffh | Thermal Model power (W) | Thermal Model| D3 Ax0cfe C4 +| 0x0CFA 3322 | float | EEPROM_THERMAL_MODEL_C | ??? | ff ff ff ffh | Thermal Model capacitance (J/K) | Thermal Model| D3 Ax0cfa C4 +| 0x0CBA 3258 |float[16]| EEPROM_THERMAL_MODEL_R | ??? | ff ff ff ffh | Thermal Model resistance (K/W) | Thermal Model| D3 Ax0cba C64 +| 0x0CB6 3254 | float | EEPROM_THERMAL_MODEL_Ta_corr | ??? | ff ff ff ffh | Thermal Model ambient temperature correction (K) | Thermal Model| D3 Ax0cb6 C4 +| 0x0CB2 3250 | float | EEPROM_THERMAL_MODEL_W | ??? | ff ff ff ffh | Thermal Model warning threshold (K/s) | Thermal Model| D3 Ax0cb2 C4 +| 0x0CAE 3246 | float | EEPROM_THERMAL_MODEL_E | ??? | ff ff ff ffh | Thermal Model error threshold (K/s) | Thermal Model| D3 Ax0cae C4 | 0x0CAD 3245 | uint8 | EEPROM_FSENSOR_JAM_DETECTION | 01h 1 | ff/01 | fsensor pat9125 jam detection feature | LCD menu | D3 Ax0cad C1 | 0x0CAC 3244 | uint8 | EEPROM_MMU_ENABLED | 00h 0 | ff/00 | MMU enabled | LCD menu | D3 Ax0cac C1 | 0x0CA8 3240 | uint32 | EEPROM_MMU_MATERIAL_CHANGES | ??? | ff ff ff ffh | MMU toolchange counter over printers lifetime | LCD statistic| D3 Ax0ca8 C4 @@ -354,16 +354,16 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | ^ | ^ | ^ | 01h 1 | ^ | Selftest passed | ^ | ^ | ^ | ^ | ^ | 02h 2 | ^ | XYZ cal passed | ^ | ^ | ^ | ^ | ^ | 04h 4 | ^ | Z cal passed | ^ | ^ -| ^ | ^ | ^ | 08h 8 | ^ | Thermal Model cal passed | ^ | ^ +| ^ | ^ | ^ | 08h 8 | ^ | Thermal Model cal passed | ^ | ^ | ^ | ^ | ^ | 10h 16 | ^ | Live Adjust set | ^ | ^ | ^ | ^ | ^ | 20h 32 | ^ | Free bit | ^ | ^ | ^ | ^ | ^ | 40h 64 | ^ | Free bit | ^ | ^ | ^ | ^ | ^ | 80h 128 | ^ | Unknown | ^ | ^ -| 0x0CA2 3234 | float | EEPROM_THERMAL_MODEL_U | ??? | ff ff ff ffh | Thermal Model linear temperature coefficient (W/K/W) | Thermal Model | D3 Ax0ca2 C4 -| 0x0C9E 3230 | float | EEPROM_THERMAL_MODEL_V | ??? | ff ff ff ffh | Thermal Model linear temperature intercept (W/W) | Thermal Model | D3 Ax0c9e C4 -| 0x0C9A 3226 | float | EEPROM_THERMAL_MODEL_D | ??? | ff ff ff ffh | Thermal Model sim. 1st order IIR filter factor | Thermal Model | D3 Ax0c9a C4 -| 0x0C98 3224 | uint16 | EEPROM_THERMAL_MODEL_L | 0-2160 | ff ffh | Thermal Model sim. response lag (ms) | Thermal Model | D3 Ax0c98 C2 -| 0x0C97 3223 | uint8 | EEPROM_THERMAL_MODEL_VER | 0-255 | ffh | Thermal Model Version | Thermal Model | D3 Ax0c97 C1 +| 0x0CA2 3234 | float | EEPROM_THERMAL_MODEL_U | ??? | ff ff ff ffh | Thermal Model linear temp coefficient (W/K/W) | Thermal Model| D3 Ax0ca2 C4 +| 0x0C9E 3230 | float | EEPROM_THERMAL_MODEL_V | ??? | ff ff ff ffh | Thermal Model linear temp intercept (W/W) | Thermal Model| D3 Ax0c9e C4 +| 0x0C9A 3226 | float | EEPROM_THERMAL_MODEL_D | ??? | ff ff ff ffh | Thermal Model sim. 1st order IIR filter factor | Thermal Model| D3 Ax0c9a C4 +| 0x0C98 3224 | uint16 | EEPROM_THERMAL_MODEL_L | 0-2160 | ff ffh | Thermal Model sim. response lag (ms) | Thermal Model| D3 Ax0c98 C2 +| 0x0C97 3223 | uint8 | EEPROM_THERMAL_MODEL_VER | 0-255 | ffh | Thermal Model Version | Thermal Model| D3 Ax0c97 C1 | 0x0C95 3221 | PGM_P | EEPROM_KILL_MESSAGE | 0-65535 | ff ffh | Kill message PGM pointer | kill() | D3 Ax0c95 C2 | 0x0C94 3220 | uint8 | EEPROM_KILL_PENDING_FLAG | 42h, ffh | ffh | Kill pending flag (0x42 magic value) | kill() | D3 Ax0c94 C1 From 8ae0e1952e655678e53a6583f3d556e6b1b6addd Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 24 May 2023 09:01:28 +0200 Subject: [PATCH 146/148] Rename `temp_model.h` to `thermal_model.h` `/temp_model` to `/thermal_model` `Temperature_model` to `Thermal_model` minor format in eeprom.h --- Firmware/Marlin_main.cpp | 2 +- Firmware/eeprom.h | 2 +- Firmware/thermal_model.h | 125 ++++++++++++++++++++++++++++++++ Firmware/thermal_model/e3d_v6.h | 19 +++++ 4 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 Firmware/thermal_model.h create mode 100644 Firmware/thermal_model/e3d_v6.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fd819ed25..5ea788e79 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7332,7 +7332,7 @@ Sigma_Exit: #ifdef THERMAL_MODEL /*! - ### M310 - Thermal model settings M310: Thermal model settings + ### M310 - Thermal model settings M310: Thermal model settings #### Usage M310 ; report values diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 4b0446a9e..cc6546b6f 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -92,7 +92,7 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP | 0x0FF7 4087 | uint8 | EEPROM_CALIBRATION_STATUS_V1 | ffh 255 | ffh 255 | Calibration status ( Date: Tue, 25 Jul 2023 17:24:02 +0200 Subject: [PATCH 147/148] Rebase update REVO and solve @wavexx comments --- Firmware/Marlin_main.cpp | 2 +- Firmware/menu.h | 6 +-- Firmware/temp_model/e3d_REVO.h | 19 --------- Firmware/temp_model/e3d_REVO_HF_60W.h | 19 --------- Firmware/thermal_model.h | 8 ++-- Firmware/thermal_model/e3d_REVO.h | 19 +++++++++ Firmware/thermal_model/e3d_REVO_HF_60W.h | 19 +++++++++ Firmware/ultralcd.h | 2 +- Firmware/util.h | 12 +++--- .../variants/1_75mm_MK3-EINSy10a-E3DREVO.h | 30 +++++++------- .../1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h | 30 +++++++------- .../variants/1_75mm_MK3S-EINSy10a-E3DREVO.h | 30 +++++++------- .../1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h | 30 +++++++------- Firmware/variants/README.md | 40 +++++++++---------- 14 files changed, 133 insertions(+), 133 deletions(-) delete mode 100644 Firmware/temp_model/e3d_REVO.h delete mode 100644 Firmware/temp_model/e3d_REVO_HF_60W.h create mode 100644 Firmware/thermal_model/e3d_REVO.h create mode 100644 Firmware/thermal_model/e3d_REVO_HF_60W.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5ea788e79..cb0e89102 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7332,7 +7332,7 @@ Sigma_Exit: #ifdef THERMAL_MODEL /*! - ### M310 - Thermal model settings M310: Thermal model settings + ### M310 - Thermal model settings M310: Thermal model settings #### Usage M310 ; report values diff --git a/Firmware/menu.h b/Firmware/menu.h index 02692984e..f3425b81f 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -33,12 +33,12 @@ extern uint8_t menu_depth; //! definition of reasons blocking the main menu //! Use them as bit mask, so that the code may set various errors at the same time enum ESeriousErrors { - MENU_BLOCK_NONE = 0, - MENU_BLOCK_THERMAL_ERROR = 0x01, + MENU_BLOCK_NONE = 0, + MENU_BLOCK_THERMAL_ERROR = 0x01, #ifdef THERMAL_MODEL MENU_BLOCK_THERMAL_MODEL_AUTOTUNE = 0x02, #endif - MENU_BLOCK_STATUS_SCREEN_M0 = 0x04, + MENU_BLOCK_STATUS_SCREEN_M0 = 0x04, }; // and possibly others in the future. //! this is a flag for disabling entering the main menu and longpress. If this is set to anything != diff --git a/Firmware/temp_model/e3d_REVO.h b/Firmware/temp_model/e3d_REVO.h deleted file mode 100644 index d129cd11b..000000000 --- a/Firmware/temp_model/e3d_REVO.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#define TEMP_MODEL_E3D_REVO_VER 1 // model parameters version - -#define TEMP_MODEL_E3D_REVO_P 40. // heater power (W) -#define TEMP_MODEL_E3D_REVO_U -0.0014 // linear temperature coefficient (W/K/power) -#define TEMP_MODEL_E3D_REVO_V 1.05 // linear temperature intercept (W/power) - -#define TEMP_MODEL_E3D_REVO_C 8.77 // initial guess for heatblock capacitance (J/K) -#define TEMP_MODEL_E3D_REVO_R 25.3 // initial guess for heatblock resistance (K/W) - -#define TEMP_MODEL_E3D_REVO_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) -#define TEMP_MODEL_E3D_REVO_LAG 270 // sim. response lag (ms, 0-2160) - -#define TEMP_MODEL_E3D_REVO_W 0.85 // Default warning threshold (K/s) -#define TEMP_MODEL_E3D_REVO_E 1.23 // Default error threshold (K/s) - -// fall-back resistance vector (R0-15) -#define TEMP_MODEL_E3D_REVO_Rv {TEMP_MODEL_E3D_REVO_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} diff --git a/Firmware/temp_model/e3d_REVO_HF_60W.h b/Firmware/temp_model/e3d_REVO_HF_60W.h deleted file mode 100644 index 1da2c22ea..000000000 --- a/Firmware/temp_model/e3d_REVO_HF_60W.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version - -#define TEMP_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W) -#define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) -#define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) - -#define TEMP_MODEL_E3D_REVO_HF_60W_C 9.10 // initial guess for heatblock capacitance (J/K) -#define TEMP_MODEL_E3D_REVO_HF_60W_R 30.6 // initial guess for heatblock resistance (K/W) - -#define TEMP_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) -#define TEMP_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) - -#define TEMP_MODEL_E3D_REVO_HF_60W_W 0.85 // Default warning threshold (K/s) -#define TEMP_MODEL_E3D_REVO_HF_60W_E 1.23 // Default error threshold (K/s) - -// fall-back resistance vector (R0-15) -#define TEMP_MODEL_E3D_REVO_HF_60W_Rv {TEMP_MODEL_E3D_REVO_HF_60W_R, 29.0, 27.5, 24.5, 23.4, 22.3, 21.2, 20.2, 19.8, 19.4, 19.0, 18.6, 18.3, 18.1, 17.9, 17.7} diff --git a/Firmware/thermal_model.h b/Firmware/thermal_model.h index 225c5c225..b5e696650 100644 --- a/Firmware/thermal_model.h +++ b/Firmware/thermal_model.h @@ -27,10 +27,10 @@ struct model_data { // temporary buffers float dT_lag_buf[THERMAL_MODEL_MAX_LAG_SIZE]; // transport delay buffer - uint8_t dT_lag_size = 0; // transport delay buffer size - uint8_t dT_lag_idx = 0; // transport delay buffer index - float dT_err_prev = 0; // previous temperature delta error - float T_prev = 0; // last temperature extruder + uint8_t dT_lag_size = 0; // transport delay buffer size + uint8_t dT_lag_idx = 0; // transport delay buffer index + float dT_err_prev = 0; // previous temperature delta error + float T_prev = 0; // last temperature extruder // configurable parameters float P; // heater power (W) diff --git a/Firmware/thermal_model/e3d_REVO.h b/Firmware/thermal_model/e3d_REVO.h new file mode 100644 index 000000000..a4fb355d5 --- /dev/null +++ b/Firmware/thermal_model/e3d_REVO.h @@ -0,0 +1,19 @@ +#pragma once + +#define THERMAL_MODEL_E3D_REVO_VER 1 // model parameters version + +#define THERMAL_MODEL_E3D_REVO_P 40. // heater power (W) +#define THERMAL_MODEL_E3D_REVO_U -0.0014 // linear temperature coefficient (W/K/power) +#define THERMAL_MODEL_E3D_REVO_V 1.05 // linear temperature intercept (W/power) + +#define THERMAL_MODEL_E3D_REVO_C 8.77 // initial guess for heatblock capacitance (J/K) +#define THERMAL_MODEL_E3D_REVO_R 25.3 // initial guess for heatblock resistance (K/W) + +#define THERMAL_MODEL_E3D_REVO_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) +#define THERMAL_MODEL_E3D_REVO_LAG 270 // sim. response lag (ms, 0-2160) + +#define THERMAL_MODEL_E3D_REVO_W 0.85 // Default warning threshold (K/s) +#define THERMAL_MODEL_E3D_REVO_E 1.23 // Default error threshold (K/s) + +// fall-back resistance vector (R0-15) +#define THERMAL_MODEL_E3D_REVO_Rv {THERMAL_MODEL_E3D_REVO_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} diff --git a/Firmware/thermal_model/e3d_REVO_HF_60W.h b/Firmware/thermal_model/e3d_REVO_HF_60W.h new file mode 100644 index 000000000..95c01a294 --- /dev/null +++ b/Firmware/thermal_model/e3d_REVO_HF_60W.h @@ -0,0 +1,19 @@ +#pragma once + +#define THERMAL_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version + +#define THERMAL_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W) +#define THERMAL_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) +#define THERMAL_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) + +#define THERMAL_MODEL_E3D_REVO_HF_60W_C 9.10 // initial guess for heatblock capacitance (J/K) +#define THERMAL_MODEL_E3D_REVO_HF_60W_R 30.6 // initial guess for heatblock resistance (K/W) + +#define THERMAL_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) +#define THERMAL_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) + +#define THERMAL_MODEL_E3D_REVO_HF_60W_W 0.85 // Default warning threshold (K/s) +#define THERMAL_MODEL_E3D_REVO_HF_60W_E 1.23 // Default error threshold (K/s) + +// fall-back resistance vector (R0-15) +#define THERMAL_MODEL_E3D_REVO_HF_60W_Rv {THERMAL_MODEL_E3D_REVO_HF_60W_R, 29.0, 27.5, 24.5, 23.4, 22.3, 21.2, 20.2, 19.8, 19.4, 19.0, 18.6, 18.3, 18.1, 17.9, 17.7} diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 5e5c7dba3..f17c5be33 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -226,7 +226,7 @@ enum class WizState : uint8_t Xyz, //!< xyz calibration Z, //!< z calibration #ifdef THERMAL_MODEL - ThermalModel, //!< Thermal Model calibration + ThermalModel, //!< Thermal Model calibration #endif //THERMAL_MODEL IsFil, //!< Is filament loaded? First step of 1st layer calibration Preheat, //!< Preheat for any material diff --git a/Firmware/util.h b/Firmware/util.h index 05adf3493..0fcf76824 100644 --- a/Firmware/util.h +++ b/Firmware/util.h @@ -103,14 +103,14 @@ extern void ip4_to_str(char* dest, uint8_t* IP); // Calibration status of the machine // (unsigned char*)EEPROM_CALIBRATION_STATUS_V2 typedef uint8_t CalibrationStatus; -const CalibrationStatus CALIBRATION_STATUS_SELFTEST = 0b00000001; // Selftest -const CalibrationStatus CALIBRATION_STATUS_XYZ = 0b00000010; // XYZ calibration -const CalibrationStatus CALIBRATION_STATUS_Z = 0b00000100; // Z calibration +const CalibrationStatus CALIBRATION_STATUS_SELFTEST = 0b00000001; // Selftest +const CalibrationStatus CALIBRATION_STATUS_XYZ = 0b00000010; // XYZ calibration +const CalibrationStatus CALIBRATION_STATUS_Z = 0b00000100; // Z calibration #ifdef THERMAL_MODEL -const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Thermal model calibration +const CalibrationStatus CALIBRATION_STATUS_THERMAL_MODEL = 0b00001000; // Thermal model calibration #endif -const CalibrationStatus CALIBRATION_STATUS_LIVE_ADJUST = 0b00010000; // 1st layer calibration -const CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0b10000000; // Freshly assembled or unknown status +const CalibrationStatus CALIBRATION_STATUS_LIVE_ADJUST = 0b00010000; // 1st layer calibration +const CalibrationStatus CALIBRATION_STATUS_UNKNOWN = 0b10000000; // Freshly assembled or unknown status // Calibration steps performed by the wizard const CalibrationStatus CALIBRATION_WIZARD_STEPS = diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h index 084e5fc69..1deab8178 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h @@ -381,26 +381,26 @@ #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 // model-based temperature check -#define TEMP_MODEL 1 // enable model-based temperature checks -#define TEMP_MODEL_DEBUG 1 // extended runtime logging +#define THERMAL_MODEL 1 // enable model-based temperature checks +#define THERMAL_MODEL_DEBUG 1 // extended runtime logging -#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit -#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit -#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold -#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit +#define THERMAL_MODEL_CAL_C_low 5 // C estimation lower limit +#define THERMAL_MODEL_CAL_C_high 20 // C estimation upper limit +#define THERMAL_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define THERMAL_MODEL_CAL_C_itr 30 // C estimation iteration limit -#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit -#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit -#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold -#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit +#define THERMAL_MODEL_CAL_R_low 5 // R estimation lower limit +#define THERMAL_MODEL_CAL_R_high 50 // R estimation upper limit +#define THERMAL_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define THERMAL_MODEL_CAL_R_itr 30 // R estimation iteration limit -#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) -#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) +#define THERMAL_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define THERMAL_MODEL_CAL_T_high 230 // Default calibration working temperature (C) -#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#define THERMAL_MODEL_Ta_corr -7 // Default ambient temperature correction -#include "temp_model/e3d_REVO.h" -#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +#include "thermal_model/e3d_REVO.h" +#define THERMAL_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters /*------------------------------------ diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h index 1985e9132..471e6c8b7 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h @@ -382,26 +382,26 @@ #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 // model-based temperature check -#define TEMP_MODEL 1 // enable model-based temperature checks -#define TEMP_MODEL_DEBUG 1 // extended runtime logging +#define THERMAL_MODEL 1 // enable model-based temperature checks +#define THERMAL_MODEL_DEBUG 1 // extended runtime logging -#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit -#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit -#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold -#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit +#define THERMAL_MODEL_CAL_C_low 5 // C estimation lower limit +#define THERMAL_MODEL_CAL_C_high 20 // C estimation upper limit +#define THERMAL_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define THERMAL_MODEL_CAL_C_itr 30 // C estimation iteration limit -#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit -#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit -#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold -#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit +#define THERMAL_MODEL_CAL_R_low 5 // R estimation lower limit +#define THERMAL_MODEL_CAL_R_high 50 // R estimation upper limit +#define THERMAL_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define THERMAL_MODEL_CAL_R_itr 30 // R estimation iteration limit -#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) -#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) +#define THERMAL_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define THERMAL_MODEL_CAL_T_high 230 // Default calibration working temperature (C) -#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#define THERMAL_MODEL_Ta_corr -7 // Default ambient temperature correction -#include "temp_model/e3d_REVO_HF_60W.h" -#define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters +#include "thermal_model/e3d_REVO_HF_60W.h" +#define THERMAL_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters /*------------------------------------ diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h index c688ce959..2ae876f58 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h @@ -385,26 +385,26 @@ #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 // model-based temperature check -#define TEMP_MODEL 1 // enable model-based temperature checks -#define TEMP_MODEL_DEBUG 1 // extended runtime logging +#define THERMAL_MODEL 1 // enable model-based temperature checks +#define THERMAL_MODEL_DEBUG 1 // extended runtime logging -#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit -#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit -#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold -#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit +#define THERMAL_MODEL_CAL_C_low 5 // C estimation lower limit +#define THERMAL_MODEL_CAL_C_high 20 // C estimation upper limit +#define THERMAL_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define THERMAL_MODEL_CAL_C_itr 30 // C estimation iteration limit -#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit -#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit -#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold -#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit +#define THERMAL_MODEL_CAL_R_low 5 // R estimation lower limit +#define THERMAL_MODEL_CAL_R_high 50 // R estimation upper limit +#define THERMAL_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define THERMAL_MODEL_CAL_R_itr 30 // R estimation iteration limit -#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) -#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) +#define THERMAL_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define THERMAL_MODEL_CAL_T_high 230 // Default calibration working temperature (C) -#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#define THERMAL_MODEL_Ta_corr -7 // Default ambient temperature correction -#include "temp_model/e3d_REVO.h" -#define TEMP_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters +#include "thermal_model/e3d_REVO.h" +#define THERMAL_MODEL_DEFAULT E3D_REVO // Default E3D REVO model parameters /*------------------------------------ diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h index 8125b93e3..bfaae1fc9 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h @@ -386,26 +386,26 @@ #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 // model-based temperature check -#define TEMP_MODEL 1 // enable model-based temperature checks -#define TEMP_MODEL_DEBUG 1 // extended runtime logging +#define THERMAL_MODEL 1 // enable model-based temperature checks +#define THERMAL_MODEL_DEBUG 1 // extended runtime logging -#define TEMP_MODEL_CAL_C_low 5 // C estimation lower limit -#define TEMP_MODEL_CAL_C_high 20 // C estimation upper limit -#define TEMP_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold -#define TEMP_MODEL_CAL_C_itr 30 // C estimation iteration limit +#define THERMAL_MODEL_CAL_C_low 5 // C estimation lower limit +#define THERMAL_MODEL_CAL_C_high 20 // C estimation upper limit +#define THERMAL_MODEL_CAL_C_thr 0.01 // C estimation iteration threshold +#define THERMAL_MODEL_CAL_C_itr 30 // C estimation iteration limit -#define TEMP_MODEL_CAL_R_low 5 // R estimation lower limit -#define TEMP_MODEL_CAL_R_high 50 // R estimation upper limit -#define TEMP_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold -#define TEMP_MODEL_CAL_R_itr 30 // R estimation iteration limit +#define THERMAL_MODEL_CAL_R_low 5 // R estimation lower limit +#define THERMAL_MODEL_CAL_R_high 50 // R estimation upper limit +#define THERMAL_MODEL_CAL_R_thr 0.01 // R estimation iteration threshold +#define THERMAL_MODEL_CAL_R_itr 30 // R estimation iteration limit -#define TEMP_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) -#define TEMP_MODEL_CAL_T_high 230 // Default calibration working temperature (C) +#define THERMAL_MODEL_CAL_T_low 50 // Default calibration cooling temperature (C) +#define THERMAL_MODEL_CAL_T_high 230 // Default calibration working temperature (C) -#define TEMP_MODEL_Ta_corr -7 // Default ambient temperature correction +#define THERMAL_MODEL_Ta_corr -7 // Default ambient temperature correction -#include "temp_model/e3d_REVO_HF_60W.h" -#define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters +#include "thermal_model/e3d_REVO_HF_60W.h" +#define THERMAL_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters /*------------------------------------ diff --git a/Firmware/variants/README.md b/Firmware/variants/README.md index 6bb981304..8b85bda16 100644 --- a/Firmware/variants/README.md +++ b/Firmware/variants/README.md @@ -65,48 +65,48 @@ Example: ... ``` 8. Prepare for new 3rd party hotend TM value file - - Search for `#include "temp_model/e3d_v6.h"` + - Search for `#include "thermal_model/e3d_v6.h"` - Change the `e3d_v6.h` to `<3rd party hotend:16>.h` - Change below the `E3D_V6` to `<3rd party hotend:16>` ``` ... - #include "temp_model/e3d_v6.h" - #define TEMP_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters + #include "thermal_model/e3d_v6.h" + #define THERMAL_MODEL_DEFAULT E3D_V6 // Default E3D v6 model parameters ... ``` Example: ``` ... - #include "temp_model/e3d_REVO_HF_60W.h" - #define TEMP_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters + #include "thermal_model/e3d_REVO_HF_60W.h" + #define THERMAL_MODEL_DEFAULT E3D_REVO_HF_60W // Default E3D REVO HF 60W model parameters ... ``` 9. Save and close the new variant file -10. Copy/paste `Firmware/temp_model/e3d_v6.h` as `Firmware/temp_model/<3rd party hotend:16>.h` - - Example: `Firmware/temp_model/e3d_REVO_HF_60W.h` -11. Open the new file `Firmware/temp_model/<3rd party hotend:16>.h` -12. Search `E3D_V6` and replace it with what you have used in `#defined TEMP_MODEL_DEFAULT` +10. Copy/paste `Firmware/thermal_model/e3d_v6.h` as `Firmware/thermal_model/<3rd party hotend:16>.h` + - Example: `Firmware/thermal_model/e3d_REVO_HF_60W.h` +11. Open the new file `Firmware/thermal_model/<3rd party hotend:16>.h` +12. Search `E3D_V6` and replace it with what you have used in `#defined THERMAL_MODEL_DEFAULT` - Example ``` #pragma once - #define TEMP_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version + #define THERMAL_MODEL_E3D_REVO_HF_60W_VER 1 // model parameters version - #define TEMP_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W) - #define TEMP_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) - #define TEMP_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) + #define THERMAL_MODEL_E3D_REVO_HF_60W_P 60. // heater power (W) + #define THERMAL_MODEL_E3D_REVO_HF_60W_U -0.0014 // linear temperature coefficient (W/K/power) + #define THERMAL_MODEL_E3D_REVO_HF_60W_V 1.05 // linear temperature intercept (W/power) - #define TEMP_MODEL_E3D_REVO_HF_60W_C 8.77 // initial guess for heatblock capacitance (J/K) - #define TEMP_MODEL_E3D_REVO_HF_60W_R 25.3 // initial guess for heatblock resistance (K/W) + #define THERMAL_MODEL_E3D_REVO_HF_60W_C 8.77 // initial guess for heatblock capacitance (J/K) + #define THERMAL_MODEL_E3D_REVO_HF_60W_R 25.3 // initial guess for heatblock resistance (K/W) - #define TEMP_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) - #define TEMP_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) + #define THERMAL_MODEL_E3D_REVO_HF_60W_fS 0.15 // sim. 1st order IIR filter factor (f=100/27) + #define THERMAL_MODEL_E3D_REVO_HF_60W_LAG 270 // sim. response lag (ms, 0-2160) - #define TEMP_MODEL_E3D_REVO_HF_60W_W 1.2 // Default warning threshold (K/s) - #define TEMP_MODEL_E3D_REVO_HF_60W_E 1.74 // Default error threshold (K/s) + #define THERMAL_MODEL_E3D_REVO_HF_60W_W 1.2 // Default warning threshold (K/s) + #define THERMAL_MODEL_E3D_REVO_HF_60W_E 1.74 // Default error threshold (K/s) // fall-back resistance vector (R0-15) - #define TEMP_MODEL_E3D_REVO_HF_60W_Rv {TEMP_MODEL_E3D_REVO_HF_60W_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} + #define THERMAL_MODEL_E3D_REVO_HF_60W_Rv {THERMAL_MODEL_E3D_REVO_HF_60W_R, 23.9, 22.5, 19.6, 19.0, 18.3, 17.7, 17.1, 16.8, 16.5, 16.3, 16.0, 15.9, 15.7, 15.6, 15.4} ``` From 897d05d2685abd0e093225e01a0c87c46157eddd Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 26 Jul 2023 09:33:16 +0200 Subject: [PATCH 148/148] Fix @wavexx complains --- Firmware/thermal_model.h | 2 +- lang/po/Firmware_cs.po | 3 --- lang/po/Firmware_de.po | 3 --- lang/po/Firmware_es.po | 3 --- lang/po/Firmware_fr.po | 3 --- lang/po/Firmware_hr.po | 3 --- lang/po/Firmware_hu.po | 3 --- lang/po/Firmware_it.po | 3 --- lang/po/Firmware_nl.po | 3 --- lang/po/Firmware_no.po | 3 --- lang/po/Firmware_pl.po | 3 --- lang/po/Firmware_ro.po | 3 --- lang/po/Firmware_sk.po | 3 --- lang/po/Firmware_sv.po | 3 --- 14 files changed, 1 insertion(+), 40 deletions(-) diff --git a/Firmware/thermal_model.h b/Firmware/thermal_model.h index b5e696650..c0162fa62 100644 --- a/Firmware/thermal_model.h +++ b/Firmware/thermal_model.h @@ -39,7 +39,7 @@ struct model_data float C; // heatblock capacitance (J/K) float fS; // sim. 1st order IIR filter factor (f=100/27) uint16_t L; // sim. response lag (ms) - float R[THERMAL_MODEL_R_SIZE]; // heatblock resistance for all fan levels (K/W) + float R[THERMAL_MODEL_R_SIZE]; // heatblock resistance for all fan levels (K/W) float Ta_corr; // ambient temperature correction (K) // thresholds diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 9e6629887..520cc667f 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2614,6 +2614,3 @@ msgstr "Došlo k neočekávané chybě." #~ msgid "TM autotune failed" #~ msgstr "TM ladeni selhalo" - -#~ msgid "Temp. model autotune" -#~ msgstr "Ladeni tepl. modelu" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 9580a7ed6..b0f4cdbd6 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2642,6 +2642,3 @@ msgstr "Ein unerwarteter Fehler ist aufgetreten." #~ msgid "TM autotune failed" #~ msgstr "TM kal. fehlgeschlg." - -#~ msgid "Temp. model autotune" -#~ msgstr "Temp. Model Autokal." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index ebe25e949..d9a0ad27a 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2638,6 +2638,3 @@ msgstr "Ocurrió un error inesperado." #~ msgid "TM autotune failed" #~ msgstr "Fallo autotune TM" - -#~ msgid "Temp. model autotune" -#~ msgstr "Autotune model temp." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index a3c16dcbb..f8667dfa8 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2653,6 +2653,3 @@ msgstr "Une erreur inattendue s'est produite." #~ msgid "TM autotune failed" #~ msgstr "Echec regl. auto MT" - -#~ msgid "Temp. model autotune" -#~ msgstr "Regl. auto mod temp." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index dd5c271c5..1a0d02f0d 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2635,9 +2635,6 @@ msgstr "Došlo je do neočekivane pogreške." #~ msgid "TM autotune failed" #~ msgstr "TM autotune nije usp" -#~ msgid "Temp. model autotune" -#~ msgstr "Temp. autptune model" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index d474e4a82..748e426c6 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2637,9 +2637,6 @@ msgstr "Váratlan hiba történt." #~ msgid "TM autotune failed" #~ msgstr "HM kalib. sikertelen" -#~ msgid "Temp. model autotune" -#~ msgstr "Homers. modell kalib" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "XYZ kalibracio nem jo. Bal elso kal. pont nem elerheto." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 0c7a51b1b..a88f94c0d 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2636,9 +2636,6 @@ msgstr "Si è verificato un errore imprevisto." #~ msgid "TM autotune failed" #~ msgstr "Autocal. MT fallita" -#~ msgid "Temp. model autotune" -#~ msgstr "Cal. modello termico" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index c7354246c..4cfc4672d 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2641,8 +2641,5 @@ msgstr "Er is een onverwachte fout opgetreden." #~ msgid "TM autotune failed" #~ msgstr "TM autotune mislukt" -#~ msgid "Temp. model autotune" -#~ msgstr "Temp. model autotune" - #~ msgid "XYZ calibration failed. Left front calibration point not reachable." #~ msgstr "XYZ-kalibratie mislukt. Kalibratiepunt linksvoor niet bereikbaar." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 91f5b349d..d366ccb94 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2613,9 +2613,6 @@ msgstr "Det oppstod en uventet feil." #~ msgid "TM autotune failed" #~ msgstr "TM autotune feilet" -#~ msgid "Temp. model autotune" -#~ msgstr "Temp. model autotune" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "XYZ kalibrasjon feilet. Fremre venstre kalibrerings kan ikke nås." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 45da80996..e11d54156 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2631,6 +2631,3 @@ msgstr "Pojawił się nieoczekiwany błąd." #~ msgid "TM autotune failed" #~ msgstr "Blad TM autotune" - -#~ msgid "Temp. model autotune" -#~ msgstr "Autotune modelu temp" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 4baa82ad5..3a152f702 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2633,9 +2633,6 @@ msgstr "A apărut o eroare neașteptată." #~ msgid "TM autotune failed" #~ msgstr "Autotune TM esuat" -#~ msgid "Temp. model autotune" -#~ msgstr "Temp. model autotune" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index e4bdbf079..457b2ba72 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2616,9 +2616,6 @@ msgstr "Vyskytla sa neočakávaná chyba." #~ msgid "TM autotune failed" #~ msgstr "TM autotune failed" -#~ msgid "Temp. model autotune" -#~ msgstr "Autom. nast. teploty" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr "Kalibracia XYZ je nepresna. Lavy predny bod je nedostupny." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 6eb0e45bf..d92ee3c60 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2625,9 +2625,6 @@ msgstr "Ett oväntat fel inträffade." #~ msgid "TM autotune failed" #~ msgstr "TM autoinst fallerad" -#~ msgid "Temp. model autotune" -#~ msgstr "Thermal Modell autoinst" - #~ msgid "" #~ "XYZ calibration compromised. Left front calibration point not reachable." #~ msgstr ""