From 3f96dea4f96f52021f81e72d8243c9f211cc2d36 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Mon, 10 Dec 2018 07:09:03 -0700 Subject: [PATCH 01/39] make all shell scripts executable --- Firmware/le.sh | 0 lang/config.sh | 0 lang/fw-clean.sh | 0 lang/lang-add.sh | 0 lang/lang-check.sh | 0 lang/lang-clean.sh | 0 lang/lang-export.sh | 0 lang/lang-import.sh | 0 8 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Firmware/le.sh mode change 100644 => 100755 lang/config.sh mode change 100644 => 100755 lang/fw-clean.sh mode change 100644 => 100755 lang/lang-add.sh mode change 100644 => 100755 lang/lang-check.sh mode change 100644 => 100755 lang/lang-clean.sh mode change 100644 => 100755 lang/lang-export.sh mode change 100644 => 100755 lang/lang-import.sh diff --git a/Firmware/le.sh b/Firmware/le.sh old mode 100644 new mode 100755 diff --git a/lang/config.sh b/lang/config.sh old mode 100644 new mode 100755 diff --git a/lang/fw-clean.sh b/lang/fw-clean.sh old mode 100644 new mode 100755 diff --git a/lang/lang-add.sh b/lang/lang-add.sh old mode 100644 new mode 100755 diff --git a/lang/lang-check.sh b/lang/lang-check.sh old mode 100644 new mode 100755 diff --git a/lang/lang-clean.sh b/lang/lang-clean.sh old mode 100644 new mode 100755 diff --git a/lang/lang-export.sh b/lang/lang-export.sh old mode 100644 new mode 100755 diff --git a/lang/lang-import.sh b/lang/lang-import.sh old mode 100644 new mode 100755 From 52d81bb4d85c4df99c65348f26db8ab7f361a8a1 Mon Sep 17 00:00:00 2001 From: Craig Link Date: Mon, 31 Dec 2018 17:51:16 -0800 Subject: [PATCH 02/39] set array size correctly to 4 --- Firmware/util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 15f3f4c5..0933d4cd 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -229,7 +229,7 @@ inline bool parse_version_P(const char *str, uint16_t version[4]) // 1 - yes, 0 - false, -1 - error; inline int8_t is_provided_version_newer(const char *version_string) { - uint16_t ver_gcode[3], ver_current[3]; + uint16_t ver_gcode[4], ver_current[4]; if (! parse_version(version_string, ver_gcode)) return -1; if (! parse_version_P(FW_VERSION_STR, ver_current)) From 0f21ccee3c776b66b5a753371df3905f1d92571d Mon Sep 17 00:00:00 2001 From: Harpalyke <33022534+Harpalyke@users.noreply.github.com> Date: Tue, 19 Mar 2019 20:28:31 +0000 Subject: [PATCH 03/39] Adding the microstepping resolution for all axis to the eprom config which is persisted during M500 for Mk3 and Mk3S --- Firmware/ConfigurationStore.cpp | 24 ++++++++++++++++++- Firmware/ConfigurationStore.h | 1 + Firmware/Marlin_main.cpp | 17 ++++--------- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Firmware/ConfigurationStore.cpp b/Firmware/ConfigurationStore.cpp index 39a74430..f2df8fc6 100644 --- a/Firmware/ConfigurationStore.cpp +++ b/Firmware/ConfigurationStore.cpp @@ -11,6 +11,11 @@ #include "mesh_bed_leveling.h" #endif +#ifdef TMC2130 +#include "tmc2130.h" +#endif + + M500_conf cs; //! @brief Write data to EEPROM @@ -86,6 +91,7 @@ void Config_PrintSettings(uint8_t level) #ifdef TMC2130 printf_P(PSTR( "%SSteps per unit:\n%S M92 X%.2f Y%.2f Z%.2f E%.2f\n" + "%SUStep resolution: \n%S M350 X%d Y%d Z%d E%d\n" "%SMaximum feedrates - normal (mm/s):\n%S M203 X%.2f Y%.2f Z%.2f E%.2f\n" "%SMaximum feedrates - stealth (mm/s):\n%S M203 X%.2f Y%.2f Z%.2f E%.2f\n" "%SMaximum acceleration - normal (mm/s2):\n%S M201 X%lu Y%lu Z%lu E%lu\n" @@ -95,6 +101,7 @@ void Config_PrintSettings(uint8_t level) "%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_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], @@ -177,7 +184,7 @@ static_assert (false, "zprobe_zoffset was not initialized in printers in field t "0.0, if this is not acceptable, increment EEPROM_VERSION to force use default_conf"); #endif -static_assert (sizeof(M500_conf) == 188, "sizeof(M500_conf) has changed, ensure that EEPROM_VERSION has been incremented, " +static_assert (sizeof(M500_conf) == 192, "sizeof(M500_conf) has changed, ensure that EEPROM_VERSION has been incremented, " "or if you added members in the end of struct, ensure that historically uninitialized values will be initialized." "If this is caused by change to more then 8bit processor, decide whether make this struct packed to save EEPROM," "leave as it is to keep fast code, or reorder struct members to pack more tightly."); @@ -220,6 +227,11 @@ static const M500_conf default_conf PROGMEM = }, DEFAULT_MAX_FEEDRATE_SILENT, DEFAULT_MAX_ACCELERATION_SILENT, +#ifdef TMC2130 + { TMC2130_USTEPS_XY, TMC2130_USTEPS_XY, TMC2130_USTEPS_Z, TMC2130_USTEPS_E }, +#else // TMC2130 + {16,16,16,16}, +#endif }; //! @brief Read M500 configuration @@ -269,6 +281,16 @@ bool Config_RetrieveSettings() 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.axis_ustep_resolution[X_AXIS] == 0xff){ cs.axis_ustep_resolution[X_AXIS] = TMC2130_USTEPS_XY; } + if(cs.axis_ustep_resolution[Y_AXIS] == 0xff){ cs.axis_ustep_resolution[Y_AXIS] = TMC2130_USTEPS_XY; } + if(cs.axis_ustep_resolution[Z_AXIS] == 0xff){ cs.axis_ustep_resolution[Z_AXIS] = TMC2130_USTEPS_Z; } + if(cs.axis_ustep_resolution[E_AXIS] == 0xff){ cs.axis_ustep_resolution[E_AXIS] = TMC2130_USTEPS_E; } + + tmc2130_set_res(X_AXIS, cs.axis_ustep_resolution[X_AXIS]); + tmc2130_set_res(Y_AXIS, cs.axis_ustep_resolution[Y_AXIS]); + tmc2130_set_res(Z_AXIS, cs.axis_ustep_resolution[Z_AXIS]); + tmc2130_set_res(E_AXIS, cs.axis_ustep_resolution[E_AXIS]); #endif //TMC2130 reset_acceleration_rates(); diff --git a/Firmware/ConfigurationStore.h b/Firmware/ConfigurationStore.h index aa201369..b9dca368 100644 --- a/Firmware/ConfigurationStore.h +++ b/Firmware/ConfigurationStore.h @@ -37,6 +37,7 @@ typedef struct 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 char axis_ustep_resolution[4]; } M500_conf; extern M500_conf cs; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 7be151f9..deb60182 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1250,18 +1250,10 @@ void setup() #endif //TMC2130_LINEARITY_CORRECTION #ifdef TMC2130_VARIABLE_RESOLUTION - tmc2130_mres[X_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_X_MRES); - tmc2130_mres[Y_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_Y_MRES); - tmc2130_mres[Z_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_Z_MRES); - tmc2130_mres[E_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_E_MRES); - if (tmc2130_mres[X_AXIS] == 0xff) tmc2130_mres[X_AXIS] = tmc2130_usteps2mres(TMC2130_USTEPS_XY); - if (tmc2130_mres[Y_AXIS] == 0xff) tmc2130_mres[Y_AXIS] = tmc2130_usteps2mres(TMC2130_USTEPS_XY); - if (tmc2130_mres[Z_AXIS] == 0xff) tmc2130_mres[Z_AXIS] = tmc2130_usteps2mres(TMC2130_USTEPS_Z); - if (tmc2130_mres[E_AXIS] == 0xff) tmc2130_mres[E_AXIS] = tmc2130_usteps2mres(TMC2130_USTEPS_E); - eeprom_update_byte((uint8_t*)EEPROM_TMC2130_X_MRES, tmc2130_mres[X_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_TMC2130_Y_MRES, tmc2130_mres[Y_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_TMC2130_Z_MRES, tmc2130_mres[Z_AXIS]); - eeprom_update_byte((uint8_t*)EEPROM_TMC2130_E_MRES, tmc2130_mres[E_AXIS]); + tmc2130_mres[X_AXIS] = tmc2130_usteps2mres(cs.axis_ustep_resolution[X_AXIS]); + tmc2130_mres[Y_AXIS] = tmc2130_usteps2mres(cs.axis_ustep_resolution[Y_AXIS]); + tmc2130_mres[Z_AXIS] = tmc2130_usteps2mres(cs.axis_ustep_resolution[Z_AXIS]); + tmc2130_mres[E_AXIS] = tmc2130_usteps2mres(cs.axis_ustep_resolution[E_AXIS]); #else //TMC2130_VARIABLE_RESOLUTION tmc2130_mres[X_AXIS] = tmc2130_usteps2mres(TMC2130_USTEPS_XY); tmc2130_mres[Y_AXIS] = tmc2130_usteps2mres(TMC2130_USTEPS_XY); @@ -6882,6 +6874,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) uint8_t axis = E_AXIS; uint16_t res = tmc2130_get_res(axis); tmc2130_set_res(axis, res_new); + cs.axis_ustep_resolution[axis] = res_new; if (res_new > res) { uint16_t fac = (res_new / res); diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 4a1fe53c..7ddc76b3 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -190,7 +190,7 @@ #define LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION_XYZ -//#define TMC2130_VARIABLE_RESOLUTION +#define TMC2130_VARIABLE_RESOLUTION diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 1c0c6d28..2cf180a1 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -190,7 +190,7 @@ #define LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION #define TMC2130_LINEARITY_CORRECTION_XYZ -//#define TMC2130_VARIABLE_RESOLUTION +#define TMC2130_VARIABLE_RESOLUTION From 3274794908d8ad4238079c9e2f251ea18a728a42 Mon Sep 17 00:00:00 2001 From: cimoalpacino <41801135+cimoalpacino@users.noreply.github.com> Date: Sun, 21 Apr 2019 21:40:09 +0200 Subject: [PATCH 04/39] Add filepath to platform.txt for windows users --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f8575e3a..f2176a54 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,9 @@ _(after installation, the item is labeled as `"INSTALLED"` and can then be used c. modify platform.txt to enable float printf support: add "-Wl,-u,vfprintf -lprintf_flt -lm" to "compiler.c.elf.flags=" before existing flag "-Wl,--gc-sections" example: -`"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"` +`"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"` +For Windows users, the file can be found at: +"C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)" #### 2. Source code compilation From a8e62007ca29b67980b916f730156a4daeb766f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20B=C4=9Bl?= <35807926+mkbel@users.noreply.github.com> Date: Thu, 25 Apr 2019 07:25:11 +0200 Subject: [PATCH 05/39] Make platform.txt location more clear. Do not mention Windows, as it is already in Windows section. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f2176a54..8c37ff7c 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,9 @@ _(after installation, the item is labeled as `"INSTALLED"` and can then be used add "-Wl,-u,vfprintf -lprintf_flt -lm" to "compiler.c.elf.flags=" before existing flag "-Wl,--gc-sections" example: `"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"` -For Windows users, the file can be found at: +The file can be found in Arduino instalation directory, or after Arduino has been updated at: "C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)" +If you can locate the file in both places, file from user profile is probably used. #### 2. Source code compilation From f17af8c7bfb0ca0065a04a5d134dcf2e88321797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20B=C4=9Bl?= <35807926+mkbel@users.noreply.github.com> Date: Thu, 25 Apr 2019 07:48:24 +0200 Subject: [PATCH 06/39] Update README.md Remove spaces in the end of line. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c37ff7c..ea649fe4 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ _(after installation, the item is labeled as `"INSTALLED"` and can then be used c. modify platform.txt to enable float printf support: add "-Wl,-u,vfprintf -lprintf_flt -lm" to "compiler.c.elf.flags=" before existing flag "-Wl,--gc-sections" example: -`"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"` +`"compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections"` The file can be found in Arduino instalation directory, or after Arduino has been updated at: "C:\Users\(user)\AppData\Local\Arduino15\packages\arduino\hardware\avr\(version)" If you can locate the file in both places, file from user profile is probably used. From 18dec75b560f78b91388d61c0fe67d94e41e5c00 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 29 Apr 2019 13:19:59 +0200 Subject: [PATCH 07/39] MK2.5 - watchdog enabled + test (command "D-1") --- Firmware/Dcodes.cpp | 8 ++++---- Firmware/Marlin_main.cpp | 4 ++-- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 3 +++ Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index 44dfc465..d2016ded 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -176,15 +176,15 @@ extern float axis_steps_per_unit[NUM_AXIS]; #endif //0 #define LOG(args...) -#ifdef DEBUG_DCODES - void dcode__1() { - printf("D-1 - Endless loop\n"); - cli(); + printf_P(PSTR("D-1 - Endless loop\n")); +// cli(); while (1); } +#ifdef DEBUG_DCODES + void dcode_0() { if (*(strchr_pointer + 1) == 0) return; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e23ca37e..bb13f673 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3538,7 +3538,7 @@ void process_commands() else if (code_seen("RESET")) { //! PRUSA RESET // careful! if (farm_mode) { -#ifdef WATCHDOG +#if (defined(WATCHDOG) && (MOTHERBOARD == BOARD_EINSY_1_0a)) boot_app_magic = BOOT_APP_MAGIC; boot_app_flags = BOOT_APP_FLG_RUN; wdt_enable(WDTO_15MS); @@ -7174,9 +7174,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) { switch((int)code_value()) { -#ifdef DEBUG_DCODES case -1: //! D-1 - Endless loop dcode__1(); break; +#ifdef DEBUG_DCODES case 0: //! D0 - Reset dcode_0(); break; case 1: //! D1 - Clear EEPROM diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index b5e9c1af..f1d2c785 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -103,6 +103,9 @@ // New XYZ calibration #define NEW_XYZCAL +// Watchdog support +#define WATCHDOG + // Fan check #define FANCHECK diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 05b5e092..ac21da41 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -104,6 +104,9 @@ // New XYZ calibration #define NEW_XYZCAL +// Watchdog support +#define WATCHDOG + // Fan check #define FANCHECK From b93f37ee02e87f8255787acf0dee8e8c3410f3e3 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Mon, 29 Apr 2019 14:39:19 +0200 Subject: [PATCH 08/39] "stop" immediately after "pause" patch --- Firmware/ultralcd.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e06824f1..7645ec8f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1046,8 +1046,11 @@ void lcd_commands() { lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1 long_pause(); - lcd_commands_type = 0; - lcd_commands_step = 0; + if (lcd_commands_type == LCD_COMMAND_LONG_PAUSE) // !!! because "lcd_commands_type" can be changed during/inside "long_pause()" + { + lcd_commands_type = 0; + lcd_commands_step = 0; + } } } From 8fadbf1b4407c556f006807946865409016a4126 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 29 Apr 2019 16:41:38 +0200 Subject: [PATCH 09/39] Do not call watchdog reset from updateTemperaturesFromRawValues(). --- Firmware/temperature.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index e432d028..45256bf4 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1046,11 +1046,6 @@ static void updateTemperaturesFromRawValues() redundant_temperature = analog2temp(redundant_temperature_raw, 1); #endif - //Reset the watchdog after we know we have a temperature measurement. -#ifdef WATCHDOG - wdt_reset(); -#endif //WATCHDOG - CRITICAL_SECTION_START; temp_meas_ready = false; CRITICAL_SECTION_END; From 3852aa427536a9abe8944bca85567edf2ac03138 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 30 Apr 2019 12:42:18 +0200 Subject: [PATCH 10/39] Different secondary language reserved space for MK3 and MK25 --- Firmware/config.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Firmware/config.h b/Firmware/config.h index 24a77dc4..ca70dbcc 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -42,10 +42,18 @@ #define W25X20CL_SPCR SPI_SPCR(W25X20CL_SPI_RATE, 1, 1, 1, 0) #define W25X20CL_SPSR SPI_SPSR(W25X20CL_SPI_RATE) +#include "boards.h" +#include "Configuration_prusa.h" + //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support + +#if (MOTHERBOARD == BOARD_EINSY_1_0a) #define LANG_SIZE_RESERVED 0x2b00 // reserved space for secondary language (11008 bytes) +#else //MOTHERBOARD == BOARD_EINSY_1_0a +#define LANG_SIZE_RESERVED 0x2d00 // reserved space for secondary language (11520 bytes) +#endif //MOTHERBOARD == BOARD_EINSY_1_0a #endif //_CONFIG_H From e5911c42da8c313c83c29d99b0cfbb9e57a76f09 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 6 May 2019 12:44:36 +0200 Subject: [PATCH 11/39] limit printed menu text to max 18 characters --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 Firmware/menu.cpp diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp old mode 100644 new mode 100755 index fd11a370..a0743838 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -171,7 +171,7 @@ int menu_draw_item_printf_P(char type_char, const char* format, ...) static int menu_draw_item_puts_P(char type_char, const char* str) { lcd_set_cursor(0, menu_row); - int cnt = lcd_printf_P(PSTR("%c%-18S%c"), (lcd_encoder == menu_item)?'>':' ', str, type_char); + int cnt = lcd_printf_P(PSTR("%c%-18.18S%c"), (lcd_encoder == menu_item)?'>':' ', str, type_char); return cnt; } From 1c9d134c620642f310202ca133a3e9e0eeed0cee Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 6 May 2019 15:29:57 +0200 Subject: [PATCH 12/39] return with exitcode 1 if any language not generated properly fix - include system_timer.h --- Firmware/timer02.c | 2 ++ lang/fw-build.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 792f3aef..e0a0a5a6 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -3,6 +3,8 @@ // timer0 is used for fast pwm (OC0B output) // original OVF handler is disabled +#include "system_timer.h" + #ifdef SYSTEM_TIMER_2 #include diff --git a/lang/fw-build.sh b/lang/fw-build.sh index 5f93e8c6..a6ac5879 100755 --- a/lang/fw-build.sh +++ b/lang/fw-build.sh @@ -136,32 +136,32 @@ else if [ -e lang_cz.bin ]; then echo -n " Czech : " >&2 ./update_lang.sh cz 2>./update_lang_cz.out 1>/dev/null - if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; finish 1; fi fi if [ -e lang_de.bin ]; then echo -n " German : " >&2 ./update_lang.sh de 2>./update_lang_de.out 1>/dev/null - if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; finish 1; fi fi if [ -e lang_it.bin ]; then echo -n " Italian: " >&2 ./update_lang.sh it 2>./update_lang_it.out 1>/dev/null - if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; finish 1; fi fi if [ -e lang_es.bin ]; then echo -n " Spanish: " >&2 ./update_lang.sh es 2>./update_lang_es.out 1>/dev/null - if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; finish 1; fi fi if [ -e lang_fr.bin ]; then echo -n " French : " >&2 ./update_lang.sh fr 2>./update_lang_fr.out 1>/dev/null - if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; finish 1; fi fi if [ -e lang_pl.bin ]; then echo -n " Polish : " >&2 ./update_lang.sh pl 2>./update_lang_pl.out 1>/dev/null - if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; fi + if [ $? -eq 0 ]; then echo 'OK' >&2; else echo 'NG!' >&2; finish 1; fi fi # echo "skipped" >&2 fi From 079443020801a10f12633c5aae31c6af088dd912 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 6 May 2019 15:33:13 +0200 Subject: [PATCH 13/39] Fix for linearity correction not being stored to EEPROM when doing MENU- UP --- Firmware/menu.h | 3 +++ Firmware/ultralcd.cpp | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) mode change 100644 => 100755 Firmware/menu.h mode change 100644 => 100755 Firmware/ultralcd.cpp diff --git a/Firmware/menu.h b/Firmware/menu.h old mode 100644 new mode 100755 index efe2220c..fe183d22 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -81,6 +81,9 @@ extern uint8_t menu_item_submenu_P(const char* str, menu_func_t submenu); #define MENU_ITEM_BACK_P(str) do { if (menu_item_back_P(str)) return; } while (0) extern uint8_t menu_item_back_P(const char* str); +// leaving menu - this condition must be immediately before MENU_ITEM_BACK_P +#define ON_MENU_LEAVE(func) if (((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving){ func } + #define MENU_ITEM_FUNCTION_P(str, func) do { if (menu_item_function_P(str, func)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, menu_func_t func); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp old mode 100644 new mode 100755 index 7645ec8f..1511e87c --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3346,15 +3346,14 @@ void lcd_adjust_bed(void) } MENU_BEGIN(); // leaving menu - this condition must be immediately before MENU_ITEM_BACK_P - if (((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving) - { + ON_MENU_LEAVE( eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_LEFT, _md->left); eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_RIGHT, _md->right); eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_FRONT, _md->front); eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_REAR, _md->rear); eeprom_update_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID, 1); - } - MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); + ) + MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); MENU_ITEM_EDIT_int3_P(_i("Left side [um]"), &_md->left, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_LEFT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Front side[um]"), &_md->front, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14 r=1 @@ -5160,6 +5159,9 @@ void lcd_wizard(WizState state) void lcd_settings_linearity_correction_menu(void) { MENU_BEGIN(); + ON_MENU_LEAVE( + lcd_settings_linearity_correction_menu_save(); + ) MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); #ifdef TMC2130_LINEARITY_CORRECTION_XYZ //tmc2130_wave_fac[X_AXIS] @@ -5170,10 +5172,10 @@ void lcd_settings_linearity_correction_menu(void) #endif //TMC2130_LINEARITY_CORRECTION_XYZ MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 MENU_END(); - if(menu_leaving) - { - lcd_settings_linearity_correction_menu_save(); - } +// if(menu_leaving) +// { +// lcd_settings_linearity_correction_menu_save(); +// } } #endif // TMC2130 From 41a827fa00314d9dd4e54eb8ab70656d285bf561 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 6 May 2019 17:24:06 +0200 Subject: [PATCH 14/39] Removed unused texts, increased reserved space to 0x2e00 (11776 bytes) --- Firmware/config.h | 4 +- lang/lang_en.txt | 78 --------------------------------- lang/lang_en_cz.txt | 104 -------------------------------------------- lang/lang_en_de.txt | 104 -------------------------------------------- lang/lang_en_es.txt | 104 -------------------------------------------- lang/lang_en_fr.txt | 104 -------------------------------------------- lang/lang_en_it.txt | 104 -------------------------------------------- lang/lang_en_pl.txt | 104 -------------------------------------------- 8 files changed, 2 insertions(+), 704 deletions(-) diff --git a/Firmware/config.h b/Firmware/config.h index ca70dbcc..e8ce4d32 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -50,9 +50,9 @@ #define LANG_MODE 1 // sec. language support #if (MOTHERBOARD == BOARD_EINSY_1_0a) -#define LANG_SIZE_RESERVED 0x2b00 // reserved space for secondary language (11008 bytes) +#define LANG_SIZE_RESERVED 0x2e00 // reserved space for secondary language (11776 bytes) #else //MOTHERBOARD == BOARD_EINSY_1_0a -#define LANG_SIZE_RESERVED 0x2d00 // reserved space for secondary language (11520 bytes) +#define LANG_SIZE_RESERVED 0x2e00 // reserved space for secondary language (11776 bytes) #endif //MOTHERBOARD == BOARD_EINSY_1_0a diff --git a/lang/lang_en.txt b/lang/lang_en.txt index cea52bd3..012e4f75 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -76,12 +76,6 @@ #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." - #MSG_BED c=0 r=0 "Bed" @@ -121,9 +115,6 @@ # "Cancel" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" - #MSG_SD_REMOVED c=0 r=0 "Card removed" @@ -214,21 +205,6 @@ #MSG_ERROR c=0 r=0 "ERROR:" -# -"External SPI flash W25X20CL not responding." - -# -"Extruder 1" - -# -"Extruder 2" - -# -"Extruder 3" - -# -"Extruder 4" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" @@ -268,9 +244,6 @@ #MSG_FSENSOR_ON c=0 r=0 "Fil. sensor [on]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" @@ -289,9 +262,6 @@ #MSG_FILAMENT_SENSOR c=20 r=0 "Filament sensor" -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" @@ -346,9 +316,6 @@ #MSG_PRUSA3D_HOWTO c=0 r=0 "howto.prusa3d.com" -# -"Change extruder" - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" @@ -397,24 +364,9 @@ #MSG_WIZARD_V2_CAL_2 c=20 r=12 "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" - #MSG_WATCH c=0 r=0 "Info screen" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." - # "Is filament 1 loaded?" @@ -433,9 +385,6 @@ #MSG_STEEL_SHEET_CHECK c=20 r=2 "Is steel sheet on heatbed?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " - # "Last print failures" @@ -562,9 +511,6 @@ # "New firmware version available:" -# -"No " - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" @@ -703,12 +649,6 @@ # "Print FAN" -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" @@ -724,9 +664,6 @@ # "Prusa i3 MK3S OK." -# -"Prusa i3 MK2 ready." - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." @@ -802,12 +739,6 @@ # "Sensor state" -# -"Sensors info" - -# -"Show pinda state" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." @@ -907,9 +838,6 @@ # "Unload" -# -"Unload all" - # "Total failures" @@ -997,9 +925,6 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 "XYZ calibration compromised. Right front calibration point not reachable." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." - #MSG_LOAD_ALL c=17 r=0 "Load all" @@ -1012,9 +937,6 @@ # "XYZ calibration failed. Front calibration points not reachable." -# -"XYZ calibration failed. Left front calibration point not reachable." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 85f8ffab..8f295f9e 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -102,14 +102,6 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Kalibrace Z selhala. Sensor je odpojeny nebo preruseny kabel. Cekam na reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Kalibrace Z selhala. Sensor sepnul prilis vysoko. Cekam na reset." - #MSG_BED c=0 r=0 "Bed" "Podlozka" @@ -162,10 +154,6 @@ "Cancel" "Zrusit" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" -"Karta vlozena" - #MSG_SD_REMOVED c=0 r=0 "Card removed" "Karta vyjmuta" @@ -286,26 +274,6 @@ "ERROR:" "CHYBA:" -# -"External SPI flash W25X20CL not responding." -"Externi SPI flash W25X20CL neodpovida." - -# -"Extruder 1" -"\x00" - -# -"Extruder 2" -"\x00" - -# -"Extruder 3" -"\x00" - -# -"Extruder 4" -"\x00" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" "Levy vent.:" @@ -358,10 +326,6 @@ "Fil. sensor [on]" "Fil. senzor [zap]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" -"Senzor nerozpoznal filament, vypnout?" - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" "Fil. senzor [N/A]" @@ -386,10 +350,6 @@ "Filament sensor" "Senzor filamentu" -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" -"Senzor filamentu:" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" "Spotrebovano filamentu" @@ -462,10 +422,6 @@ "howto.prusa3d.com" "\x00" -# -"Change extruder" -"Zmenit extruder" - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" "Vymenit filament" @@ -530,30 +486,10 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace." -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" -"Zlepsuji presnost kalibracniho bodu" - #MSG_WATCH c=0 r=0 "Info screen" "Informace" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." -"Vlozte filament do extruderu 1. Potvrdte tlacitkem." - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." -"Vlozte filament do extruderu 2. Potvrdte tlacitkem." - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." -"Vlozte filament do extruderu 3. Potvrdte tlacitkem." - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." -"Vlozte filament do extruderu 4. Potvrdte tlacitkem." - # "Is filament 1 loaded?" "Je filament 1 zaveden?" @@ -578,10 +514,6 @@ "Is steel sheet on heatbed?" "Je tiskovy plat na podlozce?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " -"Iterace " - # "Last print failures" "Selhani posl. tisku" @@ -750,10 +682,6 @@ "New firmware version available:" "Vysla nova verze firmware:" -# -"No " -"Ne" - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" "Netoci se" @@ -938,14 +866,6 @@ "Print FAN" "Tiskovy vent." -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." -"Prusa i3 MK2.5 ok." - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." -"Prusa i3 MK3 ok." - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" "\x00" @@ -966,10 +886,6 @@ "Prusa i3 MK3S OK." "\x00" -# -"Prusa i3 MK2 ready." -"Prusa i3 MK2 ok." - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." "Reset XYZ kalibr." @@ -1070,14 +986,6 @@ "Sensor state" "Stav senzoru" -# -"Sensors info" -"Senzor info" - -# -"Show pinda state" -"Zobrazit stav PINDA" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." @@ -1210,10 +1118,6 @@ "Unload" "Vysunout" -# -"Unload all" -"Vyjmout vse" - # "Total failures" "Celkem selhani" @@ -1330,10 +1234,6 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." -"Kalibrace XYZ nepresna. Levy predni bod moc vpredu." - #MSG_LOAD_ALL c=17 r=0 "Load all" "Zavest vse" @@ -1350,10 +1250,6 @@ "XYZ calibration failed. Front calibration points not reachable." "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." -# -"XYZ calibration failed. Left front calibration point not reachable." -"Kalibrace XYZ selhala. Levy predni bod moc vpredu. Srovnejte tiskarnu." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" "Zavest filament 2" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 144dfc70..49957f9b 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -102,14 +102,6 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Z-Kalibrierung fehl- geschlagen. Sensor getrennt/Kabelbruch? Warte auf Reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Z-Kalibrierung fehl- geschlagen. Sensor zu hoch ausgeloest. Warte auf Reset." - #MSG_BED c=0 r=0 "Bed" "Bett" @@ -162,10 +154,6 @@ "Cancel" "Abbruch" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" -"SD Karte eingesetzt" - #MSG_SD_REMOVED c=0 r=0 "Card removed" "SD Karte entfernt" @@ -286,26 +274,6 @@ "ERROR:" "FEHLER:" -# -"External SPI flash W25X20CL not responding." -"Der externe SPI Flash W25X20CL antwortet nicht." - -# -"Extruder 1" -"\x00" - -# -"Extruder 2" -"\x00" - -# -"Extruder 3" -"\x00" - -# -"Extruder 4" -"\x00" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" "Extruder Luefter:" @@ -358,10 +326,6 @@ "Fil. sensor [on]" "Fil. Sensor [an]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" -"Fil. Sensorsignal ist schlecht, ausschalten?" - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" "Fil. Sensor [nv]" @@ -386,10 +350,6 @@ "Filament sensor" "Filamentsensor" -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" -"Filamentsensor:" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" "Filament benutzt" @@ -462,10 +422,6 @@ "howto.prusa3d.com" "\x00" -# -"Change extruder" -"Wechsel Extruder" - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" "Filament-Wechsel" @@ -530,30 +486,10 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Ich werde jetzt eine Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken, indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Sehen Sie sich die Bilder in unserem Handbuch im Kapitel Kalibrierung an." -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" -"Verbessere Bett Kalibrierpunkt" - #MSG_WATCH c=0 r=0 "Info screen" "Infoanzeige" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." -"Filament in Extruder 1 einlegen. Klicken wenn fertig." - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." -"Filament in Extruder 2 einlegen. Klicken wenn fertig." - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." -"Filament in Extruder 3 einlegen. Klicken wenn fertig." - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." -"Filament in Extruder 4 einlegen. Klicken wenn fertig." - # "Is filament 1 loaded?" "Wurde Filament 1 geladen?" @@ -578,10 +514,6 @@ "Is steel sheet on heatbed?" "Liegt das Stahlblech auf dem Heizbett?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " -"\x00" - # "Last print failures" "Letzte Druckfehler" @@ -750,10 +682,6 @@ "New firmware version available:" "Neue Firmware- Version verfuegbar:" -# -"No " -"Nein" - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" "Dreht sich nicht" @@ -938,14 +866,6 @@ "Print FAN" "Druckluefter" -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." -"Prusa i3 MK2.5 bereit." - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." -"Prusa i3 MK3 bereit." - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" "\x00" @@ -966,10 +886,6 @@ "Prusa i3 MK3S OK." "\x00" -# -"Prusa i3 MK2 ready." -"Prusa i3 MK2 bereit." - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." "XYZ Kalibr. zuruecksetzen." @@ -1070,14 +986,6 @@ "Sensor state" "Sensorstatus" -# -"Sensors info" -"Sensoren Info" - -# -"Show pinda state" -"Pinda-Status anzeigen" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." @@ -1210,10 +1118,6 @@ "Unload" "Entladen" -# -"Unload all" -"Alles entladen" - # "Total failures" "Gesamte Fehler" @@ -1330,10 +1234,6 @@ "XYZ calibration compromised. Right front calibration point not reachable." "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." -"XYZ-Kalibrierung beeintraechtigt. Linker vorderer Kalibrierpunkt nicht erreichbar." - #MSG_LOAD_ALL c=17 r=0 "Load all" "Alle laden" @@ -1350,10 +1250,6 @@ "XYZ calibration failed. Front calibration points not reachable." "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." -# -"XYZ calibration failed. Left front calibration point not reachable." -"XYZ-Kalibrierung fehlgeschlagen. Linker vorderer Kalibrierpunkt nicht erreichbar." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" "Filament 2 laden" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 86e4268b..a7df26a1 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -102,14 +102,6 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Nivelacion fallada. Sensor desconectado o cables danados. Esperando reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Nivelacion fallada. Sensor funciona demasiado pronto. Esperando reset." - #MSG_BED c=0 r=0 "Bed" "Base calefactable " @@ -162,10 +154,6 @@ "Cancel" "Cancelar" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" -"Tarjeta insertada" - #MSG_SD_REMOVED c=0 r=0 "Card removed" "Tarjeta retirada" @@ -286,26 +274,6 @@ "ERROR:" "\x00" -# -"External SPI flash W25X20CL not responding." -"No responde el flasheo externo SPI W25X20CL" - -# -"Extruder 1" -"Extrusor 1" - -# -"Extruder 2" -"Extrusor 2" - -# -"Extruder 3" -"Extrusor 3" - -# -"Extruder 4" -"Extrusor 4" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" "Ventilador del extrusor:" @@ -358,10 +326,6 @@ "Fil. sensor [on]" "Sensor Fil. [act]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" -"La respuesta del sensor de fil es deficiente, ?desactivarlo?" - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" "Sensor Fil. [N/D]" @@ -386,10 +350,6 @@ "Filament sensor" "Sensor de filamento" -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" -"Sensor de filamento:" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" "Filamento usado" @@ -462,10 +422,6 @@ "howto.prusa3d.com" "\x00" -# -"Change extruder" -"Cambiar extrusor." - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" "Cambiar filamento" @@ -530,30 +486,10 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el dial, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" -"Mejorando punto de calibracion base" - #MSG_WATCH c=0 r=0 "Info screen" "Monitorizar" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." -"Insertar filamento en el extrusor 1. Haz clic una vez terminado." - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." -"Insertar filamento en el extrusor 2. Haz clic una vez terminado." - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." -"Insertar filamento en el extrusor 3. Haz clic una vez terminado." - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." -"Insertar filamento en el extrusor 4. Haz clic una vez terminado." - # "Is filament 1 loaded?" "?Esta cargado el filamento 1?" @@ -578,10 +514,6 @@ "Is steel sheet on heatbed?" "?Esta colocada la lamina de acero sobre la base?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " -"Reiteracion " - # "Last print failures" "Ultimas impresiones fallidas" @@ -750,10 +682,6 @@ "New firmware version available:" "Nuevo firmware disponible:" -# -"No " -"No" - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" "Ventilador no gira" @@ -938,14 +866,6 @@ "Print FAN" "Ventilador del extrusor" -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." -"Preparado para Prusa i3 MK2.5." - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." -"Prusa i3 MK3 prep." - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" "prusa3d.es" @@ -966,10 +886,6 @@ "Prusa i3 MK3S OK." "\x00" -# -"Prusa i3 MK2 ready." -"Preparado para i3 MK2." - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." "\x00" @@ -1070,14 +986,6 @@ "Sensor state" "Estado del sensor" -# -"Sensors info" -"Informacion sensores" - -# -"Show pinda state" -"Mostrar estado pinda" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " @@ -1210,10 +1118,6 @@ "Unload" "Descargar" -# -"Unload all" -"Soltar todos fil." - # "Total failures" "Fallos totales" @@ -1330,10 +1234,6 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." -"Calibrazion XYZ comprometida. Punto frontal izquierdo no alcanzable." - #MSG_LOAD_ALL c=17 r=0 "Load all" "Intr. todos fil." @@ -1350,10 +1250,6 @@ "XYZ calibration failed. Front calibration points not reachable." "Calibracion XYZ fallada. Puntos frontales no alcanzables." -# -"XYZ calibration failed. Left front calibration point not reachable." -"Calibracion XYZ fallada. Punto frontal izquierdo no alcanzable." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" "Introducir fil. 2" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 930fbb57..582835b7 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -102,14 +102,6 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Echec bed leveling. Capt. non declenche. Debris sur buse ? En attente d'un reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Echec du nivellement Capteur deconnecte ou cable casse. En attente d'un reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Echec bed leveling. Capt. declenche trop trop haut. En attente d'un reset." - #MSG_BED c=0 r=0 "Bed" "Lit" @@ -162,10 +154,6 @@ "Cancel" "Annuler" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" -"Carte inseree" - #MSG_SD_REMOVED c=0 r=0 "Card removed" "Carte retiree" @@ -286,26 +274,6 @@ "ERROR:" "ERREUR :" -# -"External SPI flash W25X20CL not responding." -"La Flash SPI externe W25X20CL ne repond pas." - -# -"Extruder 1" -"Extrudeur 1" - -# -"Extruder 2" -"Extrudeur 2" - -# -"Extruder 3" -"Extrudeur 3" - -# -"Extruder 4" -"Extrudeur 4" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" "Ventilo extrudeur:" @@ -358,10 +326,6 @@ "Fil. sensor [on]" "Capteur Fil. [on]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" -"Capteur de fil. non precis, desactiver ?" - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" "Capteur Fil. [N/A]" @@ -386,10 +350,6 @@ "Filament sensor" "Capteur de filament" -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" -"Capteur filament :" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" "Filament utilise" @@ -462,10 +422,6 @@ "howto.prusa3d.com" "\x00" -# -"Change extruder" -"Changer extrudeur" - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" "Changer filament" @@ -530,30 +486,10 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Je vais commencer a imprimer une ligne et vous baisserez au fur et a mesure la buse en tournant le bouton jusqu'a atteindre la hauteur optimale. Regardez les photos dans notre manuel au chapitre Calibration" -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" -"Amelioration du point de calibration du lit" - #MSG_WATCH c=0 r=0 "Info screen" "Ecran d'info" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." -"Inserez le filament dans l'extrudeur 1. Cliquez une fois pret." - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." -"Inserez le filament dans l'extrudeur 2. Cliquez une fois pret." - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." -"Inserez le filament dans l'extrudeur 3. Cliquez une fois pret." - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." -"Inserez le filament dans l'extrudeur 4. Cliquez une fois pret." - # "Is filament 1 loaded?" "Le filament 1 est-il charge ?" @@ -578,10 +514,6 @@ "Is steel sheet on heatbed?" "Feuille d'acier sur plateau chauffant ?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " -"\x00" - # "Last print failures" "Echecs derniere impr" @@ -750,10 +682,6 @@ "New firmware version available:" "Nouvelle version de firmware disponible:" -# -"No " -"Non" - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" "Ne tourne pas" @@ -938,14 +866,6 @@ "Print FAN" "Ventilo impression" -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." -"Prusa i3 MK2.5 prete." - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." -"Prusa i3 MK3 prete." - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" "\x00" @@ -966,10 +886,6 @@ "Prusa i3 MK3S OK." "\x00" -# -"Prusa i3 MK2 ready." -"Prusa i3 MK2 prete." - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." "Reinit. calibr. XYZ" @@ -1070,14 +986,6 @@ "Sensor state" "Etat capteur" -# -"Sensors info" -"Infos capteurs" - -# -"Show pinda state" -"Etat de la PINDA" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." @@ -1210,10 +1118,6 @@ "Unload" "Decharger" -# -"Unload all" -"Decharger tout" - # "Total failures" "Total des echecs" @@ -1330,10 +1234,6 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." -"Calibration XYZ compromise. Le point de calibration avant gauche n'est pas atteignable." - #MSG_LOAD_ALL c=17 r=0 "Load all" "Tout charger" @@ -1350,10 +1250,6 @@ "XYZ calibration failed. Front calibration points not reachable." "Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." -# -"XYZ calibration failed. Left front calibration point not reachable." -"Echec calibration XYZ. Le point de calibration avant gauche n'est pas atteignable." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" "Charger fil. 2" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 0b47c724..8467e457 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -102,14 +102,6 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Livellamento letto fallito.NoRispSensore.Residui su ugello? In attesa di reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Livellamento piano fallito. Sensore disconnesso o Cavo Danneggiato. In attesa di reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Livellamento piano fallito. Risposta sensore troppo presto. In attesa di reset." - #MSG_BED c=0 r=0 "Bed" "Letto" @@ -162,10 +154,6 @@ "Cancel" "Annulla" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" -"SD inserita" - #MSG_SD_REMOVED c=0 r=0 "Card removed" "SD rimossa" @@ -286,26 +274,6 @@ "ERROR:" "ERRORE:" -# -"External SPI flash W25X20CL not responding." -"Flash SPI W25X20CL esterno non risponde." - -# -"Extruder 1" -"Estrusore 1" - -# -"Extruder 2" -"Estrusore 2" - -# -"Extruder 3" -"Estrusore 3" - -# -"Extruder 4" -"Estrusore 4" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" "Ventola estrusore:" @@ -358,10 +326,6 @@ "Fil. sensor [on]" "Sensor filam.[On]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" -"Risposta Sens. Fil. debole, disattivare? " - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" "Sensor filam[N/A]" @@ -386,10 +350,6 @@ "Filament sensor" "Sensore filam." -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" -"Sensore filam.:" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" "Filamento utilizzato" @@ -462,10 +422,6 @@ "howto.prusa3d.com" "\x00" -# -"Change extruder" -"Cambio estrusore" - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" "Cambia filamento" @@ -530,30 +486,10 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione." -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" -"Perfezion. punto di calibraz. letto" - #MSG_WATCH c=0 r=0 "Info screen" "Schermata info" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." -"Inserire filamento nell'estrusore 1. Click per continuare" - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." -"Inserire filamento nell'estrusore 2. Click per continuare" - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." -"Inserire filamento nell'estrusore 3. Click per continuare" - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." -"Inserire filamento nell'estrusore 4. Click per continuare" - # "Is filament 1 loaded?" "Il filamento 1 e caricato?" @@ -578,10 +514,6 @@ "Is steel sheet on heatbed?" "La piastra d'acciaio e sul piano riscaldato?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " -"Iterazione" - # "Last print failures" "Fallimenti ultima stampa" @@ -750,10 +682,6 @@ "New firmware version available:" "Nuova versione firmware disponibile:" -# -"No " -"No" - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" "Non gira" @@ -938,14 +866,6 @@ "Print FAN" "Ventola di stampa" -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." -"\x00" - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." -"Prusa i3 MK3 pronta." - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" "\x00" @@ -966,10 +886,6 @@ "Prusa i3 MK3S OK." "\x00" -# -"Prusa i3 MK2 ready." -"Prusa i3 MK2 pronta." - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." "Reset calibrazione XYZ." @@ -1070,14 +986,6 @@ "Sensor state" "Stato sensore" -# -"Sensors info" -"Info Sensori" - -# -"Show pinda state" -"Mostra stato pinda" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." @@ -1210,10 +1118,6 @@ "Unload" "Scarica" -# -"Unload all" -"Rilasciare tutti" - # "Total failures" "Totale fallimenti" @@ -1330,10 +1234,6 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." -"Calibrazione XYZ compromessa. Punto anteriore sinistro non raggiungibile." - #MSG_LOAD_ALL c=17 r=0 "Load all" "Caricare tutti" @@ -1350,10 +1250,6 @@ "XYZ calibration failed. Front calibration points not reachable." "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." -# -"XYZ calibration failed. Left front calibration point not reachable." -"Calibrazione XYZ fallita. Punto anteriore sinistro non raggiungibile." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" "Caricare fil. 2" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 26be40bd..dc7df52d 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -102,14 +102,6 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset." -#MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 -"Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset." -"Poziomowanie stolu nieudane. Sensor odlacz. lub uszkodz. przewod. Czekam na reset." - -#MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 -"Bed leveling failed. Sensor triggered too high. Waiting for reset." -"Kalibracja Z nieudana. Sensor aktywowal za wysoko. Czekam na reset." - #MSG_BED c=0 r=0 "Bed" "Stol" @@ -162,10 +154,6 @@ "Cancel" "Anuluj" -#MSG_SD_INSERTED c=0 r=0 -"Card inserted" -"Karta wlozona" - #MSG_SD_REMOVED c=0 r=0 "Card removed" "Karta wyjeta" @@ -286,26 +274,6 @@ "ERROR:" "BLAD:" -# -"External SPI flash W25X20CL not responding." -"Zewnetrzna pamiec flash SPI W25X20CL nie odpowiada." - -# -"Extruder 1" -"Ekstruder 1" - -# -"Extruder 2" -"Ekstruder 2" - -# -"Extruder 3" -"Ekstruder 3" - -# -"Extruder 4" -"Ekstruder 4" - #MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 "Extruder fan:" "Went. ekstrudera:" @@ -358,10 +326,6 @@ "Fil. sensor [on]" "Czuj. filam. [wl]" -#MSG_RESPONSE_POOR c=20 r=2 -"Fil. sensor response is poor, disable it?" -"Reakcja czujnika slaba, wylaczyc?" - #MSG_FSENSOR_NA c=0 r=0 "Fil. sensor [N/A]" "Czuj. filam.[N/D]" @@ -386,10 +350,6 @@ "Filament sensor" "Czujnik filamentu" -#MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 -"Filament sensor:" -"Czujnik filamentu:" - #MSG_FILAMENT_USED c=19 r=1 "Filament used" "Uzyty filament" @@ -462,10 +422,6 @@ "howto.prusa3d.com" "\x00" -# -"Change extruder" -"Zmiana ekstrudera" - #MSG_FILAMENTCHANGE c=0 r=0 "Change filament" "Wymiana filamentu" @@ -530,30 +486,10 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 -"Improving bed calibration point" -"Poprawiam precyzje punktu kalibracyjnego" - #MSG_WATCH c=0 r=0 "Info screen" "Ekran informacyjny" -#MSG_FILAMENT_LOADING_T0 c=20 r=4 -"Insert filament into extruder 1. Click when done." -"Wloz filament do ekstrudera 1. Potwierdz naciskajac pokretlo." - -#MSG_FILAMENT_LOADING_T1 c=20 r=4 -"Insert filament into extruder 2. Click when done." -"Wloz filament do ekstrudera 2. Potwierdz naciskajac pokretlo." - -#MSG_FILAMENT_LOADING_T2 c=20 r=4 -"Insert filament into extruder 3. Click when done." -"Wloz filament do ekstrudera 3. Potwierdz naciskajac pokretlo." - -#MSG_FILAMENT_LOADING_T3 c=20 r=4 -"Insert filament into extruder 4. Click when done." -"Wloz filament do ekstrudera 4. Potwierdz naciskajac pokretlo." - # "Is filament 1 loaded?" "Filament 1 zaladowany?" @@ -578,10 +514,6 @@ "Is steel sheet on heatbed?" "Czy plyta stal. jest na podgrzew. stole?" -#MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 -"Iteration " -"Iteracja " - # "Last print failures" "Ostatnie bledy druku" @@ -750,10 +682,6 @@ "New firmware version available:" "Dostepna nowa wersja firmware:" -# -"No " -"Nie" - #MSG_SELFTEST_FAN_NO c=19 r=0 "Not spinning" "Nie kreci sie" @@ -938,14 +866,6 @@ "Print FAN" "Went. wydruku" -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK2.5 ready." -"Prusa i3 MK2.5 gotowa" - -#WELCOME_MSG c=20 r=0 -"Prusa i3 MK3 ready." -"Prusa i3 MK3 gotowa" - #MSG_PRUSA3D c=0 r=0 "prusa3d.com" "\x00" @@ -966,10 +886,6 @@ "Prusa i3 MK3S OK." "Prusa i3 MK3S OK" -# -"Prusa i3 MK2 ready." -"Prusa i3 MK2 gotowa" - #MSG_CALIBRATE_BED_RESET c=0 r=0 "Reset XYZ calibr." "Reset kalibr. XYZ" @@ -1070,14 +986,6 @@ "Sensor state" "Stan czujnikow" -# -"Sensors info" -"Info o czujnikach" - -# -"Show pinda state" -"Stan sondy PINDA" - #MSG_FILE_CNT c=20 r=4 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." @@ -1210,10 +1118,6 @@ "Unload" "Rozladuj" -# -"Unload all" -"Rozladuj wszystkie" - # "Total failures" "Suma bledow" @@ -1330,10 +1234,6 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." -#MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_LEFT_FAR c=20 r=8 -"XYZ calibration compromised. Left front calibration point not reachable." -"Kalibracja XYZ niedokladna. Lewy przedni punkt nieosiagalny." - #MSG_LOAD_ALL c=17 r=0 "Load all" "Zalad. wszystkie" @@ -1350,10 +1250,6 @@ "XYZ calibration failed. Front calibration points not reachable." "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." -# -"XYZ calibration failed. Left front calibration point not reachable." -"Kalibr. XYZ nieudana. Lewy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." - #MSG_LOAD_FILAMENT_2 c=17 r=0 "Load filament 2" "Zaladuj fil. 2" From ffbdb43881209e8641e85f866861bb74728a5d41 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 6 May 2019 17:26:42 +0200 Subject: [PATCH 15/39] Remove commented code --- Firmware/ultralcd.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1511e87c..d099d922 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5172,10 +5172,6 @@ void lcd_settings_linearity_correction_menu(void) #endif //TMC2130_LINEARITY_CORRECTION_XYZ MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 MENU_END(); -// if(menu_leaving) -// { -// lcd_settings_linearity_correction_menu_save(); -// } } #endif // TMC2130 From fa1bdd6ab129e68ebef65eb316ed2515c123e5d4 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 6 May 2019 17:29:47 +0200 Subject: [PATCH 16/39] Lang - decreased reserved space for secondary language (10496 bytes) --- Firmware/config.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Firmware/config.h b/Firmware/config.h index e8ce4d32..faf4b7b0 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -49,11 +49,7 @@ //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#if (MOTHERBOARD == BOARD_EINSY_1_0a) -#define LANG_SIZE_RESERVED 0x2e00 // reserved space for secondary language (11776 bytes) -#else //MOTHERBOARD == BOARD_EINSY_1_0a -#define LANG_SIZE_RESERVED 0x2e00 // reserved space for secondary language (11776 bytes) -#endif //MOTHERBOARD == BOARD_EINSY_1_0a +#define LANG_SIZE_RESERVED 0x2900 // reserved space for secondary language (10496 bytes) #endif //_CONFIG_H From 1a0370e1c73a7e9dd187f88274daf9104a43990c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 6 May 2019 17:39:00 +0200 Subject: [PATCH 17/39] Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P(). --- Firmware/menu.h | 2 +- Firmware/ultralcd.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/menu.h b/Firmware/menu.h index fe183d22..667f8675 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -82,7 +82,7 @@ extern uint8_t menu_item_submenu_P(const char* str, menu_func_t submenu); extern uint8_t menu_item_back_P(const char* str); // leaving menu - this condition must be immediately before MENU_ITEM_BACK_P -#define ON_MENU_LEAVE(func) if (((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving){ func } +#define ON_MENU_LEAVE(func) do { if (((menu_item == menu_line) && menu_clicked && (lcd_encoder == menu_item)) || menu_leaving){ func } } while (0) #define MENU_ITEM_FUNCTION_P(str, func) do { if (menu_item_function_P(str, func)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, menu_func_t func); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d099d922..8b923858 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3352,7 +3352,7 @@ void lcd_adjust_bed(void) eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_FRONT, _md->front); eeprom_update_int8((unsigned char*)EEPROM_BED_CORRECTION_REAR, _md->rear); eeprom_update_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID, 1); - ) + ); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); MENU_ITEM_EDIT_int3_P(_i("Left side [um]"), &_md->left, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_LEFT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1 @@ -5161,7 +5161,7 @@ void lcd_settings_linearity_correction_menu(void) MENU_BEGIN(); ON_MENU_LEAVE( lcd_settings_linearity_correction_menu_save(); - ) + ); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); #ifdef TMC2130_LINEARITY_CORRECTION_XYZ //tmc2130_wave_fac[X_AXIS] From 58683da2fb971570cc56224c6277a99d5cacff82 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 6 May 2019 18:07:42 +0200 Subject: [PATCH 18/39] Variable bed PWM resolution/frequency (adjusted to 5bits/32Hz) --- Firmware/Configuration.h | 3 +++ Firmware/temperature.cpp | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index acdd2d6f..faf71f2d 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -480,6 +480,9 @@ your extruder heater takes 2 minutes to hit the target on heating. #define FAN_SOFT_PWM #define FAN_SOFT_PWM_BITS 4 //PWM bit resolution = 4bits, freq = 62.5Hz +// Bed soft pwm +#define HEATER_BED_SOFT_PWM_BITS 5 //PWM bit resolution = 5bits, freq = 32Hz + // Incrementing this by 1 will double the software PWM frequency, // affecting heaters, and the fan if FAN_SOFT_PWM is enabled. // However, control resolution will be halved for each increment; diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 45256bf4..ca885f44 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1693,13 +1693,16 @@ ISR(TIMER0_COMPB_vect) soft_pwm_2 = soft_pwm[2]; if(soft_pwm_2 > 0) WRITE(HEATER_2_PIN,1); else WRITE(HEATER_2_PIN,0); #endif + } #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 - soft_pwm_b = soft_pwm_bed; + if ((pwm_count & ((1 << HEATER_BED_SOFT_PWM_BITS) - 1)) == 0) + { + soft_pwm_b = soft_pwm_bed / (1 << (8 - HEATER_BED_SOFT_PWM_BITS)); #ifndef SYSTEM_TIMER_2 if(soft_pwm_b > 0) WRITE(HEATER_BED_PIN,1); else WRITE(HEATER_BED_PIN,0); #endif //SYSTEM_TIMER_2 -#endif } +#endif #ifdef FAN_SOFT_PWM if ((pwm_count & ((1 << FAN_SOFT_PWM_BITS) - 1)) == 0) { @@ -1722,7 +1725,7 @@ ISR(TIMER0_COMPB_vect) if(soft_pwm_2 < pwm_count) WRITE(HEATER_2_PIN,0); #endif #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 - if(soft_pwm_b < pwm_count) WRITE(HEATER_BED_PIN,0); + if (soft_pwm_b < (pwm_count & ((1 << HEATER_BED_SOFT_PWM_BITS) - 1))) WRITE(HEATER_BED_PIN,0); #endif #ifdef FAN_SOFT_PWM if (soft_pwm_fan < (pwm_count & ((1 << FAN_SOFT_PWM_BITS) - 1))) WRITE(FAN_PIN,0); From b7fe43bf68905fb5218956d4a5a9e00f28e9cf1f Mon Sep 17 00:00:00 2001 From: Ondrej Tuma Date: Tue, 7 May 2019 12:23:09 +0200 Subject: [PATCH 19/39] Deleted bad cols/rows definitions for translation. --- Firmware/Marlin_main.cpp | 54 +++---- Firmware/cardreader.cpp | 22 +-- Firmware/cmdqueue.cpp | 10 +- Firmware/mesh_bed_calibration.cpp | 6 +- Firmware/messages.c | 162 +++++++++---------- Firmware/planner.cpp | 4 +- Firmware/stepper.cpp | 2 +- Firmware/ultralcd.cpp | 188 +++++++++++----------- Firmware/util.cpp | 2 +- lang/lang_en.txt | 250 +++++++++++++++--------------- lang/lang_en_cz.txt | 250 +++++++++++++++--------------- lang/lang_en_de.txt | 250 +++++++++++++++--------------- lang/lang_en_es.txt | 250 +++++++++++++++--------------- lang/lang_en_fr.txt | 250 +++++++++++++++--------------- lang/lang_en_it.txt | 250 +++++++++++++++--------------- lang/lang_en_pl.txt | 250 +++++++++++++++--------------- 16 files changed, 1100 insertions(+), 1100 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index bb13f673..94938055 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1194,9 +1194,9 @@ void setup() #ifdef STRING_VERSION_CONFIG_H #ifdef STRING_CONFIG_H_AUTHOR SERIAL_ECHO_START; - SERIAL_ECHORPGM(_n(" Last Updated: "));////MSG_CONFIGURATION_VER c=0 r=0 + SERIAL_ECHORPGM(_n(" Last Updated: "));////MSG_CONFIGURATION_VER SERIAL_ECHOPGM(STRING_VERSION_CONFIG_H); - SERIAL_ECHORPGM(_n(" | Author: "));////MSG_AUTHOR c=0 r=0 + SERIAL_ECHORPGM(_n(" | Author: "));////MSG_AUTHOR SERIAL_ECHOLNPGM(STRING_CONFIG_H_AUTHOR); SERIAL_ECHOPGM("Compiled: "); SERIAL_ECHOLNPGM(__DATE__); @@ -1204,9 +1204,9 @@ void setup() #endif SERIAL_ECHO_START; - SERIAL_ECHORPGM(_n(" Free Memory: "));////MSG_FREE_MEMORY c=0 r=0 + SERIAL_ECHORPGM(_n(" Free Memory: "));////MSG_FREE_MEMORY SERIAL_ECHO(freeMemory()); - SERIAL_ECHORPGM(_n(" PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES c=0 r=0 + SERIAL_ECHORPGM(_n(" PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE); //lcd_update_enable(false); // why do we need this?? - andre // loads data from EEPROM if available else uses defaults (and resets step acceleration rate) @@ -2977,7 +2977,7 @@ void gcode_M114() SERIAL_PROTOCOLPGM(" E:"); SERIAL_PROTOCOL(current_position[E_AXIS]); - SERIAL_PROTOCOLRPGM(_n(" Count X: "));////MSG_COUNT_X c=0 r=0 + SERIAL_PROTOCOLRPGM(_n(" Count X: "));////MSG_COUNT_X SERIAL_PROTOCOL(float(st_get_position(X_AXIS)) / cs.axis_steps_per_unit[X_AXIS]); SERIAL_PROTOCOLPGM(" Y:"); SERIAL_PROTOCOL(float(st_get_position(Y_AXIS)) / cs.axis_steps_per_unit[Y_AXIS]); @@ -3822,7 +3822,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) codenum = 0; if(code_seen('P')) codenum = code_value(); // milliseconds to wait if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait - if(codenum != 0) LCD_MESSAGERPGM(_n("Sleep..."));////MSG_DWELL c=0 r=0 + if(codenum != 0) LCD_MESSAGERPGM(_n("Sleep..."));////MSG_DWELL st_synchronize(); codenum += _millis(); // keep track of when we started waiting previous_millis_cmd = _millis(); @@ -4960,7 +4960,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (!hasP && !hasS && *src != '\0') { lcd_setstatus(src); } else { - LCD_MESSAGERPGM(_i("Wait for user..."));////MSG_USERWAIT c=0 r=0 + LCD_MESSAGERPGM(_i("Wait for user..."));////MSG_USERWAIT } lcd_ignore_click(); //call lcd_ignore_click aslo for else ??? @@ -4986,7 +4986,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } break; case 17: - LCD_MESSAGERPGM(_i("No move."));////MSG_NO_MOVE c=0 r=0 + LCD_MESSAGERPGM(_i("No move."));////MSG_NO_MOVE enable_x(); enable_y(); enable_z(); @@ -4997,9 +4997,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) #ifdef SDSUPPORT case 20: // M20 - list SD card - SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST c=0 r=0 + SERIAL_PROTOCOLLNRPGM(_N("Begin file list"));////MSG_BEGIN_FILE_LIST card.ls(); - SERIAL_PROTOCOLLNRPGM(_N("End file list"));////MSG_END_FILE_LIST c=0 r=0 + SERIAL_PROTOCOLLNRPGM(_N("End file list"));////MSG_END_FILE_LIST break; case 21: // M21 - init SD card @@ -5555,7 +5555,7 @@ Sigma_Exit: } #else SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_i("No thermistors - no temperature"));////MSG_ERR_NO_THERMISTORS c=0 r=0 + SERIAL_ERRORLNRPGM(_i("No thermistors - no temperature"));////MSG_ERR_NO_THERMISTORS #endif SERIAL_PROTOCOLPGM(" @:"); @@ -5905,10 +5905,10 @@ Sigma_Exit: enable_endstops(true) ; break; case 119: // M119 - SERIAL_PROTOCOLRPGM(_N("Reporting endstop status"));////MSG_M119_REPORT c=0 r=0 + SERIAL_PROTOCOLRPGM(_N("Reporting endstop status"));////MSG_M119_REPORT SERIAL_PROTOCOLLN(""); #if defined(X_MIN_PIN) && X_MIN_PIN > -1 - SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0 + SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ @@ -5917,7 +5917,7 @@ Sigma_Exit: SERIAL_PROTOCOLLN(""); #endif #if defined(X_MAX_PIN) && X_MAX_PIN > -1 - SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX c=0 r=0 + SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ @@ -5926,7 +5926,7 @@ Sigma_Exit: SERIAL_PROTOCOLLN(""); #endif #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1 - SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN c=0 r=0 + SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ @@ -5935,7 +5935,7 @@ Sigma_Exit: SERIAL_PROTOCOLLN(""); #endif #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1 - SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX c=0 r=0 + SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){ SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT); }else{ @@ -5986,7 +5986,7 @@ Sigma_Exit: extruder = code_value(); if(extruder >= EXTRUDERS) { SERIAL_ECHO_START; - SERIAL_ECHO(_n("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER break; } } @@ -7125,7 +7125,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) SERIAL_ECHO_START; SERIAL_ECHOPGM("T"); SERIAL_PROTOCOLLN((int)tmp_extruder); - SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER } else { #if EXTRUDERS > 1 @@ -7161,7 +7161,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } #endif SERIAL_ECHO_START; - SERIAL_ECHORPGM(_n("Active Extruder: "));////MSG_ACTIVE_EXTRUDER c=0 r=0 + SERIAL_ECHORPGM(_n("Active Extruder: "));////MSG_ACTIVE_EXTRUDER SERIAL_PROTOCOLLN((int)active_extruder); } @@ -7617,7 +7617,7 @@ static void handleSafetyTimer() { setTargetBed(0); setAllTargetHotends(0); - lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 + lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED } } #endif //SAFETYTIMER @@ -7796,12 +7796,12 @@ void kill(const char *full_screen_message, unsigned char id) pinMode(PS_ON_PIN,INPUT); #endif SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_n("Printer halted. kill() called!"));////MSG_ERR_KILLED c=0 r=0 + SERIAL_ERRORLNRPGM(_n("Printer halted. kill() called!"));////MSG_ERR_KILLED if (full_screen_message != NULL) { SERIAL_ERRORLNRPGM(full_screen_message); lcd_display_message_fullscreen_P(full_screen_message); } else { - LCD_ALERTMESSAGERPGM(_n("KILLED. "));////MSG_KILLED c=0 r=0 + LCD_ALERTMESSAGERPGM(_n("KILLED. "));////MSG_KILLED } // FMC small patch to update the LCD before ending @@ -7925,19 +7925,19 @@ bool setTargetedHotend(int code, uint8_t &extruder) SERIAL_ECHO_START; switch(code){ case 104: - SERIAL_ECHORPGM(_n("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHORPGM(_n("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER break; case 105: - SERIAL_ECHO(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER break; case 109: - SERIAL_ECHO(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER break; case 218: - SERIAL_ECHO(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER break; case 221: - SERIAL_ECHO(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 + SERIAL_ECHO(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER break; } SERIAL_PROTOCOLLN((int)extruder); diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 7aa8ed7e..b57d5c0c 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -94,7 +94,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m if (!dir.open(parent, lfilename, O_READ)) { if (lsAction == LS_SerialPrint) { //SERIAL_ECHO_START(); - //SERIAL_ECHOPGM(_i("Cannot open subdir"));////MSG_SD_CANT_OPEN_SUBDIR c=0 r=0 + //SERIAL_ECHOPGM(_i("Cannot open subdir"));////MSG_SD_CANT_OPEN_SUBDIR //SERIAL_ECHOLN(lfilename); } } @@ -183,23 +183,23 @@ void CardReader::initsd() { //if (!card.init(SPI_HALF_SPEED,SDSS)) SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_n("SD init fail"));////MSG_SD_INIT_FAIL c=0 r=0 + SERIAL_ECHOLNRPGM(_n("SD init fail"));////MSG_SD_INIT_FAIL } else if (!volume.init(&card)) { SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_n("volume.init failed"));////MSG_SD_VOL_INIT_FAIL c=0 r=0 + SERIAL_ERRORLNRPGM(_n("volume.init failed"));////MSG_SD_VOL_INIT_FAIL } else if (!root.openRoot(&volume)) { SERIAL_ERROR_START; - SERIAL_ERRORLNRPGM(_n("openRoot failed"));////MSG_SD_OPENROOT_FAIL c=0 r=0 + SERIAL_ERRORLNRPGM(_n("openRoot failed"));////MSG_SD_OPENROOT_FAIL } else { cardOK = true; SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_n("SD card ok"));////MSG_SD_CARD_OK c=0 r=0 + SERIAL_ECHOLNRPGM(_n("SD card ok"));////MSG_SD_CARD_OK } workDir=root; curDir=&root; @@ -418,13 +418,13 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru if (file.open(curDir, fname, O_READ)) { filesize = file.fileSize(); - SERIAL_PROTOCOLRPGM(_N("File opened: "));////MSG_SD_FILE_OPENED c=0 r=0 + SERIAL_PROTOCOLRPGM(_N("File opened: "));////MSG_SD_FILE_OPENED SERIAL_PROTOCOL(fname); - SERIAL_PROTOCOLRPGM(_n(" Size: "));////MSG_SD_SIZE c=0 r=0 + SERIAL_PROTOCOLRPGM(_n(" Size: "));////MSG_SD_SIZE SERIAL_PROTOCOLLN(filesize); sdpos = 0; - SERIAL_PROTOCOLLNRPGM(_N("File selected"));////MSG_SD_FILE_SELECTED c=0 r=0 + SERIAL_PROTOCOLLNRPGM(_N("File selected"));////MSG_SD_FILE_SELECTED getfilename(0, fname); lcd_setstatus(longFilename[0] ? longFilename : fname); lcd_setstatus("SD-PRINTING "); @@ -447,7 +447,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru else { saving = true; - SERIAL_PROTOCOLRPGM(_N("Writing to file: "));////MSG_SD_WRITE_TO_FILE c=0 r=0 + SERIAL_PROTOCOLRPGM(_N("Writing to file: "));////MSG_SD_WRITE_TO_FILE SERIAL_PROTOCOLLN(name); lcd_setstatus(fname); } @@ -493,7 +493,7 @@ void CardReader::getStatus() if(sdprinting){ SERIAL_PROTOCOL(longFilename); SERIAL_PROTOCOLPGM("\n"); - SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE c=0 r=0 + SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE SERIAL_PROTOCOL(sdpos); SERIAL_PROTOCOLPGM("/"); SERIAL_PROTOCOLLN(filesize); @@ -659,7 +659,7 @@ void CardReader::chdir(const char * relpath) if(!newfile.open(*parent,relpath, O_READ)) { SERIAL_ECHO_START; - SERIAL_ECHORPGM(_n("Cannot enter subdir: "));////MSG_SD_CANT_ENTER_SUBDIR c=0 r=0 + SERIAL_ECHORPGM(_n("Cannot enter subdir: "));////MSG_SD_CANT_ENTER_SUBDIR SERIAL_ECHOLN(relpath); } else diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index c7035ba1..2e29ad5f 100644 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -429,7 +429,7 @@ void get_command() // M110 - set current line number. // Line numbers not sent in succession. SERIAL_ERROR_START; - SERIAL_ERRORRPGM(_n("Line Number is not Last Line Number+1, Last Line: "));////MSG_ERR_LINE_NO c=0 r=0 + SERIAL_ERRORRPGM(_n("Line Number is not Last Line Number+1, Last Line: "));////MSG_ERR_LINE_NO SERIAL_ERRORLN(gcode_LastN); //Serial.println(gcode_N); FlushSerialRequestResend(); @@ -445,7 +445,7 @@ void get_command() checksum = checksum^(*p++); if (int(strtol(strchr_pointer+1, NULL, 10)) != int(checksum)) { SERIAL_ERROR_START; - SERIAL_ERRORRPGM(_n("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH c=0 r=0 + SERIAL_ERRORRPGM(_n("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH SERIAL_ERRORLN(gcode_LastN); FlushSerialRequestResend(); serial_count = 0; @@ -457,7 +457,7 @@ void get_command() else { SERIAL_ERROR_START; - SERIAL_ERRORRPGM(_n("No Checksum with line number, Last Line: "));////MSG_ERR_NO_CHECKSUM c=0 r=0 + SERIAL_ERRORRPGM(_n("No Checksum with line number, Last Line: "));////MSG_ERR_NO_CHECKSUM SERIAL_ERRORLN(gcode_LastN); FlushSerialRequestResend(); serial_count = 0; @@ -474,7 +474,7 @@ void get_command() { SERIAL_ERROR_START; - SERIAL_ERRORRPGM(_n("No Line Number with checksum, Last Line: "));////MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM c=0 r=0 + SERIAL_ERRORRPGM(_n("No Line Number with checksum, Last Line: "));////MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM SERIAL_ERRORLN(gcode_LastN); FlushSerialRequestResend(); serial_count = 0; @@ -579,7 +579,7 @@ void get_command() serial_count >= (MAX_CMD_SIZE - 1) || n==-1) { if(card.eof()){ - SERIAL_PROTOCOLLNRPGM(_n("Done printing file"));////MSG_FILE_PRINTED c=0 r=0 + SERIAL_PROTOCOLLNRPGM(_n("Done printing file"));////MSG_FILE_PRINTED stoptime=_millis(); char time[30]; unsigned long t=(stoptime-starttime-pause_time)/1000; diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 006cc487..91dadaef 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -2239,7 +2239,7 @@ BedSkewOffsetDetectionResultType find_bed_offset_and_skew(int8_t verbosity_level lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2)); if (iteration > 0) { - lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 r=0 + lcd_puts_at_P(0, next_line + 1, _i("Iteration "));////MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION c=20 lcd_print(int(iteration + 1)); } #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ @@ -2500,7 +2500,7 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8 #ifdef MESH_BED_CALIBRATION_SHOW_LCD uint8_t next_line; - lcd_display_message_fullscreen_P(_i("Improving bed calibration point"), next_line);////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 + lcd_display_message_fullscreen_P(_i("Improving bed calibration point"), next_line);////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE1 c=60 if (next_line > 3) next_line = 3; #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ @@ -2514,7 +2514,7 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8 #ifdef MESH_BED_CALIBRATION_SHOW_LCD lcd_set_cursor(0, next_line); lcd_print(mesh_point+1); - lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 + lcd_puts_P(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 #endif /* MESH_BED_CALIBRATION_SHOW_LCD */ // Move up. diff --git a/Firmware/messages.c b/Firmware/messages.c index faa5283d..e4a24ce1 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -8,119 +8,119 @@ #include "Configuration_prusa.h" //internationalized messages -const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); ////c=0 r=0 -const char MSG_AUTO_MODE_ON[] PROGMEM_I1 = ISTR("Mode [auto power]"); ////c=0 r=0 -const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); ////c=0 r=0 +const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); //// +const char MSG_AUTO_MODE_ON[] PROGMEM_I1 = ISTR("Mode [auto power]"); //// +const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12 -const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////c=0 r=0 -const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////c=0 r=0 -const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////c=0 r=0 +const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); //// +const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); //// +const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); //// const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=4 const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8 const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2 -const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////c=0 r=0 +const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8 -const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////c=0 r=0 +const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); //// const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 -const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); ////c=0 r=0 -const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); ////c=0 r=0 -const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); ////c=0 r=0 -const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0 +const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); //// +const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); //// +const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); //// +const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 -const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 r=0 +const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14 const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2 const char MSG_FILAMENT_LOADING_T0[] PROGMEM_I1 = ISTR("Insert filament into extruder 1. Click when done."); ////c=20 r=4 const char MSG_FILAMENT_LOADING_T1[] PROGMEM_I1 = ISTR("Insert filament into extruder 2. Click when done."); ////c=20 r=4 const char MSG_FILAMENT_LOADING_T2[] PROGMEM_I1 = ISTR("Insert filament into extruder 3. Click when done."); ////c=20 r=4 const char MSG_FILAMENT_LOADING_T3[] PROGMEM_I1 = ISTR("Insert filament into extruder 4. Click when done."); ////c=20 r=4 -const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////c=0 r=0 -const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=60 r=0 -const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14 r=0 +const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); //// +const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=60 +const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14 const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20 r=1 const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8 const char MSG_FSENS_AUTOLOAD_NA[] PROGMEM_I1 = ISTR("F. autoload [N/A]"); ////c=17 r=1 -const char MSG_FSENSOR_OFF[] PROGMEM_I1 = ISTR("Fil. sensor [off]"); ////c=0 r=0 -const char MSG_FSENSOR_ON[] PROGMEM_I1 = ISTR("Fil. sensor [on]"); ////c=0 r=0 -const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////c=0 r=0 -const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 r=0 -const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=0 r=0 +const char MSG_FSENSOR_OFF[] PROGMEM_I1 = ISTR("Fil. sensor [off]"); //// +const char MSG_FSENSOR_ON[] PROGMEM_I1 = ISTR("Fil. sensor [on]"); //// +const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); //// +const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 +const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1 const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1 -const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////c=17 r=0 -const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 r=0 +const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////c=17 +const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25 r=1 -const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////c=0 r=0 -const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////c=0 r=0 -const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60 r=0 -const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14 r=0 -const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=0 r=0 -const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=0 r=0 -const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0 +const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); //// +const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); //// +const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60 +const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14 +const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); //// +const char MSG_NO[] PROGMEM_I1 = ISTR("No"); //// +const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); //// const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=8 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4 -const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0 -const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 r=0 +const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 +const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////c=20 r=4 -const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 r=0 +const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4 const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2 -const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////c=0 r=0 -const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0 +const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); //// +const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); //// const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 -const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0 -const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0 -const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 r=0 -const char MSG_SELFTEST_FAN[] PROGMEM_I1 = ISTR("Fan test"); ////c=20 r=0 -const char MSG_SELFTEST_FAN_NO[] PROGMEM_I1 = ISTR("Not spinning"); ////c=19 r=0 -const char MSG_SELFTEST_FAN_YES[] PROGMEM_I1 = ISTR("Spinning"); ////c=19 r=0 -const char MSG_SELFTEST_CHECK_BED[] PROGMEM_I1 = ISTR("Checking bed "); ////c=20 r=0 -const char MSG_SELFTEST_CHECK_FSENSOR[] PROGMEM_I1 = ISTR("Checking sensors "); ////c=20 r=0 -const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////c=0 r=0 -const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 r=0 -const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////c=0 r=0 -const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=0 r=0 -const char MSG_SILENT_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [high power]"); ////c=0 r=0 -const char MSG_SILENT_MODE_ON[] PROGMEM_I1 = ISTR("Mode [silent]"); ////c=0 r=0 -const char MSG_STEALTH_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [Normal]"); ////c=0 r=0 -const char MSG_STEALTH_MODE_ON[] PROGMEM_I1 = ISTR("Mode [Stealth]"); ////c=0 r=0 +const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 +const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 +const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 +const char MSG_SELFTEST_FAN[] PROGMEM_I1 = ISTR("Fan test"); ////c=20 +const char MSG_SELFTEST_FAN_NO[] PROGMEM_I1 = ISTR("Not spinning"); ////c=19 +const char MSG_SELFTEST_FAN_YES[] PROGMEM_I1 = ISTR("Spinning"); ////c=19 +const char MSG_SELFTEST_CHECK_BED[] PROGMEM_I1 = ISTR("Checking bed "); ////c=20 +const char MSG_SELFTEST_CHECK_FSENSOR[] PROGMEM_I1 = ISTR("Checking sensors "); ////c=20 +const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); //// +const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 +const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// +const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// +const char MSG_SILENT_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [high power]"); //// +const char MSG_SILENT_MODE_ON[] PROGMEM_I1 = ISTR("Mode [silent]"); //// +const char MSG_STEALTH_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [Normal]"); //// +const char MSG_STEALTH_MODE_ON[] PROGMEM_I1 = ISTR("Mode [Stealth]"); //// const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2 -const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////c=0 r=0 -const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////c=0 r=0 +const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); //// +const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); //// const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal. "); ////c=20 r=1 const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12 -const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17 r=0 +const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17 const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1 -const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=0 r=0 +const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); //// const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); ////c=20 r=8 const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!"); ////c=20 r=8 const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wait."); ////c=20 r=3 const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard from Calibration -> Wizard."); ////c=20 r=8 -const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////c=0 r=0 -const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 r=0 +const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// +const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 //not internationalized messages -const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////c=0 r=0 -const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; ////c=0 r=0 -const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; ////c=0 r=0 -const char MSG_FILE_SAVED[] PROGMEM_N1 = "Done saving file."; ////c=0 r=0 -const char MSG_OFF[] PROGMEM_N1 = "Off"; ////c=0 r=0 -const char MSG_ON[] PROGMEM_N1 = "On "; ////c=0 r=0 -const char MSG_POSITION_UNKNOWN[] PROGMEM_N1 = "Home X/Y before Z"; ////c=0 r=0 -const char MSG_SOFTWARE_RESET[] PROGMEM_N1 = " Software Reset"; ////c=0 r=0 -const char MSG_UNKNOWN_COMMAND[] PROGMEM_N1 = "Unknown command: \""; ////c=0 r=0 -const char MSG_WATCHDOG_RESET[] PROGMEM_N1 = " Watchdog Reset"; ////c=0 r=0 -const char MSG_Z_MAX[] PROGMEM_N1 = "z_max: "; ////c=0 r=0 -const char MSG_Z_MIN[] PROGMEM_N1 = "z_min: "; ////c=0 r=0 -const char MSG_ZPROBE_OUT[] PROGMEM_N1 = "Z probe out. bed"; ////c=0 r=0 -const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; ////c=0 r=0 -const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0 -const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0 -const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0 -const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0 -const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0 -const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0 -const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0 -const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0 -const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; ////c=0 r=0 -const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; ////c=0 r=0 +const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// +const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// +const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; //// +const char MSG_FILE_SAVED[] PROGMEM_N1 = "Done saving file."; //// +const char MSG_OFF[] PROGMEM_N1 = "Off"; //// +const char MSG_ON[] PROGMEM_N1 = "On "; //// +const char MSG_POSITION_UNKNOWN[] PROGMEM_N1 = "Home X/Y before Z"; //// +const char MSG_SOFTWARE_RESET[] PROGMEM_N1 = " Software Reset"; //// +const char MSG_UNKNOWN_COMMAND[] PROGMEM_N1 = "Unknown command: \""; //// +const char MSG_WATCHDOG_RESET[] PROGMEM_N1 = " Watchdog Reset"; //// +const char MSG_Z_MAX[] PROGMEM_N1 = "z_max: "; //// +const char MSG_Z_MIN[] PROGMEM_N1 = "z_min: "; //// +const char MSG_ZPROBE_OUT[] PROGMEM_N1 = "Z probe out. bed"; //// +const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; //// +const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; //// +const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; //// +const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; //// +const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; //// +const char MSG_OK[] PROGMEM_N1 = "ok"; //// +const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; //// +const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; //// +const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; //// +const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; //// +const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; //// diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp index 5008288a..4a8d6659 100644 --- a/Firmware/planner.cpp +++ b/Firmware/planner.cpp @@ -764,7 +764,7 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate de_float = 0; #endif SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_n(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0 + SERIAL_ECHOLNRPGM(_n(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP } #ifdef PREVENT_LENGTHY_EXTRUDE @@ -776,7 +776,7 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate de_float = 0; #endif SERIAL_ECHO_START; - SERIAL_ECHOLNRPGM(_n(" too long extrusion prevented"));////MSG_ERR_LONG_EXTRUDE_STOP c=0 r=0 + SERIAL_ECHOLNRPGM(_n(" too long extrusion prevented"));////MSG_ERR_LONG_EXTRUDE_STOP } #endif } diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp index c21a4e9f..74d25777 100644 --- a/Firmware/stepper.cpp +++ b/Firmware/stepper.cpp @@ -348,7 +348,7 @@ FORCE_INLINE unsigned short calc_timer(uint16_t step_rate) { timer = (unsigned short)pgm_read_word_near(table_address); timer -= (((unsigned short)pgm_read_word_near(table_address+2) * (unsigned char)(step_rate & 0x0007))>>3); } - if(timer < 100) { timer = 100; MYSERIAL.print(_N("Steprate too high: ")); MYSERIAL.println(step_rate); }//(20kHz this should never happen)////MSG_STEPPER_TOO_HIGH c=0 r=0 + if(timer < 100) { timer = 100; MYSERIAL.print(_N("Steprate too high: ")); MYSERIAL.println(step_rate); }//(20kHz this should never happen)////MSG_STEPPER_TOO_HIGH return timer; } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8b923858..6f859472 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -800,7 +800,7 @@ void lcdui_print_status_line(void) lcd_set_cursor(0, 3); lcd_puts_P(PSTR(" ")); lcd_set_cursor(0, 3); - lcd_puts_P(_i("Calibration done"));////MSG_HOMEYZ_DONE c=0 r=0 + lcd_puts_P(_i("Calibration done"));////MSG_HOMEYZ_DONE custom_message_state--; } } @@ -2252,9 +2252,9 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(PSTR("FW - " FW_version)); }*/ - MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D c=0 r=0 - MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=0 r=0 - MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO c=0 r=0 + MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D + MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM + MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO MENU_ITEM_BACK_P(STR_SEPARATOR); MENU_ITEM_BACK_P(PSTR(FILAMENT_SIZE)); MENU_ITEM_BACK_P(PSTR(ELECTRONICS)); @@ -2714,11 +2714,11 @@ void lcd_wait_interact() { #ifdef SNMM lcd_puts_P(_i("Prepare new filament"));////MSG_PREPARE_FILAMENT c=20 r=1 #else - lcd_puts_P(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20 r=0 + lcd_puts_P(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20 #endif if (!fsensor_autoload_enabled) { lcd_set_cursor(0, 2); - lcd_puts_P(_i("and press the knob"));////MSG_PRESS c=20 r=0 + lcd_puts_P(_i("and press the knob"));////MSG_PRESS c=20 } } @@ -2729,7 +2729,7 @@ void lcd_change_success() { lcd_set_cursor(0, 2); - lcd_puts_P(_i("Change success!"));////MSG_CHANGE_SUCCESS c=0 r=0 + lcd_puts_P(_i("Change success!"));////MSG_CHANGE_SUCCESS } @@ -2754,7 +2754,7 @@ void lcd_loading_color() { lcd_set_cursor(0, 0); - lcd_puts_P(_i("Loading color"));////MSG_LOADING_COLOR c=0 r=0 + lcd_puts_P(_i("Loading color"));////MSG_LOADING_COLOR lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_PLEASE_WAIT)); lcd_loading_progress_bar((FILAMENTCHANGE_FINALFEED * 1000ul) / FILAMENTCHANGE_EFEED_FINAL); //show progress bar during filament loading slow sequence @@ -2806,7 +2806,7 @@ void lcd_alright() { lcd_set_cursor(0, 0); - lcd_puts_P(_i("Changed correctly?"));////MSG_CORRECTLY c=20 r=0 + lcd_puts_P(_i("Changed correctly?"));////MSG_CORRECTLY c=20 lcd_set_cursor(1, 1); @@ -2814,11 +2814,11 @@ void lcd_alright() { lcd_set_cursor(1, 2); - lcd_puts_P(_i("Filament not loaded"));////MSG_NOT_LOADED c=19 r=0 + lcd_puts_P(_i("Filament not loaded"));////MSG_NOT_LOADED c=19 lcd_set_cursor(1, 3); - lcd_puts_P(_i("Color not correct"));////MSG_NOT_COLOR c=0 r=0 + lcd_puts_P(_i("Color not correct"));////MSG_NOT_COLOR lcd_set_cursor(0, 1); @@ -3170,7 +3170,7 @@ static void lcd_menu_xyz_skew() static void lcd_menu_xyz_offset() { lcd_set_cursor(0,0); - lcd_puts_P(_i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=0 r=0 + lcd_puts_P(_i("[0;0] point offset"));////MSG_MEASURED_OFFSET lcd_puts_at_P(0, 1, separator); lcd_puts_at_P(0, 2, PSTR("X")); lcd_puts_at_P(0, 3, PSTR("Y")); @@ -3299,7 +3299,7 @@ static void _lcd_babystep(int axis, const char *msg) static void lcd_babystep_z() { - _lcd_babystep(Z_AXIS, (_i("Adjusting Z")));////MSG_BABYSTEPPING_Z c=20 r=0 + _lcd_babystep(Z_AXIS, (_i("Adjusting Z")));////MSG_BABYSTEPPING_Z c=20 } @@ -3358,7 +3358,7 @@ void lcd_adjust_bed(void) MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Front side[um]"), &_md->front, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14 r=1 MENU_ITEM_EDIT_int3_P(_i("Rear side [um]"), &_md->rear, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_REAR c=14 r=1 - MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_adjust_bed_reset);////MSG_BED_CORRECTION_RESET c=0 r=0 + MENU_ITEM_FUNCTION_P(_i("Reset"), lcd_adjust_bed_reset);////MSG_BED_CORRECTION_RESET MENU_END(); } @@ -3391,7 +3391,7 @@ void lcd_adjust_z() { lcd_clear(); lcd_set_cursor(0, 0); - lcd_puts_P(_i("Auto adjust Z?"));////MSG_ADJUSTZ c=0 r=0 + lcd_puts_P(_i("Auto adjust Z?"));////MSG_ADJUSTZ lcd_set_cursor(1, 1); lcd_puts_P(_T(MSG_YES)); @@ -4338,7 +4338,7 @@ void lcd_pick_babystep(){ lcd_set_cursor(0, 0); - lcd_puts_P(_i("Pick print"));////MSG_PICK_Z c=0 r=0 + lcd_puts_P(_i("Pick print"));////MSG_PICK_Z lcd_set_cursor(3, 2); @@ -4432,10 +4432,10 @@ void lcd_move_menu_axis() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - MENU_ITEM_SUBMENU_P(_i("Move X"), lcd_move_x);////MSG_MOVE_X c=0 r=0 - MENU_ITEM_SUBMENU_P(_i("Move Y"), lcd_move_y);////MSG_MOVE_Y c=0 r=0 - MENU_ITEM_SUBMENU_P(_i("Move Z"), lcd_move_z);////MSG_MOVE_Z c=0 r=0 - MENU_ITEM_SUBMENU_P(_i("Extruder"), lcd_move_e);////MSG_MOVE_E c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Move X"), lcd_move_x);////MSG_MOVE_X + MENU_ITEM_SUBMENU_P(_i("Move Y"), lcd_move_y);////MSG_MOVE_Y + MENU_ITEM_SUBMENU_P(_i("Move Z"), lcd_move_z);////MSG_MOVE_Z + MENU_ITEM_SUBMENU_P(_i("Extruder"), lcd_move_e);////MSG_MOVE_E MENU_END(); } @@ -5166,11 +5166,11 @@ void lcd_settings_linearity_correction_menu(void) #ifdef TMC2130_LINEARITY_CORRECTION_XYZ //tmc2130_wave_fac[X_AXIS] - MENU_ITEM_EDIT_int3_P(_i("X-correct"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 - MENU_ITEM_EDIT_int3_P(_i("Y-correct"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 - MENU_ITEM_EDIT_int3_P(_i("Z-correct"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 + MENU_ITEM_EDIT_int3_P(_i("X-correct"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 + MENU_ITEM_EDIT_int3_P(_i("Y-correct"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 + MENU_ITEM_EDIT_int3_P(_i("Z-correct"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 #endif //TMC2130_LINEARITY_CORRECTION_XYZ - MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0 + MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 MENU_END(); } #endif // TMC2130 @@ -5184,7 +5184,7 @@ do\ if (fsensor_not_responding && (mmu_enabled == false))\ {\ /* Filament sensor not working*/\ - MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set);/*////MSG_FSENSOR_NA c=0 r=0*/\ + MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set);/*////MSG_FSENSOR_NA*/\ MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_fsensor_fail);\ }\ else\ @@ -5431,11 +5431,11 @@ static void lcd_settings_menu() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_SUBMENU_P(_i("Temperature"), lcd_control_temperature_menu);////MSG_TEMPERATURE c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Temperature"), lcd_control_temperature_menu);////MSG_TEMPERATURE if (!homing_flag) - MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS if (!isPrintPaused) - MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=0 r=0 + MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS SETTINGS_FILAMENT_SENSOR; @@ -5473,7 +5473,7 @@ static void lcd_settings_menu() MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z); #if (LANG_MODE != 0) - MENU_ITEM_SUBMENU_P(_i("Select language"), lcd_language_menu);////MSG_LANGUAGE_SELECT c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Select language"), lcd_language_menu);////MSG_LANGUAGE_SELECT #endif //(LANG_MODE != 0) SETTINGS_SD; @@ -5524,31 +5524,31 @@ static void lcd_calibration_menu() MENU_ITEM_FUNCTION_P(_i("Wizard"), lcd_wizard);////MSG_WIZARD c=17 r=1 MENU_ITEM_SUBMENU_P(_i("First layer cal."), lcd_v2_calibration);////MSG_V2_CALIBRATION c=17 r=1 MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), PSTR("G28 W")); - MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST c=0 r=0 + MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST #ifdef MK1BP // MK1 // "Calibrate Z" MENU_ITEM_GCODE_P(_T(MSG_HOMEYZ), PSTR("G28 Z")); #else //MK1BP // MK2 - MENU_ITEM_FUNCTION_P(_i("Calibrate XYZ"), lcd_mesh_calibration);////MSG_CALIBRATE_BED c=0 r=0 + MENU_ITEM_FUNCTION_P(_i("Calibrate XYZ"), lcd_mesh_calibration);////MSG_CALIBRATE_BED // "Calibrate Z" with storing the reference values to EEPROM. MENU_ITEM_SUBMENU_P(_T(MSG_HOMEYZ), lcd_mesh_calibration_z); #ifndef SNMM //MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1 #endif // "Mesh Bed Leveling" - MENU_ITEM_SUBMENU_P(_i("Mesh Bed Leveling"), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Mesh Bed Leveling"), lcd_mesh_bedleveling);////MSG_MESH_BED_LEVELING #endif //MK1BP - MENU_ITEM_SUBMENU_P(_i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU MENU_ITEM_SUBMENU_P(_i("PID calibration"), pid_extruder);////MSG_PID_EXTRUDER c=17 r=1 #ifndef TMC2130 MENU_ITEM_SUBMENU_P(_i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=17 r=1 #endif #ifndef MK1BP - MENU_ITEM_GCODE_P(_i("Reset XYZ calibr."), PSTR("M44"));////MSG_CALIBRATE_BED_RESET c=0 r=0 + MENU_ITEM_GCODE_P(_i("Reset XYZ calibr."), PSTR("M44"));////MSG_CALIBRATE_BED_RESET #endif //MK1BP #ifndef SNMM //MENU_ITEM_FUNCTION_P(MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset); @@ -5920,11 +5920,11 @@ static void fil_load_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Load filament 1"), extr_adj_0);////MSG_LOAD_FILAMENT_1 c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Load filament 2"), extr_adj_1);////MSG_LOAD_FILAMENT_2 c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Load filament 3"), extr_adj_2);////MSG_LOAD_FILAMENT_3 c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Load filament 4"), extr_adj_3);////MSG_LOAD_FILAMENT_4 c=17 r=0 + MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 + MENU_ITEM_FUNCTION_P(_i("Load filament 1"), extr_adj_0);////MSG_LOAD_FILAMENT_1 c=17 + MENU_ITEM_FUNCTION_P(_i("Load filament 2"), extr_adj_1);////MSG_LOAD_FILAMENT_2 c=17 + MENU_ITEM_FUNCTION_P(_i("Load filament 3"), extr_adj_2);////MSG_LOAD_FILAMENT_3 c=17 + MENU_ITEM_FUNCTION_P(_i("Load filament 4"), extr_adj_3);////MSG_LOAD_FILAMENT_4 c=17 if (mmu_enabled) MENU_ITEM_FUNCTION_P(_i("Load filament 5"), extr_adj_4); @@ -6036,14 +6036,14 @@ static void fil_unload_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Unload all"), extr_unload_all);////MSG_UNLOAD_ALL c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Unload filament 1"), extr_unload_0);////MSG_UNLOAD_FILAMENT_1 c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Unload filament 2"), extr_unload_1);////MSG_UNLOAD_FILAMENT_2 c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Unload filament 3"), extr_unload_2);////MSG_UNLOAD_FILAMENT_3 c=17 r=0 - MENU_ITEM_FUNCTION_P(_i("Unload filament 4"), extr_unload_3);////MSG_UNLOAD_FILAMENT_4 c=17 r=0 + MENU_ITEM_FUNCTION_P(_i("Unload all"), extr_unload_all);////MSG_UNLOAD_ALL c=17 + MENU_ITEM_FUNCTION_P(_i("Unload filament 1"), extr_unload_0);////MSG_UNLOAD_FILAMENT_1 c=17 + MENU_ITEM_FUNCTION_P(_i("Unload filament 2"), extr_unload_1);////MSG_UNLOAD_FILAMENT_2 c=17 + MENU_ITEM_FUNCTION_P(_i("Unload filament 3"), extr_unload_2);////MSG_UNLOAD_FILAMENT_3 c=17 + MENU_ITEM_FUNCTION_P(_i("Unload filament 4"), extr_unload_3);////MSG_UNLOAD_FILAMENT_4 c=17 if (mmu_enabled) - MENU_ITEM_FUNCTION_P(_i("Unload filament 5"), extr_unload_4);////MSG_UNLOAD_FILAMENT_5 c=17 r=0 + MENU_ITEM_FUNCTION_P(_i("Unload filament 5"), extr_unload_4);////MSG_UNLOAD_FILAMENT_5 c=17 MENU_END(); } @@ -6434,10 +6434,10 @@ static void lcd_main_menu() if ( moves_planned() || IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL)) { - MENU_ITEM_SUBMENU_P(_i("Tune"), lcd_tune_menu);////MSG_TUNE c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Tune"), lcd_tune_menu);////MSG_TUNE } else { - MENU_ITEM_SUBMENU_P(_i("Preheat"), lcd_preheat_menu);////MSG_PREHEAT c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Preheat"), lcd_preheat_menu);////MSG_PREHEAT } #ifdef SDSUPPORT @@ -6448,11 +6448,11 @@ static void lcd_main_menu() if (mesh_bed_leveling_flag == false && homing_flag == false) { if (card.sdprinting) { - MENU_ITEM_FUNCTION_P(_i("Pause print"), lcd_pause_print);////MSG_PAUSE_PRINT c=0 r=0 + MENU_ITEM_FUNCTION_P(_i("Pause print"), lcd_pause_print);////MSG_PAUSE_PRINT } else { - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT } MENU_ITEM_SUBMENU_P(_T(MSG_STOP_PRINT), lcd_sdcard_stop); } @@ -6471,16 +6471,16 @@ static void lcd_main_menu() } } #if SDCARDDETECT < 1 - MENU_ITEM_GCODE_P(_i("Change SD card"), PSTR("M21")); // SD-card changed by user////MSG_CNG_SDCARD c=0 r=0 + MENU_ITEM_GCODE_P(_i("Change SD card"), PSTR("M21")); // SD-card changed by user////MSG_CNG_SDCARD #endif } } else { bMain=true; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function - MENU_ITEM_SUBMENU_P(_i("No SD card"), lcd_sdcard_menu);////MSG_NO_CARD c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("No SD card"), lcd_sdcard_menu);////MSG_NO_CARD #if SDCARDDETECT < 1 - MENU_ITEM_GCODE_P(_i("Init. SD card"), PSTR("M21")); // Manually initialize the SD-card via user interface////MSG_INIT_SDCARD c=0 r=0 + MENU_ITEM_GCODE_P(_i("Init. SD card"), PSTR("M21")); // Manually initialize the SD-card via user interface////MSG_INIT_SDCARD #endif } #endif @@ -6515,7 +6515,7 @@ static void lcd_main_menu() #endif #ifdef FILAMENT_SENSOR if ((fsensor_autoload_enabled == true) && (fsensor_enabled == true) && (mmu_enabled == false)) - MENU_ITEM_SUBMENU_P(_i("AutoLoad filament"), lcd_menu_AutoLoadFilament);////MSG_AUTOLOAD_FILAMENT c=17 r=0 + MENU_ITEM_SUBMENU_P(_i("AutoLoad filament"), lcd_menu_AutoLoadFilament);////MSG_AUTOLOAD_FILAMENT c=17 else #endif //FILAMENT_SENSOR { @@ -6532,7 +6532,7 @@ static void lcd_main_menu() if (!is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) { - MENU_ITEM_SUBMENU_P(_i("Statistics "), lcd_menu_statistics);////MSG_STATISTICS c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Statistics "), lcd_menu_statistics);////MSG_STATISTICS } #if defined(TMC2130) || defined(FILAMENT_SENSOR) @@ -6541,9 +6541,9 @@ static void lcd_main_menu() if (mmu_enabled) { MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu); } - MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT #ifdef LCD_TEST - MENU_ITEM_SUBMENU_P(_i("W25x20CL init"), lcd_test_menu);////MSG_SUPPORT c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("W25x20CL init"), lcd_test_menu);////MSG_SUPPORT #endif //LCD_TEST MENU_END(); @@ -6623,13 +6623,13 @@ static void lcd_tune_menu() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); //1 - MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);//2////MSG_SPEED c=0 r=0 + MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);//2////MSG_SPEED MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);//3 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10);//4 MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255);//5 - MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW c=0 r=0 + MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW #ifdef FILAMENTCHANGEENABLE MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//7 #endif @@ -6724,18 +6724,18 @@ static void lcd_mesh_bed_leveling_settings() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_toggle); ////MSG_MESH_3x3 c=18 r=0 - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_toggle); ////MSG_MESH_7x7 c=18 r=0 + if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_toggle); ////MSG_MESH_3x3 c=18 + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_toggle); ////MSG_MESH_7x7 c=18 switch (mbl_z_probe_nr) { - case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 - case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 - default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 + case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 + case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 + default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_toggle); break; ////MSG_Z_PROBE_NR_1 c=18 } if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_ON c=18 r=0 - else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_OFF c=18 r=0 + if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_ON c=18 + else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_OFF c=18 } - else menu_item_text_P(_i("Magnets comp.[N/A]")); ////MSG_MAGNETS_COMP_NA c=18 r=0 + else menu_item_text_P(_i("Magnets comp.[N/A]")); ////MSG_MAGNETS_COMP_NA c=18 MENU_END(); //SETTINGS_MBL_MODE; } @@ -6754,10 +6754,10 @@ static void lcd_control_temperature_menu() MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); #endif #if TEMP_SENSOR_1 != 0 - MENU_ITEM_EDIT_int3_P(_i("Nozzle2"), &target_temperature[1], 0, HEATER_1_MAXTEMP - 10);////MSG_NOZZLE1 c=0 r=0 + MENU_ITEM_EDIT_int3_P(_i("Nozzle2"), &target_temperature[1], 0, HEATER_1_MAXTEMP - 10);////MSG_NOZZLE1 #endif #if TEMP_SENSOR_2 != 0 - MENU_ITEM_EDIT_int3_P(_i("Nozzle3"), &target_temperature[2], 0, HEATER_2_MAXTEMP - 10);////MSG_NOZZLE2 c=0 r=0 + MENU_ITEM_EDIT_int3_P(_i("Nozzle3"), &target_temperature[2], 0, HEATER_2_MAXTEMP - 10);////MSG_NOZZLE2 #endif #if TEMP_SENSOR_BED != 0 MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 3); @@ -6766,9 +6766,9 @@ static void lcd_control_temperature_menu() #if defined AUTOTEMP && (TEMP_SENSOR_0 != 0) //MENU_ITEM_EDIT removed, following code must be redesigned if AUTOTEMP enabled MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled); - MENU_ITEM_EDIT(float3, _i(" \002 Min"), &autotemp_min, 0, HEATER_0_MAXTEMP - 10);////MSG_MIN c=0 r=0 - MENU_ITEM_EDIT(float3, _i(" \002 Max"), &autotemp_max, 0, HEATER_0_MAXTEMP - 10);////MSG_MAX c=0 r=0 - MENU_ITEM_EDIT(float32, _i(" \002 Fact"), &autotemp_factor, 0.0, 1.0);////MSG_FACTOR c=0 r=0 + MENU_ITEM_EDIT(float3, _i(" \002 Min"), &autotemp_min, 0, HEATER_0_MAXTEMP - 10);////MSG_MIN + MENU_ITEM_EDIT(float3, _i(" \002 Max"), &autotemp_max, 0, HEATER_0_MAXTEMP - 10);////MSG_MAX + MENU_ITEM_EDIT(float32, _i(" \002 Fact"), &autotemp_factor, 0.0, 1.0);////MSG_FACTOR #endif MENU_END(); @@ -6920,7 +6920,7 @@ bool lcd_selftest() bool _result = true; lcd_wait_for_cool_down(); lcd_clear(); - lcd_set_cursor(0, 0); lcd_puts_P(_i("Self test start "));////MSG_SELFTEST_START c=20 r=0 + lcd_set_cursor(0, 0); lcd_puts_P(_i("Self test start "));////MSG_SELFTEST_START c=20 #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif // TMC2130 @@ -7100,7 +7100,7 @@ bool lcd_selftest() if (_result) { - LCD_ALERTMESSAGERPGM(_i("Self test OK"));////MSG_SELFTEST_OK c=0 r=0 + LCD_ALERTMESSAGERPGM(_i("Self test OK"));////MSG_SELFTEST_OK } else { @@ -7527,27 +7527,27 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const lcd_clear(); lcd_set_cursor(0, 0); - lcd_puts_P(_i("Selftest error !"));////MSG_SELFTEST_ERROR c=0 r=0 + lcd_puts_P(_i("Selftest error !"));////MSG_SELFTEST_ERROR lcd_set_cursor(0, 1); - lcd_puts_P(_i("Please check :"));////MSG_SELFTEST_PLEASECHECK c=0 r=0 + lcd_puts_P(_i("Please check :"));////MSG_SELFTEST_PLEASECHECK switch (testError) { case TestError::heater: lcd_set_cursor(0, 2); - lcd_puts_P(_i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 + lcd_puts_P(_i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR lcd_set_cursor(0, 3); - lcd_puts_P(_i("Not connected"));////MSG_SELFTEST_NOTCONNECTED c=0 r=0 + lcd_puts_P(_i("Not connected"));////MSG_SELFTEST_NOTCONNECTED break; case TestError::bed: lcd_set_cursor(0, 2); - lcd_puts_P(_i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER c=0 r=0 + lcd_puts_P(_i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER lcd_set_cursor(0, 3); lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); break; case TestError::endstops: lcd_set_cursor(0, 2); - lcd_puts_P(_i("Endstops"));////MSG_SELFTEST_ENDSTOPS c=0 r=0 + lcd_puts_P(_i("Endstops"));////MSG_SELFTEST_ENDSTOPS lcd_set_cursor(0, 3); lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); lcd_set_cursor(17, 3); @@ -7559,7 +7559,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const lcd_set_cursor(18, 2); lcd_print(_error_1); lcd_set_cursor(0, 3); - lcd_puts_P(_i("Endstop"));////MSG_SELFTEST_ENDSTOP c=0 r=0 + lcd_puts_P(_i("Endstop"));////MSG_SELFTEST_ENDSTOP lcd_set_cursor(18, 3); lcd_print(_error_2); break; @@ -7597,17 +7597,17 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const break; case TestError::axis: lcd_set_cursor(0, 2); - lcd_puts_P(_i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH c=0 r=0 + lcd_puts_P(_i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH lcd_set_cursor(0, 3); - lcd_puts_P(_i("Axis"));////MSG_SELFTEST_AXIS c=0 r=0 + lcd_puts_P(_i("Axis"));////MSG_SELFTEST_AXIS lcd_set_cursor(18, 3); lcd_print(_error_1); break; case TestError::swappedFan: lcd_set_cursor(0, 2); - lcd_puts_P(_i("Front/left fans"));////MSG_SELFTEST_FANS c=0 r=0 + lcd_puts_P(_i("Front/left fans"));////MSG_SELFTEST_FANS lcd_set_cursor(0, 3); - lcd_puts_P(_i("Swapped"));////MSG_SELFTEST_SWAPPED c=0 r=0 + lcd_puts_P(_i("Swapped"));////MSG_SELFTEST_SWAPPED lcd_set_cursor(18, 3); lcd_print(_error_1); break; @@ -7621,7 +7621,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); lcd_set_cursor(0, 3); - lcd_puts_P(_i("False triggering"));////c=20 r=0 + lcd_puts_P(_i("False triggering"));////c=20 break; } @@ -7931,16 +7931,16 @@ static int lcd_selftest_screen(testScreen screen, int _progress, int _progress_s if (screen == testScreen::extruderFan) lcd_puts_P(_T(MSG_SELFTEST_FAN)); if (screen == testScreen::printFan) lcd_puts_P(_T(MSG_SELFTEST_FAN)); if (screen == testScreen::fansOk) lcd_puts_P(_T(MSG_SELFTEST_FAN)); - if (screen == testScreen::endStops) lcd_puts_P(_i("Checking endstops"));////MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 - if (screen == testScreen::axisX) lcd_puts_P(_i("Checking X axis "));////MSG_SELFTEST_CHECK_X c=20 r=0 - if (screen == testScreen::axisY) lcd_puts_P(_i("Checking Y axis "));////MSG_SELFTEST_CHECK_Y c=20 r=0 - if (screen == testScreen::axisZ) lcd_puts_P(_i("Checking Z axis "));////MSG_SELFTEST_CHECK_Z c=20 r=0 + if (screen == testScreen::endStops) lcd_puts_P(_i("Checking endstops"));////MSG_SELFTEST_CHECK_ENDSTOPS c=20 + if (screen == testScreen::axisX) lcd_puts_P(_i("Checking X axis "));////MSG_SELFTEST_CHECK_X c=20 + if (screen == testScreen::axisY) lcd_puts_P(_i("Checking Y axis "));////MSG_SELFTEST_CHECK_Y c=20 + if (screen == testScreen::axisZ) lcd_puts_P(_i("Checking Z axis "));////MSG_SELFTEST_CHECK_Z c=20 if (screen == testScreen::bed) lcd_puts_P(_T(MSG_SELFTEST_CHECK_BED)); if (screen == testScreen::hotend - || screen == testScreen::hotendOk) lcd_puts_P(_i("Checking hotend "));////MSG_SELFTEST_CHECK_HOTEND c=20 r=0 + || screen == testScreen::hotendOk) lcd_puts_P(_i("Checking hotend "));////MSG_SELFTEST_CHECK_HOTEND c=20 if (screen == testScreen::fsensor) lcd_puts_P(_T(MSG_SELFTEST_CHECK_FSENSOR)); if (screen == testScreen::fsensorOk) lcd_puts_P(_T(MSG_SELFTEST_CHECK_FSENSOR)); - if (screen == testScreen::allCorrect) lcd_puts_P(_i("All correct "));////MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 + if (screen == testScreen::allCorrect) lcd_puts_P(_i("All correct "));////MSG_SELFTEST_CHECK_ALLCORRECT c=20 if (screen == testScreen::failed) lcd_puts_P(_T(MSG_SELFTEST_FAILED)); if (screen == testScreen::home) lcd_puts_P(_i("Calibrating home"));////c=20 r=1 @@ -7949,10 +7949,10 @@ static int lcd_selftest_screen(testScreen screen, int _progress, int _progress_s if ((screen >= testScreen::extruderFan) && (screen <= testScreen::fansOk)) { //SERIAL_ECHOLNPGM("Fan test"); - lcd_puts_at_P(0, 2, _i("Extruder fan:"));////MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 + lcd_puts_at_P(0, 2, _i("Extruder fan:"));////MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 lcd_set_cursor(18, 2); (screen < testScreen::printFan) ? lcd_print(_indicator) : lcd_print("OK"); - lcd_puts_at_P(0, 3, _i("Print fan:"));////MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 + lcd_puts_at_P(0, 3, _i("Print fan:"));////MSG_SELFTEST_PRINT_FAN_SPEED c=18 lcd_set_cursor(18, 3); (screen < testScreen::fansOk) ? lcd_print(_indicator) : lcd_print("OK"); } @@ -8303,7 +8303,7 @@ void menu_lcd_lcdupdate_func(void) if(menu_menu==lcd_sdcard_menu) menu_back(); card.release(); - LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED c=0 r=0 + LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED } } #endif//CARDINSERTED diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 2499b513..b859731a 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -294,7 +294,7 @@ bool show_upgrade_dialog_if_version_newer(const char *version_string) lcd_puts_at_P(0, 2, PSTR("")); for (const char *c = version_string; ! is_whitespace_or_nl_or_eol(*c); ++ c) lcd_putc(*c); - lcd_puts_at_P(0, 3, _i("Please upgrade."));////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 r=0 + lcd_puts_at_P(0, 3, _i("Please upgrade."));////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) _tone(BEEPER, 1000); delay_keep_alive(50); diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 012e4f75..dedc258d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1,10 +1,10 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" #MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4 @@ -16,10 +16,10 @@ # ">Cancel" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " #MSG_WIZARD_DONE c=20 r=8 @@ -28,7 +28,7 @@ # "Ambient" -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" #MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2 @@ -40,13 +40,13 @@ # "SpoolJoin [N/A]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" #MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4 @@ -55,28 +55,28 @@ #MSG_AUTOLOADING_ENABLED c=20 r=4 "Autoloading filament is active, just press the knob and insert filament..." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" #MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=4 "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" #MSG_MENU_BELT_STATUS c=15 r=1 @@ -88,10 +88,10 @@ # "Calibrating home" -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" #MSG_CALIBRATE_PINDA c=17 r=1 @@ -106,34 +106,34 @@ #MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8 "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" # "Cancel" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" # "Copy selected language?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" #MSG_CRASH_DETECTED c=20 r=1 @@ -151,7 +151,7 @@ #MSG_DATE c=17 r=1 "Date:" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" #MSG_BABYSTEP_Z_NOT_SET c=20 r=12 @@ -160,7 +160,7 @@ #MSG_WIZARD_REPEAT_V2_CAL c=20 r=7 "Do you want to repeat last step to readjust distance between nozzle and heatbed?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" #MSG_EJECT_FILAMENT c=17 r=1 @@ -190,10 +190,10 @@ #MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 "Endstop not hit" -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" #MSG_STACK_ERROR c=20 r=4 @@ -202,16 +202,16 @@ #MSG_FSENS_NOT_RESPONDING c=20 r=4 "ERROR: Filament sensor is not responding, please check connection." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" #MSG_INFO_EXTRUDER c=15 r=1 "Extruder info" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" # @@ -229,10 +229,10 @@ # "Fail stats" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" #MSG_FANS_CHECK_ON c=17 r=1 @@ -241,13 +241,13 @@ #MSG_FANS_CHECK_OFF c=17 r=1 "Fans check [off]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" # @@ -256,10 +256,10 @@ #MSG_FILAMENT_CLEAN c=20 r=2 "Filament extruding & with correct color?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" #MSG_FILAMENT_USED c=19 r=1 @@ -283,67 +283,67 @@ # "Fix the issue and then press button on MMU unit." -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" #MSG_BED_CORRECTION_FRONT c=14 r=1 "Front side[um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" #MSG_WIZARD_WELCOME c=20 r=7 "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " #MSG_CHOOSE_EXTRUDER c=20 r=1 @@ -364,13 +364,13 @@ #MSG_WIZARD_V2_CAL_2 c=20 r=12 "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" # "Is filament 1 loaded?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" #MSG_WIZARD_FILAMENT_LOADED c=20 r=2 @@ -391,7 +391,7 @@ # "Last print" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" # @@ -403,16 +403,16 @@ # "Lin. correction" -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" #MSG_LOOSE_PULLEY c=20 r=1 @@ -424,13 +424,13 @@ #MSG_M117_V2_CALIBRATION c=25 r=1 "M117 First layer cal." -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" #MSG_MMU_OK_RESUMING_POSITION c=20 r=4 @@ -454,10 +454,10 @@ #MSG_MMU_OK_RESUMING c=20 r=4 "MMU OK. Resuming..." -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" # @@ -466,52 +466,52 @@ # "MMU power fails" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" # "MMU2 connected" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" # "N/A" -#MSG_NO c=0 r=0 +#MSG_NO "No" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" # "New firmware version available:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" #MSG_WIZARD_V2_CAL c=20 r=8 @@ -520,7 +520,7 @@ #MSG_WIZARD_WILL_PREHEAT c=20 r=4 "Now I will preheat nozzle for PLA." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4 @@ -532,7 +532,7 @@ # "Nozzle FAN" -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" #MSG_PID_RUNNING c=20 r=1 @@ -556,7 +556,7 @@ #MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8 "Please clean the nozzle for calibration. Click when done." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" #MSG_WIZARD_CALIBRATION_FAILED c=20 r=8 @@ -595,16 +595,16 @@ #MSG_UPDATE_MMU2_FW c=20 r=4 "Please update firmware in your MMU2. Waiting for reset." -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" # "Please remove shipping helpers first." -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" #MSG_WIZARD_HEATING c=20 r=3 @@ -619,7 +619,7 @@ # "Power failures" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" # @@ -628,10 +628,10 @@ # "Preheating to unload" -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" # @@ -649,7 +649,7 @@ # "Print FAN" -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" #MSG_BED_CORRECTION_REAR c=14 r=1 @@ -664,13 +664,13 @@ # "Prusa i3 MK3S OK." -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" #MSG_RESUMING_PRINT c=20 r=1 @@ -697,25 +697,25 @@ # "Right" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " #MSG_FORCE_SELFTEST c=20 r=8 @@ -730,7 +730,7 @@ #MSG_SET_TEMPERATURE c=19 r=1 "Set temperature:" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" #MSG_SHOW_END_STOPS c=17 r=1 @@ -775,28 +775,28 @@ #MSG_SOUND_SILENT c=17 r=1 "Sound [silent]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" #MSG_TEMP_CAL_WARNING c=20 r=4 "Stable ambient temperature 21-26C is needed a rigid stand is required." -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" #MSG_TEMP_CALIBRATION c=20 r=1 @@ -817,7 +817,7 @@ #MSG_TEMP_CALIBRATION_DONE c=20 r=12 "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" #MSG_MENU_TEMPERATURES c=15 r=1 @@ -832,7 +832,7 @@ # "Total print time" -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" # @@ -847,7 +847,7 @@ # "to unload filament" -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" #MSG_UNLOADING_FILAMENT c=20 r=1 @@ -865,7 +865,7 @@ # "unknown" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." #MSG_WAITING_TEMP c=20 r=3 @@ -889,7 +889,7 @@ #MSG_UNLOAD_SUCCESSFUL c=20 r=2 "Was filament unload successful?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" #MSG_WIZARD c=17 r=1 @@ -901,7 +901,7 @@ #MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8 "XYZ calibration failed. Please consult the manual." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" #MSG_WIZARD_QUIT c=20 r=8 @@ -925,10 +925,10 @@ #MSG_BED_SKEW_OFFSET_DETECTION_WARNING_FRONT_RIGHT_FAR c=20 r=8 "XYZ calibration compromised. Right front calibration point not reachable." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" # @@ -937,13 +937,13 @@ # "XYZ calibration failed. Front calibration points not reachable." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" # "XYZ calibration failed. Right front calibration point not reachable." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" # @@ -952,11 +952,11 @@ # "Y-correct" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 8f295f9e..51d16f56 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1,12 +1,12 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" " z 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" "[0;0] odsazeni bodu" @@ -22,11 +22,11 @@ ">Cancel" ">Zrusit" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" "Dostavovani Z" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " "Vse OK " @@ -38,7 +38,7 @@ "Ambient" "Okoli" -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" "a stisknete tlacitko" @@ -54,15 +54,15 @@ "SpoolJoin [N/A]" "\x00" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" "SpoolJoin [vyp]" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" "\x00" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "AutoZavedeni fil." @@ -74,27 +74,27 @@ "Autoloading filament is active, just press the knob and insert filament..." "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" "Delka osy" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" "Osa" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" "Podlozka / Topeni" -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" "Bed OK." -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" "Zahrivani bed" -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" "Korekce podlozky" @@ -102,7 +102,7 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" "Podlozka" @@ -118,11 +118,11 @@ "Calibrating home" "Kalibruji vychozi poz." -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" "Kalibrace XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" "Kalibrovat Z" @@ -142,11 +142,11 @@ "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" "Kalibrace OK" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" "Kalibrace" @@ -154,15 +154,15 @@ "Cancel" "Zrusit" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" "Karta vyjmuta" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" "Barva neni cista" -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" "Zchladit" @@ -170,15 +170,15 @@ "Copy selected language?" "Kopirovat vybrany jazyk?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" "Crash det. [zap]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" "\x00" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" "Crash det. [vyp]" @@ -202,7 +202,7 @@ "Date:" "Datum:" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" "Vypnout motory" @@ -214,7 +214,7 @@ "Do you want to repeat last step to readjust distance between nozzle and heatbed?" "Chcete opakovat posledni krok a pozmenit vzdalenost mezi tryskou a podlozkou?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" "Korekce E" @@ -254,11 +254,11 @@ "Endstop not hit" "Kon. spinac nesepnut" -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" "Koncovy spinac" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" "Konc. spinace" @@ -270,11 +270,11 @@ "ERROR: Filament sensor is not responding, please check connection." "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" "CHYBA:" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" "Levy vent.:" @@ -282,7 +282,7 @@ "Extruder info" "\x00" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" "\x00" @@ -306,11 +306,11 @@ "Fail stats" "Selhani" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" "Rychlost vent." -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" "Test ventilatoru" @@ -322,15 +322,15 @@ "Fans check [off]" "Kontr. vent.[vyp]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" "Fil. senzor [zap]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" "Fil. senzor [N/A]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" "Fil. senzor [vyp]" @@ -342,11 +342,11 @@ "Filament extruding & with correct color?" "Filament vytlacen a spravne barvy?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" "Filament nezaveden" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" "Senzor filamentu" @@ -378,15 +378,15 @@ "Fix the issue and then press button on MMU unit." "Opravte chybu a pote stisknete tlacitko na jednotce MMU." -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" "Prutok" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" "\x00" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Predni tiskovy vent?" @@ -394,23 +394,23 @@ "Front side[um]" "Vpredu [um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" "Predni/levy vent." -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" "Topeni/Termistor" -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." "Zahrivani preruseno bezpecnostnim casovacem." -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." "Zahrivani OK." -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" "Zahrivani" @@ -418,47 +418,47 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" "\x00" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" "Vymenit filament" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" "Zmena uspesna!" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" "Vymena ok?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " "Kontrola podlozky" -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" "Kontrola endstopu" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " "Kontrola hotend " -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " "Kontrola senzoru" -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " "Kontrola osy X" -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " "Kontrola osy Y" -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " "Kontrola osy Z" @@ -486,7 +486,7 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace." -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" "Informace" @@ -494,7 +494,7 @@ "Is filament 1 loaded?" "Je filament 1 zaveden?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" "Vlozte filament" @@ -522,7 +522,7 @@ "Last print" "Posledni tisk" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" "Levy vent na trysce?" @@ -538,19 +538,19 @@ "Lin. correction" "Korekce lin." -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" "Doladeni osy Z" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" "Zavest filament" -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" "Cisteni barvy" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" "Zavadeni filamentu" @@ -566,15 +566,15 @@ "M117 First layer cal." "M117 Kal. prvni vrstvy" -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" "Hlavni nabidka" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" "Merim referencni vysku kalibracniho bodu" -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" "\x00" @@ -606,11 +606,11 @@ "MMU OK. Resuming..." "MMU OK. Pokracuji..." -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" "Mod [Normal]" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" "Mod [tichy]" @@ -622,15 +622,15 @@ "MMU power fails" "MMU vypadky proudu" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" "Mod [tichy]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" "Mod [automaticky]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" "Mod [vys. vykon]" @@ -638,31 +638,31 @@ "MMU2 connected" "MMU2 pripojeno" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" "\x00" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" "Posunout osu" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" "Posunout X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" "Posunout Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" "Posunout Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." "Bez pohybu." -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" "Zadna SD karta" @@ -670,11 +670,11 @@ "N/A" "\x00" -#MSG_NO c=0 r=0 +#MSG_NO "No" "Ne" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" "Nezapojeno " @@ -682,7 +682,7 @@ "New firmware version available:" "Vysla nova verze firmware:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" "Netoci se" @@ -694,7 +694,7 @@ "Now I will preheat nozzle for PLA." "Nyni predehreji trysku pro PLA." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" "Tryska" @@ -710,7 +710,7 @@ "Nozzle FAN" "Trysk. vent." -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" "Pozastavit tisk" @@ -742,7 +742,7 @@ "Please clean the nozzle for calibration. Click when done." "Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" "Zkontrolujte :" @@ -794,7 +794,7 @@ "Please update firmware in your MMU2. Waiting for reset." "Prosim aktualizujte firmware ve vasi MMU2 jednotce. Cekam na reset." -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" "Prosim cekejte" @@ -802,11 +802,11 @@ "Please remove shipping helpers first." "Nejprve prosim sundejte transportni soucastky." -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" "Predehrejte trysku!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" "Predehrev" @@ -826,7 +826,7 @@ "Power failures" "Vypadky proudu" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" "Tisk prerusen" @@ -838,11 +838,11 @@ "Preheating to unload" "Predehrivam k vyjmuti" -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" "Tiskovy vent.:" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" "Tisk z SD" @@ -866,7 +866,7 @@ "Print FAN" "Tiskovy vent." -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" "\x00" @@ -886,15 +886,15 @@ "Prusa i3 MK3S OK." "\x00" -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." "Reset XYZ kalibr." -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" "\x00" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" "Pokracovat" @@ -930,31 +930,31 @@ "Right" "Vpravo" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" "Hledam kalibracni bod podlozky" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" "Vyber jazyka" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" "\x00" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " "Self test start " -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " "Selftest " -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" "Chyba Selftestu!" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " "Selftest selhal " @@ -974,7 +974,7 @@ "Set temperature:" "Nastavte teplotu:" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" "Nastaveni" @@ -1034,11 +1034,11 @@ "Sound [silent]" "Zvuk [tichy]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" "Rychlost" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" "Toci se" @@ -1046,23 +1046,23 @@ "Stable ambient temperature 21-26C is needed a rigid stand is required." "Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka." -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " "Statistika " -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" "Zastavit tisk" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " "ZASTAVENO." -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" "Podpora" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" "Prohozene" @@ -1090,7 +1090,7 @@ "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." "Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" "Teplota" @@ -1110,7 +1110,7 @@ "Total print time" "Celkovy cas tisku" -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" "Ladit" @@ -1130,7 +1130,7 @@ "to unload filament" "k vyjmuti filamentu" -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" "Vyjmout filament" @@ -1154,7 +1154,7 @@ "unknown" "neznamy" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." "Ceka se na uzivatele..." @@ -1186,7 +1186,7 @@ "Was filament unload successful?" "Bylo vysunuti filamentu uspesne?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" "Chyba zapojeni" @@ -1202,7 +1202,7 @@ "XYZ calibration failed. Please consult the manual." "Kalibrace XYZ selhala. Nahlednete do manualu." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" "Ano" @@ -1234,11 +1234,11 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Kalibrace XYZ nepresna. Pravy predni bod moc vpredu." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" "Zavest vse" -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" "Zavest filament 1" @@ -1250,7 +1250,7 @@ "XYZ calibration failed. Front calibration points not reachable." "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" "Zavest filament 2" @@ -1258,7 +1258,7 @@ "XYZ calibration failed. Right front calibration point not reachable." "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" "Zavest filament 3" @@ -1270,14 +1270,14 @@ "Y-correct" "Korekce Y" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" "Zavest filament 4" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" "Zavest filament 5" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 49957f9b..48da055f 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1,12 +1,12 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " von 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" " von 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" "[0;0] Punktversatz" @@ -22,11 +22,11 @@ ">Cancel" ">Abbruch" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" "Z wurde eingestellt" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " "Alles richtig " @@ -38,7 +38,7 @@ "Ambient" "Raumtemp." -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" "und Knopf druecken" @@ -54,15 +54,15 @@ "SpoolJoin [N/A]" "SpoolJoin [N/V]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" "SpoolJoin [aus]" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" "Startposition" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "Auto-Laden Filament" @@ -74,27 +74,27 @@ "Autoloading filament is active, just press the knob and insert filament..." "Automatisches Laden Filament ist aktiv, Knopf druecken und Filament einlegen..." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" "Achsenlaenge" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" "Achse" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" "Bett / Heizung" -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" "Bett OK" -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" "Bett aufwaermen" -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" "Ausgleich Bett ok" @@ -102,7 +102,7 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" "Bett" @@ -118,11 +118,11 @@ "Calibrating home" "Kalibriere Start" -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" "Kalibrierung XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" "Kalibrierung Z" @@ -142,11 +142,11 @@ "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Z Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" "Kalibrierung OK" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" "Kalibrierung" @@ -154,15 +154,15 @@ "Cancel" "Abbruch" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" "SD Karte entfernt" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" "Falsche Farbe" -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" "Abkuehlen" @@ -170,15 +170,15 @@ "Copy selected language?" "Gewaehlte Sprache kopieren?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" "Crash Erk. [an]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" "Crash Erk. [nv]" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" "Crash Erk. [aus]" @@ -202,7 +202,7 @@ "Date:" "Datum:" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" "Motoren aus" @@ -214,7 +214,7 @@ "Do you want to repeat last step to readjust distance between nozzle and heatbed?" "Moechten Sie den letzten Schritt wiederholen, um den Abstand zwischen Duese und Druckbett neu einzustellen?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" "E-Korrektur" @@ -254,11 +254,11 @@ "Endstop not hit" "Ende nicht getroffen" -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" "Endanschlag" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" "Endschalter" @@ -270,11 +270,11 @@ "ERROR: Filament sensor is not responding, please check connection." "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" "FEHLER:" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" "Extruder Luefter:" @@ -282,7 +282,7 @@ "Extruder info" "Extruder Info" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" "\x00" @@ -306,11 +306,11 @@ "Fail stats" "Fehlerstatistik" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" "Luefter-Tempo" -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" "Lueftertest" @@ -322,15 +322,15 @@ "Fans check [off]" "Luefter Chk.[aus]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" "Fil. Sensor [an]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" "Fil. Sensor [nv]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" "Fil. Sensor [aus]" @@ -342,11 +342,11 @@ "Filament extruding & with correct color?" "Filament extrudiert + richtige Farbe?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" "Fil. nicht geladen" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" "Filamentsensor" @@ -378,15 +378,15 @@ "Fix the issue and then press button on MMU unit." "Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU." -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" "Durchfluss" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" "\x00" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Vorderer Luefter?" @@ -394,23 +394,23 @@ "Front side[um]" "Vorne [um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" "Vorderer/linke Luefter" -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" "Heizung/Thermistor" -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." "Heizung durch Sicherheitstimer deaktiviert." -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." "Aufwaermen OK." -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" "Aufwaermen" @@ -418,47 +418,47 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Hallo, ich bin Ihr Original Prusa i3 Drucker. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" "\x00" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" "Filament-Wechsel" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" "Wechsel erfolgr.!" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" "Wechsel ok?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " "Pruefe Bett " -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" "Pruefe Endschalter" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " "Pruefe Duese " -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " "Pruefe Sensoren " -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " "Pruefe X Achse " -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " "Pruefe Y Achse " -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " "Pruefe Z Achse " @@ -486,7 +486,7 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Ich werde jetzt eine Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken, indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Sehen Sie sich die Bilder in unserem Handbuch im Kapitel Kalibrierung an." -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" "Infoanzeige" @@ -494,7 +494,7 @@ "Is filament 1 loaded?" "Wurde Filament 1 geladen?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" "Filament einlegen" @@ -522,7 +522,7 @@ "Last print" "Letzter Druck" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" "Linker Luefter?" @@ -538,19 +538,19 @@ "Lin. correction" "Lineare Korrektur" -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" "Z einstellen" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" "Filament laden" -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" "Lade Farbe" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" "Filament laedt" @@ -566,15 +566,15 @@ "M117 First layer cal." "M117 Erste-Schicht Kal." -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" "Hauptmenue" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" "Messen der Referenzhoehe des Kalibrierpunktes" -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" "Mesh Bett Ausgleich" @@ -606,11 +606,11 @@ "MMU OK. Resuming..." "MMU OK. Weiterdrucken..." -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" "Modus [Normal]" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" "Modus [leise]" @@ -622,15 +622,15 @@ "MMU power fails" "MMU Netzfehler" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" "Modus [Stealth]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" "Modus[Auto Power]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" "Modus[Hohe Leist]" @@ -638,31 +638,31 @@ "MMU2 connected" "MMU2 verbunden" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" "\x00" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" "Achse bewegen" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" "Bewege X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" "Bewege Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" "Bewege Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." "Keine Bewegung." -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" "Keine SD Karte" @@ -670,11 +670,11 @@ "N/A" "N.V." -#MSG_NO c=0 r=0 +#MSG_NO "No" "Nein" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" "Nicht angeschlossen" @@ -682,7 +682,7 @@ "New firmware version available:" "Neue Firmware- Version verfuegbar:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" "Dreht sich nicht" @@ -694,7 +694,7 @@ "Now I will preheat nozzle for PLA." "Jetzt werde ich die Duese fuer PLA vorheizen." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" "Duese" @@ -710,7 +710,7 @@ "Nozzle FAN" "Duesen Luefter" -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" "Druck pausieren" @@ -742,7 +742,7 @@ "Please clean the nozzle for calibration. Click when done." "Bitte entfernen Sie ueberstehendes Filament von der Duese. Klicken wenn sauber." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" "Bitte pruefe:" @@ -794,7 +794,7 @@ "Please update firmware in your MMU2. Waiting for reset." "Bitte aktualisieren Sie die Firmware in der MMU2. Warte auf Reset." -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" "Bitte warten" @@ -802,11 +802,11 @@ "Please remove shipping helpers first." "Bitte zuerst Transportsicherungen entfernen." -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" "Duese vorheizen!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" "Vorheizen" @@ -826,7 +826,7 @@ "Power failures" "Netzfehler" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" "Druck abgebrochen" @@ -838,11 +838,11 @@ "Preheating to unload" "Heizen zum Entladen" -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" "Druckvent.:" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" "Drucken von SD" @@ -866,7 +866,7 @@ "Print FAN" "Druckluefter" -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" "\x00" @@ -886,15 +886,15 @@ "Prusa i3 MK3S OK." "\x00" -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." "XYZ Kalibr. zuruecksetzen." -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" "Ruecksetzen" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" "Druck fortsetzen" @@ -930,31 +930,31 @@ "Right" "Rechts" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" "Suche Bett Kalibrierpunkt" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" "Waehle Sprache" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" "Selbsttest OK" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " "Selbsttest start " -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " "Selbsttest " -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" "Selbsttest Fehler!" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " "Selbsttest misslung " @@ -974,7 +974,7 @@ "Set temperature:" "Temp. einstellen:" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" "Einstellungen" @@ -1034,11 +1034,11 @@ "Sound [silent]" "Sound [leise]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" "Geschwindigkeit" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" "Dreht sich" @@ -1046,23 +1046,23 @@ "Stable ambient temperature 21-26C is needed a rigid stand is required." "Stabile Umgebungs- temperatur 21-26C und feste Stand- flaeche erforderlich" -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " "Statistiken " -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" "Druck abbrechen" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " "GESTOPPT. " -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" "\x00" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" "Ausgetauscht" @@ -1090,7 +1090,7 @@ "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." "Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" "Temperatur" @@ -1110,7 +1110,7 @@ "Total print time" "Gesamte Druckzeit" -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" "Feineinstellung" @@ -1130,7 +1130,7 @@ "to unload filament" "zum Filament entladen" -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" "Filament entladen" @@ -1154,7 +1154,7 @@ "unknown" "unbekannt" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." "Warte auf Benutzer.." @@ -1186,7 +1186,7 @@ "Was filament unload successful?" "Konnten Sie das Filament entnehmen?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" "Verdrahtungsfehler" @@ -1202,7 +1202,7 @@ "XYZ calibration failed. Please consult the manual." "XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" "Ja" @@ -1234,11 +1234,11 @@ "XYZ calibration compromised. Right front calibration point not reachable." "XYZ-Kalibrierung beeintraechtigt. Rechter vorderer Kalibrierpunkt nicht erreichbar." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" "Alle laden" -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" "Filament 1 laden" @@ -1250,7 +1250,7 @@ "XYZ calibration failed. Front calibration points not reachable." "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" "Filament 2 laden" @@ -1258,7 +1258,7 @@ "XYZ calibration failed. Right front calibration point not reachable." "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" "Filament 3 laden" @@ -1270,14 +1270,14 @@ "Y-correct" "Y-Korrektur" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" "Filament 4 laden" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" "Filament 5 laden" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index a7df26a1..3d8b17dc 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1,12 +1,12 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " de 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" " de 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" "[0;0] punto offset" @@ -22,11 +22,11 @@ ">Cancel" ">Cancelar" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" "Ajustar Z" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " "Todo bien" @@ -38,7 +38,7 @@ "Ambient" "Ambiente" -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" "Haz clic" @@ -54,15 +54,15 @@ "SpoolJoin [N/A]" "\x00" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" "\x00" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" "Llevar al origen" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "Carga automatica de filamento" @@ -74,27 +74,27 @@ "Autoloading filament is active, just press the knob and insert filament..." "La carga automatica de filamento esta activada, pulse el dial e inserte el filamento..." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" "Longitud del eje" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" "Eje" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" "Base / Calentador" -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" "Base preparada" -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" "Calentando Base" -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" "Corr. de la cama" @@ -102,7 +102,7 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" "Base calefactable " @@ -118,11 +118,11 @@ "Calibrating home" "Calibrando posicion inicial" -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" "Calibrar XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" "Calibrar Z" @@ -142,11 +142,11 @@ "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" "Calibracion OK" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" "Calibracion" @@ -154,15 +154,15 @@ "Cancel" "Cancelar" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" "Tarjeta retirada" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" "Color no homogeneo" -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" "Enfriar" @@ -170,15 +170,15 @@ "Copy selected language?" "Copiar idioma seleccionado?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" "Det. choque [act]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" "Dec. choque [N/D]" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" "Det. choque [ina]" @@ -202,7 +202,7 @@ "Date:" "Fecha:" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" "Apagar motores" @@ -214,7 +214,7 @@ "Do you want to repeat last step to readjust distance between nozzle and heatbed?" "Quieres repetir el ultimo paso para reajustar la distancia boquilla-base?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" "E-correcion" @@ -254,11 +254,11 @@ "Endstop not hit" "Endstop no alcanzado" -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" "\x00" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" "\x00" @@ -270,11 +270,11 @@ "ERROR: Filament sensor is not responding, please check connection." "ERROR: El sensor de filamento no responde, por favor comprueba la conexion." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" "\x00" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" "Ventilador del extrusor:" @@ -282,7 +282,7 @@ "Extruder info" "Informacion del extrusor" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" "Extruir" @@ -306,11 +306,11 @@ "Fail stats" "Estadistica de fallos" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" "Velocidad Vent." -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" "Test ventiladores" @@ -322,15 +322,15 @@ "Fans check [off]" "Comprob.vent[ina]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" "Sensor Fil. [act]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" "Sensor Fil. [N/D]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" "Sensor Fil. [ina]" @@ -342,11 +342,11 @@ "Filament extruding & with correct color?" "Es nitido el color nuevo?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" "Fil. no introducido" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" "Sensor de filamento" @@ -378,15 +378,15 @@ "Fix the issue and then press button on MMU unit." "Corrige el problema y pulsa el boton en la unidad MMU." -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" "Flujo" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" "\x00" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Vent. frontal?" @@ -394,23 +394,23 @@ "Front side[um]" "Frontal [um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" "Ventiladores frontal/izquierdo" -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" "Calentador/Termistor" -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." "Calentadores desactivados por el temporizador de seguridad." -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." "Calentamiento acabado." -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" "Calentando..." @@ -418,47 +418,47 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la configuracion?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" "\x00" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" "Cambiar filamento" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" "Cambio correcto" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" "Cambio correcto?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " "Control base cal." -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" "Control endstops" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " "Control fusor" -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " "Comprobando los sensores" -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " "Control sensor X" -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " "Control sensor Y" -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " "Control sensor Z" @@ -486,7 +486,7 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el dial, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual." -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" "Monitorizar" @@ -494,7 +494,7 @@ "Is filament 1 loaded?" "?Esta cargado el filamento 1?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" "Introducir filamento" @@ -522,7 +522,7 @@ "Last print" "Ultima impresion" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" "Vent. izquierdo?" @@ -538,19 +538,19 @@ "Lin. correction" "Correccion de Linealidad" -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" "Micropaso Eje Z" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" "Introducir filam." -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" "Cambiando color" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" "Introduciendo filam." @@ -566,15 +566,15 @@ "M117 First layer cal." "M117 Cal. primera cap." -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" "Menu principal" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" "Midiendo altura del punto de calibracion" -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" "Nivelacion Mesh Level" @@ -606,11 +606,11 @@ "MMU OK. Resuming..." "MMU OK. Resumiendo..." -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" "Modo [Normal]" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" "Modo [silencio]" @@ -622,15 +622,15 @@ "MMU power fails" "Fallo de energia en MMU" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" "Modo [Silencio]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" "Modo[fuerza auto]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" "Modo [rend.pleno]" @@ -638,31 +638,31 @@ "MMU2 connected" "MMU2 conectado" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" "\x00" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" "Mover ejes" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" "Mover X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" "Mover Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" "Mover Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." "Sin movimiento" -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" "No hay tarjeta SD" @@ -670,11 +670,11 @@ "N/A" "No disponible" -#MSG_NO c=0 r=0 +#MSG_NO "No" "\x00" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" "No hay conexion " @@ -682,7 +682,7 @@ "New firmware version available:" "Nuevo firmware disponible:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" "Ventilador no gira" @@ -694,7 +694,7 @@ "Now I will preheat nozzle for PLA." "Voy a precalentar la boquilla para PLA ahora." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" "Boquilla" @@ -710,7 +710,7 @@ "Nozzle FAN" "Ventilador de capa" -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" "Pausar impresion" @@ -742,7 +742,7 @@ "Please clean the nozzle for calibration. Click when done." "Limpia boquilla para calibracion. Click cuando acabes." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" "Controla :" @@ -794,7 +794,7 @@ "Please update firmware in your MMU2. Waiting for reset." "Por favor actualice el firmware en tu MMU2. Esperando el reseteo." -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" "Por Favor Espere" @@ -802,11 +802,11 @@ "Please remove shipping helpers first." "Por favor retira los soportes de envio primero." -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" "Precalienta extrusor!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" "Precalentar" @@ -826,7 +826,7 @@ "Power failures" "Cortes de energia" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" "Impresion cancelada" @@ -838,11 +838,11 @@ "Preheating to unload" "Precalentar para descargar" -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" "Ventilador del fusor:" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" "Menu tarjeta SD" @@ -866,7 +866,7 @@ "Print FAN" "Ventilador del extrusor" -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" "prusa3d.es" @@ -886,15 +886,15 @@ "Prusa i3 MK3S OK." "\x00" -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." "\x00" -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" "\x00" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" "Reanudar impres." @@ -930,31 +930,31 @@ "Right" "Derecha" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" "Buscando punto de calibracion base" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" "Cambiar el idioma" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" "\x00" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " "Iniciar Selftest" -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " "Selftest" -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" "Error Selftest !" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " "Fallo Selftest" @@ -974,7 +974,7 @@ "Set temperature:" "Establecer temp.:" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" "Configuracion" @@ -1034,11 +1034,11 @@ "Sound [silent]" "Sonido[silencios]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" "Velocidad" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" "Ventilador girando" @@ -1046,23 +1046,23 @@ "Stable ambient temperature 21-26C is needed a rigid stand is required." "Se necesita una temperatura ambiente ente 21 y 26C y un soporte rigido." -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " "Estadisticas " -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" "Detener impresion" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " "PARADA" -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" "Soporte" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" "Intercambiado" @@ -1090,7 +1090,7 @@ "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." "Calibracion temperatura terminada. Haz clic para continuar." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" "Temperatura" @@ -1110,7 +1110,7 @@ "Total print time" "Tiempo total :" -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" "Ajustar" @@ -1130,7 +1130,7 @@ "to unload filament" "para descargar el filamento" -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" "Soltar filamento" @@ -1154,7 +1154,7 @@ "unknown" "desconocido" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." "Esperando ordenes" @@ -1186,7 +1186,7 @@ "Was filament unload successful?" "?Se cargocon exito el filamento?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" "Error de conexion" @@ -1202,7 +1202,7 @@ "XYZ calibration failed. Please consult the manual." "Calibracion XYZ fallada. Consulta el manual por favor." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" "Si" @@ -1234,11 +1234,11 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Calibrazion XYZ comprometida. Punto frontal derecho no alcanzable." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" "Intr. todos fil." -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" "Introducir fil. 1" @@ -1250,7 +1250,7 @@ "XYZ calibration failed. Front calibration points not reachable." "Calibracion XYZ fallada. Puntos frontales no alcanzables." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" "Introducir fil. 2" @@ -1258,7 +1258,7 @@ "XYZ calibration failed. Right front calibration point not reachable." "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" "Introducir fil. 3" @@ -1270,14 +1270,14 @@ "Y-correct" "Y-correcion" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" "Introducir fil. 4" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" "Cargar filamento 5" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 582835b7..7e91c029 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1,12 +1,12 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" "de 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" "de 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" "Offset point [0;0]" @@ -22,11 +22,11 @@ ">Cancel" ">Annuler" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" "Ajustement de Z" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " "Tout est correct" @@ -38,7 +38,7 @@ "Ambient" "Ambiant" -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" "et pressez le bouton" @@ -54,15 +54,15 @@ "SpoolJoin [N/A]" "\x00" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" "\x00" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" "Mise a 0 des axes" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "AutoCharge du filament" @@ -74,27 +74,27 @@ "Autoloading filament is active, just press the knob and insert filament..." "Chargement auto du filament actif, appuyez sur le btn et inserez le fil." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" "Longueur de l'axe" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" "Axe" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" "Lit / Chauffage" -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" "Plateau termine" -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" "Chauffe du lit" -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" "Corr. niveau plateau" @@ -102,7 +102,7 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Echec bed leveling. Capt. non declenche. Debris sur buse ? En attente d'un reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" "Lit" @@ -118,11 +118,11 @@ "Calibrating home" "Calib. mise a 0" -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" "Calibrer XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" "Calibrer Z" @@ -142,11 +142,11 @@ "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Calibration de Z. Tournez le bouton pour monter le chariot de l'axe Z jusqu'aux butees. Cliquez une fois fait." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" "Calibration terminee" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" "\x00" @@ -154,15 +154,15 @@ "Cancel" "Annuler" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" "Carte retiree" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" "Couleur incorrecte" -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" "Refroidissement" @@ -170,15 +170,15 @@ "Copy selected language?" "Copier la langue selectionne ?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" "Detect. crash[on]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" "Detect. crash [N/A]" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" "Detect. crash[off]" @@ -202,7 +202,7 @@ "Date:" "Date :" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" "Desactiver moteurs" @@ -214,7 +214,7 @@ "Do you want to repeat last step to readjust distance between nozzle and heatbed?" "Voulez-vous repeter la derniere etape pour reajuster la distance entre la buse et le plateau chauffant ?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" "Correct-E" @@ -254,11 +254,11 @@ "Endstop not hit" "Butee non atteinte" -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" "Butee" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" "Butees" @@ -270,11 +270,11 @@ "ERROR: Filament sensor is not responding, please check connection." "ERREUR : Le capteur de filament ne repond pas, verifiez le branchement." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" "ERREUR :" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" "Ventilo extrudeur:" @@ -282,7 +282,7 @@ "Extruder info" "Infos extrudeur" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" "Extrudeur" @@ -306,11 +306,11 @@ "Fail stats" "Statist. d'echec" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" "Vitesse ventil" -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" "Test ventilateur" @@ -322,15 +322,15 @@ "Fans check [off]" "Verif venti [off]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" "Capteur Fil. [on]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" "Capteur Fil. [N/A]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" "Capteur Fil.[off]" @@ -342,11 +342,11 @@ "Filament extruding & with correct color?" "Filament extrude et avec bonne couleur ?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" "Filament non charge" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" "Capteur de filament" @@ -378,15 +378,15 @@ "Fix the issue and then press button on MMU unit." "Corrigez le probleme et appuyez sur le bouton de l'unite MMU." -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" "Flux" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" "\x00" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Ventilo impr avant ?" @@ -394,23 +394,23 @@ "Front side[um]" "Avant [um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" "Ventilos avt/gauche" -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" "Chauffage/Thermistor" -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." "Chauffe desactivee par le compteur de securite." -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." "Chauffe terminee." -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" "Chauffe" @@ -418,47 +418,47 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous guide a travers le processus d'installation ?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" "\x00" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" "Changer filament" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" "Changement reussi!" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" "Change correctement?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " "Verification du lit" -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" "Verifications butees" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " "Verif. tete impr." -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " "Verif. des capteurs" -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " "Verification axe X" -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " "Verification axe Y" -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " "Verification axe Z" @@ -486,7 +486,7 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Je vais commencer a imprimer une ligne et vous baisserez au fur et a mesure la buse en tournant le bouton jusqu'a atteindre la hauteur optimale. Regardez les photos dans notre manuel au chapitre Calibration" -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" "Ecran d'info" @@ -494,7 +494,7 @@ "Is filament 1 loaded?" "Le filament 1 est-il charge ?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" "Inserez le filament" @@ -522,7 +522,7 @@ "Last print" "Derniere impression" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" "Ventilo tete gauche?" @@ -538,19 +538,19 @@ "Lin. correction" "Correction lin." -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" "Ajuster Z en direct" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" "Charger filament" -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" "Chargement couleur" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" "Chargement filament" @@ -566,15 +566,15 @@ "M117 First layer cal." "M117 Cal. 1ere couche" -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" "Principal" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" "Mesure de la hauteur de reference du point de calibration" -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" "\x00" @@ -606,11 +606,11 @@ "MMU OK. Resuming..." "MMU OK. Reprise ..." -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" "\x00" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" "Mode [silencieux]" @@ -622,15 +622,15 @@ "MMU power fails" "Echecs alim. MMU" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" "Mode [Furtif]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" "Mode [puiss.auto]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" "Mode [haute puiss]" @@ -638,31 +638,31 @@ "MMU2 connected" "MMU2 connecte" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" "Moteur" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" "Deplacer l'axe" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" "Deplacer X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" "Deplacer Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" "Deplacer Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." "Pas de mouvement." -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" "Pas de carte SD" @@ -670,11 +670,11 @@ "N/A" "\x00" -#MSG_NO c=0 r=0 +#MSG_NO "No" "Non" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" "Non connecte" @@ -682,7 +682,7 @@ "New firmware version available:" "Nouvelle version de firmware disponible:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" "Ne tourne pas" @@ -694,7 +694,7 @@ "Now I will preheat nozzle for PLA." "Maintenant je vais prechauffer la buse pour du PLA." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" "Buse" @@ -710,7 +710,7 @@ "Nozzle FAN" "Ventilateur buse" -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" "Pause de l'impr." @@ -742,7 +742,7 @@ "Please clean the nozzle for calibration. Click when done." "Nettoyez la buse pour la calibration. Cliquez une fois fait." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" "Verifiez :" @@ -794,7 +794,7 @@ "Please update firmware in your MMU2. Waiting for reset." "Veuillez mettre a jour le firmware de votre MMU2. En attente d'un reset." -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" "Merci de patienter" @@ -802,11 +802,11 @@ "Please remove shipping helpers first." "Veuillez retirer d'abord les protections d'envoi." -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" "Prechauffez la buse!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" "Prechauffage" @@ -826,7 +826,7 @@ "Power failures" "Coupures de courant" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" "Impression annulee" @@ -838,11 +838,11 @@ "Preheating to unload" "Chauffe pr decharger" -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" "Ventilo impr. :" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" "Impr depuis la SD" @@ -866,7 +866,7 @@ "Print FAN" "Ventilo impression" -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" "\x00" @@ -886,15 +886,15 @@ "Prusa i3 MK3S OK." "\x00" -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." "Reinit. calibr. XYZ" -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" "Reinitialiser" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" "Reprendre impression" @@ -930,31 +930,31 @@ "Right" "Droite" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" "Recherche du point de calibration du lit" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" "Choisir langue" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" "Auto-test OK" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " "Debut auto-test" -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " "Auto-test" -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" "Erreur auto-test !" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " "Echec de l'auto-test" @@ -974,7 +974,7 @@ "Set temperature:" "Regler temp. :" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" "Reglages" @@ -1034,11 +1034,11 @@ "Sound [silent]" "Son [silencieux]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" "Vitesse" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" "Tourne" @@ -1046,23 +1046,23 @@ "Stable ambient temperature 21-26C is needed a rigid stand is required." "Une temperature ambiante stable de 21-26C et un support stable sont requis." -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " "Statistiques" -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" "Arreter impression" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " "ARRETE." -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" "\x00" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" "Echange" @@ -1090,7 +1090,7 @@ "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." "La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" "\x00" @@ -1110,7 +1110,7 @@ "Total print time" "Temps total impr." -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" "Regler" @@ -1130,7 +1130,7 @@ "to unload filament" "pour decharger fil." -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" "Decharger fil." @@ -1154,7 +1154,7 @@ "unknown" "inconnu" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." "Attente utilisateur..." @@ -1186,7 +1186,7 @@ "Was filament unload successful?" "Dechargement du filament reussi ?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" "Erreur de cablage" @@ -1202,7 +1202,7 @@ "XYZ calibration failed. Please consult the manual." "Echec calibration XYZ. Consultez le manuel." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" "Oui" @@ -1234,11 +1234,11 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Calibration XYZ compromise. Le point de calibration avant droit n'est pas atteignable." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" "Tout charger" -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" "Charger fil. 1" @@ -1250,7 +1250,7 @@ "XYZ calibration failed. Front calibration points not reachable." "Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" "Charger fil. 2" @@ -1258,7 +1258,7 @@ "XYZ calibration failed. Right front calibration point not reachable." "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" "Charger fil. 3" @@ -1270,14 +1270,14 @@ "Y-correct" "Correction-Y" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" "Charger fil. 4" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" "Charger fil. 5" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8467e457..12a12fa9 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1,12 +1,12 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " su 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" "su 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" "[0;0] punto offset" @@ -22,11 +22,11 @@ ">Cancel" ">Annulla" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" "Compensazione Z" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " "Nessun errore" @@ -38,7 +38,7 @@ "Ambient" "Ambiente" -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" "e cliccare manopola" @@ -54,15 +54,15 @@ "SpoolJoin [N/A]" "\x00" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" "\x00" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" "Trova origine" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "Autocaric. filam." @@ -74,27 +74,27 @@ "Autoloading filament is active, just press the knob and insert filament..." "Il caricamento automatico e attivo, premete la manopola e inserite il filamento..." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" "Lunghezza dell'asse" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" "Assi" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" "Letto/Riscald." -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" "Piano fatto." -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" "Riscald. letto" -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" "Correz. liv.letto" @@ -102,7 +102,7 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Livellamento letto fallito.NoRispSensore.Residui su ugello? In attesa di reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" "Letto" @@ -118,11 +118,11 @@ "Calibrating home" "Calibrazione Home" -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" "Calibra XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" "Calibra Z" @@ -142,11 +142,11 @@ "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" "Calibrazione completa" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" "Calibrazione" @@ -154,15 +154,15 @@ "Cancel" "Annulla" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" "SD rimossa" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" "Colore non puro" -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" "Raffredda" @@ -170,15 +170,15 @@ "Copy selected language?" "Copiare la lingua selezionata?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" "Rilevam.imp. [on]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" "Rilevam.imp.[N/A]" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" "Rilevam.imp.[off]" @@ -202,7 +202,7 @@ "Date:" "Data:" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" "Disabilita motori" @@ -214,7 +214,7 @@ "Do you want to repeat last step to readjust distance between nozzle and heatbed?" "Desideri ripetere l'ultimo passaggio per migliorare la distanza fra ugello e piatto?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" "Correzione-E" @@ -254,11 +254,11 @@ "Endstop not hit" "Finecorsa fuori portata" -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" "Finecorsa" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" "Finecorsa" @@ -270,11 +270,11 @@ "ERROR: Filament sensor is not responding, please check connection." "ERRORE: il sensore filam. non risponde,Controllare conness." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" "ERRORE:" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" "Ventola estrusore:" @@ -282,7 +282,7 @@ "Extruder info" "Info estrusore" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" "Estrusore" @@ -306,11 +306,11 @@ "Fail stats" "Statistiche fallimenti" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" "Velocita ventola" -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" "Test ventola" @@ -322,15 +322,15 @@ "Fans check [off]" "Control.vent[off]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" "Sensor filam.[On]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" "Sensor filam[N/A]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" "Sensor filam[off]" @@ -342,11 +342,11 @@ "Filament extruding & with correct color?" "Filamento estruso & con il giusto colore?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" "Fil. non caricato" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" "Sensore filam." @@ -378,15 +378,15 @@ "Fix the issue and then press button on MMU unit." "Risolvi il problema e quindi premi il bottone sull'unita MMU. " -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" "Flusso" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" "\x00" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Ventola frontale?" @@ -394,23 +394,23 @@ "Front side[um]" "Fronte [um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" "Ventola frontale/sinistra" -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" "Riscald./Termist." -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." "Riscaldamento fermato dal timer di sicurezza." -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." "Riscald. completo" -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" "Riscaldamento..." @@ -418,47 +418,47 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" "\x00" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" "Cambia filamento" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" "Cambio riuscito!" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" "Cambiato correttamente?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " "Verifica piano" -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" "Verifica finecorsa" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " "Verifica ugello" -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " "Controllo sensori" -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " "Verifica asse X" -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " "Verifica asse Y" -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " "Verifica asse Z" @@ -486,7 +486,7 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione." -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" "Schermata info" @@ -494,7 +494,7 @@ "Is filament 1 loaded?" "Il filamento 1 e caricato?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" "Inserire filamento" @@ -522,7 +522,7 @@ "Last print" "Ultima stampa" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" "Vent SX hotend?" @@ -538,19 +538,19 @@ "Lin. correction" "Correzione lin." -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" "Compensazione Z" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" "Carica filamento" -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" "Caricando colore" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" "Caricando filamento" @@ -566,15 +566,15 @@ "M117 First layer cal." "M117 Calibrazione primo layer." -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" "Menu principale" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" "Misura altezza di rif. del punto di calib." -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" "Mesh livel. letto" @@ -606,11 +606,11 @@ "MMU OK. Resuming..." "MMU OK. Riprendendo... " -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" "Modo [normale]" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" "Modo [silenzioso]" @@ -622,15 +622,15 @@ "MMU power fails" "Mancanza corrente MMU" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" "Modo [Silenziosa]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" "Modo [auto]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" "Mode [forte]" @@ -638,31 +638,31 @@ "MMU2 connected" "MMU2 connessa" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" "Motore" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" "Muovi asse" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" "Muovi X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" "Muovi Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" "Muovi Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." "Nessun movimento." -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" "Nessuna SD" @@ -670,11 +670,11 @@ "N/A" "\x00" -#MSG_NO c=0 r=0 +#MSG_NO "No" "\x00" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" "Non connesso" @@ -682,7 +682,7 @@ "New firmware version available:" "Nuova versione firmware disponibile:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" "Non gira" @@ -694,7 +694,7 @@ "Now I will preheat nozzle for PLA." "Adesso preriscaldero l'ugello per PLA." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" "Ugello" @@ -710,7 +710,7 @@ "Nozzle FAN" "Ventola estrusore" -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" "Metti in pausa" @@ -742,7 +742,7 @@ "Please clean the nozzle for calibration. Click when done." "Pulire l'ugello per la calibrazione, poi fare click." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" "Verifica:" @@ -794,7 +794,7 @@ "Please update firmware in your MMU2. Waiting for reset." "Aggiorna il firmware sul tuo MMU2. In attesa di reset. " -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" "Attendere" @@ -802,11 +802,11 @@ "Please remove shipping helpers first." "Per favore rimuovete i materiali da spedizione" -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" "Prerisc. ugello!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" "Preriscalda" @@ -826,7 +826,7 @@ "Power failures" "Mancanza corrente" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" "Stampa interrotta" @@ -838,11 +838,11 @@ "Preheating to unload" "Preriscaldamento per scaricare" -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" "Ventola di stampa:" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" "Stampa da SD" @@ -866,7 +866,7 @@ "Print FAN" "Ventola di stampa" -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" "\x00" @@ -886,15 +886,15 @@ "Prusa i3 MK3S OK." "\x00" -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." "Reset calibrazione XYZ." -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" "\x00" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" "Riprendi stampa" @@ -930,31 +930,31 @@ "Right" "Destra" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" "Ricerca dei punti di calibrazione del piano" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" "Seleziona lingua" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" "Autotest OK" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " "Avvia autotest" -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " "Autotest" -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" "Errore Autotest !" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " "Autotest fallito" @@ -974,7 +974,7 @@ "Set temperature:" "Imposta temperatura:" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" "Impostazioni" @@ -1034,11 +1034,11 @@ "Sound [silent]" "Suono[silenzioso]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" "Velocita" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" "Gira" @@ -1046,23 +1046,23 @@ "Stable ambient temperature 21-26C is needed a rigid stand is required." "Sono necessari una temperatura ambiente di 21-26C e una superficie rigida " -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " "Statistiche" -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" "Arresta stampa" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " "ARRESTATO." -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" "Supporto" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" "Scambiato" @@ -1090,7 +1090,7 @@ "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." "Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" "\x00" @@ -1110,7 +1110,7 @@ "Total print time" "Tempo di stampa totale" -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" "Regola" @@ -1130,7 +1130,7 @@ "to unload filament" "per scaricare il filamento" -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" "Scarica filam." @@ -1154,7 +1154,7 @@ "unknown" "sconosciuto" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." "Attendendo utente..." @@ -1186,7 +1186,7 @@ "Was filament unload successful?" "Filamento scaricato con successo?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" "Errore cablaggio" @@ -1202,7 +1202,7 @@ "XYZ calibration failed. Please consult the manual." "Calibrazione XYZ fallita. Si prega di consultare il manuale." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" "Si" @@ -1234,11 +1234,11 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Calibrazione XYZ compromessa. Punto anteriore destro non raggiungibile." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" "Caricare tutti" -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" "Caricare fil. 1" @@ -1250,7 +1250,7 @@ "XYZ calibration failed. Front calibration points not reachable." "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" "Caricare fil. 2" @@ -1258,7 +1258,7 @@ "XYZ calibration failed. Right front calibration point not reachable." "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" "Carica fil. 3" @@ -1270,14 +1270,14 @@ "Y-correct" "Correzione-Y" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" "Caricare fil. 4" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" "Caricare fil. 5" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index dc7df52d..bdac8819 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1,12 +1,12 @@ -#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0 +#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 " of 4" " z 4" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 " of 9" " z 9" -#MSG_MEASURED_OFFSET c=0 r=0 +#MSG_MEASURED_OFFSET "[0;0] point offset" "[0;0] przesuniecie punktu" @@ -22,11 +22,11 @@ ">Cancel" ">Anuluj" -#MSG_BABYSTEPPING_Z c=20 r=0 +#MSG_BABYSTEPPING_Z c=20 "Adjusting Z" "Dostrajanie Z" -#MSG_SELFTEST_CHECK_ALLCORRECT c=20 r=0 +#MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " "Wszystko OK " @@ -38,7 +38,7 @@ "Ambient" "Otoczenie" -#MSG_PRESS c=20 r=0 +#MSG_PRESS c=20 "and press the knob" "i nacisnij pokretlo" @@ -54,15 +54,15 @@ "SpoolJoin [N/A]" "SpoolJoin [nd]" -# MSG_AUTO_DEPLETE_OFF c=17 r=1 +#MSG_AUTO_DEPLETE_OFF c=17 r=1 "SpoolJoin [off]" "SpoolJoin [wyl]" -#MSG_AUTO_HOME c=0 r=0 +#MSG_AUTO_HOME "Auto home" "Auto zerowanie" -#MSG_AUTOLOAD_FILAMENT c=17 r=0 +#MSG_AUTOLOAD_FILAMENT c=17 "AutoLoad filament" "AutoLadowanie fil." @@ -74,27 +74,27 @@ "Autoloading filament is active, just press the knob and insert filament..." "Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..." -#MSG_SELFTEST_AXIS_LENGTH c=0 r=0 +#MSG_SELFTEST_AXIS_LENGTH "Axis length" "Dlugosc osi" -#MSG_SELFTEST_AXIS c=0 r=0 +#MSG_SELFTEST_AXIS "Axis" "Os" -#MSG_SELFTEST_BEDHEATER c=0 r=0 +#MSG_SELFTEST_BEDHEATER "Bed / Heater" "Stol / Grzanie" -#MSG_BED_DONE c=0 r=0 +#MSG_BED_DONE "Bed done" "Stol OK" -#MSG_BED_HEATING c=0 r=0 +#MSG_BED_HEATING "Bed Heating" "Grzanie stolu.." -#MSG_BED_CORRECTION_MENU c=0 r=0 +#MSG_BED_CORRECTION_MENU "Bed level correct" "Korekta poziomowania stolu" @@ -102,7 +102,7 @@ "Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset." "Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset." -#MSG_BED c=0 r=0 +#MSG_BED "Bed" "Stol" @@ -118,11 +118,11 @@ "Calibrating home" "Zerowanie osi" -#MSG_CALIBRATE_BED c=0 r=0 +#MSG_CALIBRATE_BED "Calibrate XYZ" "Kalibracja XYZ" -#MSG_HOMEYZ c=0 r=0 +#MSG_HOMEYZ "Calibrate Z" "Kalibruj Z" @@ -142,11 +142,11 @@ "Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych ogranicznikow. Nacisnij, by potwierdzic." -#MSG_HOMEYZ_DONE c=0 r=0 +#MSG_HOMEYZ_DONE "Calibration done" "Kalibracja OK" -#MSG_MENU_CALIBRATION c=0 r=0 +#MSG_MENU_CALIBRATION "Calibration" "Kalibracja" @@ -154,15 +154,15 @@ "Cancel" "Anuluj" -#MSG_SD_REMOVED c=0 r=0 +#MSG_SD_REMOVED "Card removed" "Karta wyjeta" -#MSG_NOT_COLOR c=0 r=0 +#MSG_NOT_COLOR "Color not correct" "Kolor zanieczysz." -#MSG_COOLDOWN c=0 r=0 +#MSG_COOLDOWN "Cooldown" "Chlodzenie" @@ -170,15 +170,15 @@ "Copy selected language?" "Skopiowac wybrany jezyk?" -#MSG_CRASHDETECT_ON c=0 r=0 +#MSG_CRASHDETECT_ON "Crash det. [on]" "Wykr.zderzen [wl]" -#MSG_CRASHDETECT_NA c=0 r=0 +#MSG_CRASHDETECT_NA "Crash det. [N/A]" "Wykr.zderzen[n/d]" -#MSG_CRASHDETECT_OFF c=0 r=0 +#MSG_CRASHDETECT_OFF "Crash det. [off]" "Wykr.zderzen[wyl]" @@ -202,7 +202,7 @@ "Date:" "Data:" -#MSG_DISABLE_STEPPERS c=0 r=0 +#MSG_DISABLE_STEPPERS "Disable steppers" "Wylaczenie silnikow" @@ -214,7 +214,7 @@ "Do you want to repeat last step to readjust distance between nozzle and heatbed?" "Chcesz powtorzyc ostatni krok i ponownie ustawic odleglosc miedzy dysza a stolikiem?" -#MSG_EXTRUDER_CORRECTION c=9 r=0 +#MSG_EXTRUDER_CORRECTION c=9 "E-correct" "Korekcja E" @@ -254,11 +254,11 @@ "Endstop not hit" "Krancowka nie aktyw." -#MSG_SELFTEST_ENDSTOP c=0 r=0 +#MSG_SELFTEST_ENDSTOP "Endstop" "Krancowka" -#MSG_SELFTEST_ENDSTOPS c=0 r=0 +#MSG_SELFTEST_ENDSTOPS "Endstops" "Krancowki" @@ -270,11 +270,11 @@ "ERROR: Filament sensor is not responding, please check connection." "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie." -#MSG_ERROR c=0 r=0 +#MSG_ERROR "ERROR:" "BLAD:" -#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18 "Extruder fan:" "Went. ekstrudera:" @@ -282,7 +282,7 @@ "Extruder info" "Informacje o ekstruderze" -#MSG_MOVE_E c=0 r=0 +#MSG_MOVE_E "Extruder" "Ekstruder" @@ -306,11 +306,11 @@ "Fail stats" "Statystyki bledow" -#MSG_FAN_SPEED c=14 r=0 +#MSG_FAN_SPEED c=14 "Fan speed" "Predkosc went." -#MSG_SELFTEST_FAN c=20 r=0 +#MSG_SELFTEST_FAN c=20 "Fan test" "Test wentylatora" @@ -322,15 +322,15 @@ "Fans check [off]" "Sprawd.went.[wyl]" -#MSG_FSENSOR_ON c=0 r=0 +#MSG_FSENSOR_ON "Fil. sensor [on]" "Czuj. filam. [wl]" -#MSG_FSENSOR_NA c=0 r=0 +#MSG_FSENSOR_NA "Fil. sensor [N/A]" "Czuj. filam.[N/D]" -#MSG_FSENSOR_OFF c=0 r=0 +#MSG_FSENSOR_OFF "Fil. sensor [off]" "Czuj. filam.[wyl]" @@ -342,11 +342,11 @@ "Filament extruding & with correct color?" "Filament wychodzi z dyszy a kolor jest czysty?" -#MSG_NOT_LOADED c=19 r=0 +#MSG_NOT_LOADED c=19 "Filament not loaded" "Fil. nie zaladowany" -#MSG_FILAMENT_SENSOR c=20 r=0 +#MSG_FILAMENT_SENSOR c=20 "Filament sensor" "Czujnik filamentu" @@ -378,15 +378,15 @@ "Fix the issue and then press button on MMU unit." "Rozwiaz problem i wcisnij przycisk na MMU." -#MSG_FLOW c=0 r=0 +#MSG_FLOW "Flow" "Przeplyw" -#MSG_PRUSA3D_FORUM c=0 r=0 +#MSG_PRUSA3D_FORUM "forum.prusa3d.com" "\x00" -#MSG_SELFTEST_COOLING_FAN c=20 r=0 +#MSG_SELFTEST_COOLING_FAN c=20 "Front print fan?" "Przedni went. druku?" @@ -394,23 +394,23 @@ "Front side[um]" "Przod [um]" -#MSG_SELFTEST_FANS c=0 r=0 +#MSG_SELFTEST_FANS "Front/left fans" "Przedni/lewy wentylator" -#MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 +#MSG_SELFTEST_HEATERTHERMISTOR "Heater/Thermistor" "Grzalka/Termistor" -#MSG_BED_HEATING_SAFETY_DISABLED c=0 r=0 +#MSG_BED_HEATING_SAFETY_DISABLED "Heating disabled by safety timer." "Grzanie wylaczone przez wyl. czasowy" -#MSG_HEATING_COMPLETE c=20 r=0 +#MSG_HEATING_COMPLETE c=20 "Heating done." "Grzanie zakonczone" -#MSG_HEATING c=0 r=0 +#MSG_HEATING "Heating" "Grzanie..." @@ -418,47 +418,47 @@ "Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?" "Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?" -#MSG_PRUSA3D_HOWTO c=0 r=0 +#MSG_PRUSA3D_HOWTO "howto.prusa3d.com" "\x00" -#MSG_FILAMENTCHANGE c=0 r=0 +#MSG_FILAMENTCHANGE "Change filament" "Wymiana filamentu" -#MSG_CHANGE_SUCCESS c=0 r=0 +#MSG_CHANGE_SUCCESS "Change success!" "Wymiana ok!" -#MSG_CORRECTLY c=20 r=0 +#MSG_CORRECTLY c=20 "Changed correctly?" "Wymiana ok?" -#MSG_SELFTEST_CHECK_BED c=20 r=0 +#MSG_SELFTEST_CHECK_BED c=20 "Checking bed " "Kontrola stolu" -#MSG_SELFTEST_CHECK_ENDSTOPS c=20 r=0 +#MSG_SELFTEST_CHECK_ENDSTOPS c=20 "Checking endstops" "Kontrola krancowek" -#MSG_SELFTEST_CHECK_HOTEND c=20 r=0 +#MSG_SELFTEST_CHECK_HOTEND c=20 "Checking hotend " "Kontrola hotendu" -#MSG_SELFTEST_CHECK_FSENSOR c=20 r=0 +#MSG_SELFTEST_CHECK_FSENSOR c=20 "Checking sensors " "Sprawdzanie czujnikow" -#MSG_SELFTEST_CHECK_X c=20 r=0 +#MSG_SELFTEST_CHECK_X c=20 "Checking X axis " "Kontrola osi X" -#MSG_SELFTEST_CHECK_Y c=20 r=0 +#MSG_SELFTEST_CHECK_Y c=20 "Checking Y axis " "Kontrola osi Y" -#MSG_SELFTEST_CHECK_Z c=20 r=0 +#MSG_SELFTEST_CHECK_Z c=20 "Checking Z axis " "Kontrola osi Z" @@ -486,7 +486,7 @@ "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration." "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac pokretlo, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym Podreczniku w rozdz. Kalibracja" -#MSG_WATCH c=0 r=0 +#MSG_WATCH "Info screen" "Ekran informacyjny" @@ -494,7 +494,7 @@ "Is filament 1 loaded?" "Filament 1 zaladowany?" -#MSG_INSERT_FILAMENT c=20 r=0 +#MSG_INSERT_FILAMENT c=20 "Insert filament" "Wprowadz filament" @@ -522,7 +522,7 @@ "Last print" "Ost. wydruk" -#MSG_SELFTEST_EXTRUDER_FAN c=20 r=0 +#MSG_SELFTEST_EXTRUDER_FAN c=20 "Left hotend fan?" "Lewy went hotendu?" @@ -538,19 +538,19 @@ "Lin. correction" "Korekcja lin." -#MSG_BABYSTEP_Z c=0 r=0 +#MSG_BABYSTEP_Z "Live adjust Z" "Ustaw. Live Z" -#MSG_LOAD_FILAMENT c=17 r=0 +#MSG_LOAD_FILAMENT c=17 "Load filament" "Ladowanie fil." -#MSG_LOADING_COLOR c=0 r=0 +#MSG_LOADING_COLOR "Loading color" "Czyszcz. koloru" -#MSG_LOADING_FILAMENT c=20 r=0 +#MSG_LOADING_FILAMENT c=20 "Loading filament" "Laduje filament" @@ -566,15 +566,15 @@ "M117 First layer cal." "M117 Kal. 1. warstwy" -#MSG_MAIN c=0 r=0 +#MSG_MAIN "Main" "Menu glowne" -#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 r=0 +#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60 "Measuring reference height of calibration point" "Okreslam wysokosc odniesienia punktu kalibracyjnego" -#MSG_MESH_BED_LEVELING c=0 r=0 +#MSG_MESH_BED_LEVELING "Mesh Bed Leveling" "Poziomowanie stolu wg siatki" @@ -606,11 +606,11 @@ "MMU OK. Resuming..." "MMU OK. Wznawianie..." -#MSG_STEALTH_MODE_OFF c=0 r=0 +#MSG_STEALTH_MODE_OFF "Mode [Normal]" "Tryb [normalny]" -#MSG_SILENT_MODE_ON c=0 r=0 +#MSG_SILENT_MODE_ON "Mode [silent]" "Tryb [cichy]" @@ -622,15 +622,15 @@ "MMU power fails" "Zaniki zasil. MMU" -#MSG_STEALTH_MODE_ON c=0 r=0 +#MSG_STEALTH_MODE_ON "Mode [Stealth]" "Tryb [Stealth]" -#MSG_AUTO_MODE_ON c=0 r=0 +#MSG_AUTO_MODE_ON "Mode [auto power]" "Tryb [automatycz]" -#MSG_SILENT_MODE_OFF c=0 r=0 +#MSG_SILENT_MODE_OFF "Mode [high power]" "Tryb[wysoka wyd.]" @@ -638,31 +638,31 @@ "MMU2 connected" "MMU podlaczone" -#MSG_SELFTEST_MOTOR c=0 r=0 +#MSG_SELFTEST_MOTOR "Motor" "Silnik" -#MSG_MOVE_AXIS c=0 r=0 +#MSG_MOVE_AXIS "Move axis" "Ruch osi" -#MSG_MOVE_X c=0 r=0 +#MSG_MOVE_X "Move X" "Ruch osi X" -#MSG_MOVE_Y c=0 r=0 +#MSG_MOVE_Y "Move Y" "Ruch osi Y" -#MSG_MOVE_Z c=0 r=0 +#MSG_MOVE_Z "Move Z" "Ruch osi Z" -#MSG_NO_MOVE c=0 r=0 +#MSG_NO_MOVE "No move." "Brak ruchu." -#MSG_NO_CARD c=0 r=0 +#MSG_NO_CARD "No SD card" "Brak karty SD" @@ -670,11 +670,11 @@ "N/A" "N/D" -#MSG_NO c=0 r=0 +#MSG_NO "No" "Nie" -#MSG_SELFTEST_NOTCONNECTED c=0 r=0 +#MSG_SELFTEST_NOTCONNECTED "Not connected" "Nie podlaczono " @@ -682,7 +682,7 @@ "New firmware version available:" "Dostepna nowa wersja firmware:" -#MSG_SELFTEST_FAN_NO c=19 r=0 +#MSG_SELFTEST_FAN_NO c=19 "Not spinning" "Nie kreci sie" @@ -694,7 +694,7 @@ "Now I will preheat nozzle for PLA." "Nagrzewam dysze dla PLA." -#MSG_NOZZLE c=0 r=0 +#MSG_NOZZLE "Nozzle" "Dysza" @@ -710,7 +710,7 @@ "Nozzle FAN" "Went. hotendu" -#MSG_PAUSE_PRINT c=0 r=0 +#MSG_PAUSE_PRINT "Pause print" "Wstrzymanie wydruku" @@ -742,7 +742,7 @@ "Please clean the nozzle for calibration. Click when done." "Dla prawidl. kalibracji nalezy oczyscic dysze. Potw. guzikiem." -#MSG_SELFTEST_PLEASECHECK c=0 r=0 +#MSG_SELFTEST_PLEASECHECK "Please check :" "Sprawdz :" @@ -794,7 +794,7 @@ "Please update firmware in your MMU2. Waiting for reset." "Prosze zaktualizowac Firmware MMU2. Czekam na reset." -#MSG_PLEASE_WAIT c=20 r=0 +#MSG_PLEASE_WAIT c=20 "Please wait" "Prosze czekac" @@ -802,11 +802,11 @@ "Please remove shipping helpers first." "Najpierw usun zabezpieczenia transportowe" -#MSG_PREHEAT_NOZZLE c=20 r=0 +#MSG_PREHEAT_NOZZLE c=20 "Preheat the nozzle!" "Nagrzej dysze!" -#MSG_PREHEAT c=0 r=0 +#MSG_PREHEAT "Preheat" "Grzanie" @@ -826,7 +826,7 @@ "Power failures" "Zaniki zasilania" -#MSG_PRINT_ABORTED c=20 r=0 +#MSG_PRINT_ABORTED c=20 "Print aborted" "Druk przerwany" @@ -838,11 +838,11 @@ "Preheating to unload" "Nagrzew. do rozlad." -#MSG_SELFTEST_PRINT_FAN_SPEED c=18 r=0 +#MSG_SELFTEST_PRINT_FAN_SPEED c=18 "Print fan:" "Went. wydruku:" -#MSG_CARD_MENU c=0 r=0 +#MSG_CARD_MENU "Print from SD" "Druk z karty SD" @@ -866,7 +866,7 @@ "Print FAN" "Went. wydruku" -#MSG_PRUSA3D c=0 r=0 +#MSG_PRUSA3D "prusa3d.com" "\x00" @@ -886,15 +886,15 @@ "Prusa i3 MK3S OK." "Prusa i3 MK3S OK" -#MSG_CALIBRATE_BED_RESET c=0 r=0 +#MSG_CALIBRATE_BED_RESET "Reset XYZ calibr." "Reset kalibr. XYZ" -#MSG_BED_CORRECTION_RESET c=0 r=0 +#MSG_BED_CORRECTION_RESET "Reset" "\x00" -#MSG_RESUME_PRINT c=0 r=0 +#MSG_RESUME_PRINT "Resume print" "Wznowic wydruk" @@ -930,31 +930,31 @@ "Right" "Prawa" -#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0 +#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 "Searching bed calibration point" "Szukam punktu kalibracyjnego na stole" -#MSG_LANGUAGE_SELECT c=0 r=0 +#MSG_LANGUAGE_SELECT "Select language" "Wybor jezyka" -#MSG_SELFTEST_OK c=0 r=0 +#MSG_SELFTEST_OK "Self test OK" "Selftest OK" -#MSG_SELFTEST_START c=20 r=0 +#MSG_SELFTEST_START c=20 "Self test start " "Rozpoczynanie Selftestu" -#MSG_SELFTEST c=0 r=0 +#MSG_SELFTEST "Selftest " "Selftest " -#MSG_SELFTEST_ERROR c=0 r=0 +#MSG_SELFTEST_ERROR "Selftest error !" "Blad selftest !" -#MSG_SELFTEST_FAILED c=20 r=0 +#MSG_SELFTEST_FAILED c=20 "Selftest failed " "Selftest nieudany" @@ -974,7 +974,7 @@ "Set temperature:" "Ustaw. temperatury:" -#MSG_SETTINGS c=0 r=0 +#MSG_SETTINGS "Settings" "Ustawienia" @@ -1034,11 +1034,11 @@ "Sound [silent]" "Dzwiek [Cichy]" -#MSG_SPEED c=0 r=0 +#MSG_SPEED "Speed" "Predkosc" -#MSG_SELFTEST_FAN_YES c=19 r=0 +#MSG_SELFTEST_FAN_YES c=19 "Spinning" "Kreci sie" @@ -1046,23 +1046,23 @@ "Stable ambient temperature 21-26C is needed a rigid stand is required." "Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze." -#MSG_STATISTICS c=0 r=0 +#MSG_STATISTICS "Statistics " "Statystyki" -#MSG_STOP_PRINT c=0 r=0 +#MSG_STOP_PRINT "Stop print" "Zatrzymac druk" -#MSG_STOPPED c=0 r=0 +#MSG_STOPPED "STOPPED. " "ZATRZYMANO." -#MSG_SUPPORT c=0 r=0 +#MSG_SUPPORT "Support" "Wsparcie" -#MSG_SELFTEST_SWAPPED c=0 r=0 +#MSG_SELFTEST_SWAPPED "Swapped" "Zamieniono" @@ -1090,7 +1090,7 @@ "Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal." "Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp." -#MSG_TEMPERATURE c=0 r=0 +#MSG_TEMPERATURE "Temperature" "Temperatura" @@ -1110,7 +1110,7 @@ "Total print time" "Calkowity czas druku" -#MSG_TUNE c=0 r=0 +#MSG_TUNE "Tune" "Strojenie" @@ -1130,7 +1130,7 @@ "to unload filament" "aby rozlad. filament" -#MSG_UNLOAD_FILAMENT c=17 r=0 +#MSG_UNLOAD_FILAMENT c=17 "Unload filament" "Rozladowanie fil." @@ -1154,7 +1154,7 @@ "unknown" "nieznane" -#MSG_USERWAIT c=0 r=0 +#MSG_USERWAIT "Wait for user..." "Czekam na uzytkownika..." @@ -1186,7 +1186,7 @@ "Was filament unload successful?" "Rozladowanie fil. ok?" -#MSG_SELFTEST_WIRINGERROR c=0 r=0 +#MSG_SELFTEST_WIRINGERROR "Wiring error" "Blad polaczenia" @@ -1202,7 +1202,7 @@ "XYZ calibration failed. Please consult the manual." "Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji." -#MSG_YES c=0 r=0 +#MSG_YES "Yes" "Tak" @@ -1234,11 +1234,11 @@ "XYZ calibration compromised. Right front calibration point not reachable." "Kalibracja XYZ niedokladna. Prawy przedni punkt nieosiagalny." -#MSG_LOAD_ALL c=17 r=0 +#MSG_LOAD_ALL c=17 "Load all" "Zalad. wszystkie" -#MSG_LOAD_FILAMENT_1 c=17 r=0 +#MSG_LOAD_FILAMENT_1 c=17 "Load filament 1" "Zaladuj fil. 1" @@ -1250,7 +1250,7 @@ "XYZ calibration failed. Front calibration points not reachable." "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." -#MSG_LOAD_FILAMENT_2 c=17 r=0 +#MSG_LOAD_FILAMENT_2 c=17 "Load filament 2" "Zaladuj fil. 2" @@ -1258,7 +1258,7 @@ "XYZ calibration failed. Right front calibration point not reachable." "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." -#MSG_LOAD_FILAMENT_3 c=17 r=0 +#MSG_LOAD_FILAMENT_3 c=17 "Load filament 3" "Zaladuj fil. 3" @@ -1270,14 +1270,14 @@ "Y-correct" "Korekcja Y" -#MSG_LOAD_FILAMENT_4 c=17 r=0 +#MSG_LOAD_FILAMENT_4 c=17 "Load filament 4" "Zaladuj fil. 4" -#MSG_LOAD_FILAMENT_5 c=17 r=0 +#MSG_LOAD_FILAMENT_5 c=17 "Load filament 5" "Laduj filament 5" -#MSG_OFF c=0 r=0 +#MSG_OFF " [off]" "\x00" From 0ba2f3921679d021a075246b036b98c27f18b353 Mon Sep 17 00:00:00 2001 From: Ondrej Tuma Date: Tue, 7 May 2019 12:57:31 +0200 Subject: [PATCH 20/39] Check translation dictionary files to display definition --- lang/lang-build.sh | 2 ++ lang/lang-check.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 lang/lang-check.py diff --git a/lang/lang-build.sh b/lang/lang-build.sh index c8ad6ff4..e528ff94 100755 --- a/lang/lang-build.sh +++ b/lang/lang-build.sh @@ -81,6 +81,8 @@ generate_binary() rm -f lang_$1.tmp rm -f lang_$1.dat LNG=$1 + #check lang dictionary + /usr/bin/env python lang-check.py $1 #create lang_xx.tmp - different processing for 'en' language if [ "$1" = "en" ]; then #remove comments and empty lines diff --git a/lang/lang-check.py b/lang/lang-check.py new file mode 100644 index 00000000..6b918df8 --- /dev/null +++ b/lang/lang-check.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python3 +"""Check lang files.""" +from argparse import ArgumentParser +from traceback import print_exc +from sys import stderr + + +def parse_txt(lang, no_warning): + """Parse txt file and check strings to display definition.""" + if lang == "en": + file_path = "lang_en.txt" + else: + file_path = "lang_en_%s.txt" % lang + + lines = 1 + with open(file_path) as src: + while True: + comment = src.readline().split(' ') + src.readline() # source + translation = src.readline()[:-1] + + cols = None + rows = None + for item in comment[1:]: + key, val = item.split('=') + if key == 'c': + cols = int(val) + elif key == 'r': + rows = int(val) + else: + raise RuntimeError( + "Unknown display definition %s on line %d" % + (' '.join(comment), lines)) + if cols is None and rows is None: + if not no_warning: + print("[W]: No display definition on line %d" % lines) + cols = len(translation) # propably fullscreen + if rows is None: + rows = 1 + + if len(translation) > cols*rows: + stderr.write( + "[E]: Text %s is longer then definiton on line %d\n" % + (translation, lines)) + stderr.flush() + + if len(src.readline()) != 1: # empty line + break + lines += 4 + + +def main(): + """Main function.""" + parser = ArgumentParser( + description=__doc__, + usage="$(prog)s lang") + parser.add_argument( + "lang", nargs='?', default="en", type=str, + help="Check lang file (en|cs|de|es|fr|it)") + parser.add_argument( + "--no-warning", action="store_true", + help="Disable warnings") + + args = parser.parse_args() + try: + parse_txt(args.lang, args.no_warning) + return 0 + except Exception as exc: + print_exc() + parser.error("%s" % exc) + return 1 + + +if __name__ == "__main__": + exit(main()) From 85806a0f38d266932ff885b96e55f8636f4190f4 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 7 May 2019 15:35:34 +0200 Subject: [PATCH 21/39] variable bed pwm frequency fix (input value is 7bit, not 8bit) --- Firmware/Configuration.h | 2 +- Firmware/temperature.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index faf71f2d..3cc7994a 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -481,7 +481,7 @@ your extruder heater takes 2 minutes to hit the target on heating. #define FAN_SOFT_PWM_BITS 4 //PWM bit resolution = 4bits, freq = 62.5Hz // Bed soft pwm -#define HEATER_BED_SOFT_PWM_BITS 5 //PWM bit resolution = 5bits, freq = 32Hz +#define HEATER_BED_SOFT_PWM_BITS 5 //PWM bit resolution = 5bits, freq = 31.25Hz // Incrementing this by 1 will double the software PWM frequency, // affecting heaters, and the fan if FAN_SOFT_PWM is enabled. diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index ca885f44..ef15c66b 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1697,7 +1697,7 @@ ISR(TIMER0_COMPB_vect) #if defined(HEATER_BED_PIN) && HEATER_BED_PIN > -1 if ((pwm_count & ((1 << HEATER_BED_SOFT_PWM_BITS) - 1)) == 0) { - soft_pwm_b = soft_pwm_bed / (1 << (8 - HEATER_BED_SOFT_PWM_BITS)); + soft_pwm_b = soft_pwm_bed >> (7 - HEATER_BED_SOFT_PWM_BITS); #ifndef SYSTEM_TIMER_2 if(soft_pwm_b > 0) WRITE(HEATER_BED_PIN,1); else WRITE(HEATER_BED_PIN,0); #endif //SYSTEM_TIMER_2 From 0124fbf9ee2a703bbd50b68e2fe0aab4c4c0ff1c Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 7 May 2019 16:15:42 +0200 Subject: [PATCH 22/39] Fix: display target extruder temperature on the main screen when doing PID calibration --- Firmware/temperature.cpp | 2 ++ Firmware/ultralcd.cpp | 2 ++ 2 files changed, 4 insertions(+) mode change 100644 => 100755 Firmware/temperature.cpp diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp old mode 100644 new mode 100755 index 45256bf4..bf99b526 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -264,11 +264,13 @@ static void temp_runaway_stop(bool isPreheat, bool isBed); 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 } else { soft_pwm[extruder] = (PID_MAX)/2; bias = d = (PID_MAX)/2; + target_temperature[extruder] = (int)temp; // to display the requested target extruder temperature properly on the main screen } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d099d922..4754bc27 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1765,6 +1765,7 @@ void lcd_commands() if (lcd_commands_step == 3 && !blocks_queued()) { //PID calibration strcpy(cmd1, "M303 E0 S"); strcat(cmd1, ftostr3(pid_temp)); + // setting the correct target temperature (for visualization) is done in PID_autotune enquecommand(cmd1); lcd_setstatuspgm(_i("PID cal. "));////MSG_PID_RUNNING c=20 r=1 lcd_commands_step = 2; @@ -1773,6 +1774,7 @@ void lcd_commands() pid_tuning_finished = false; custom_message_state = 0; lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20 r=1 + setTargetHotend(0, 0); // reset the target hotend temperature including the number displayed on the main screen if (_Kp != 0 || _Ki != 0 || _Kd != 0) { strcpy(cmd1, "M301 P"); strcat(cmd1, ftostr32(_Kp)); From e7dd5c60d33c6179f892e4e2b9568e23ef4b2ce7 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Tue, 7 May 2019 18:10:44 +0200 Subject: [PATCH 23/39] check if firmware is on right type of printer --- Firmware/Marlin_main.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e23ca37e..1da02c50 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -865,6 +865,25 @@ void show_fw_version_warnings() { lcd_update_enable(true); } +//try to check if firmware is on right type of printer +void check_if_fw_is_on_right_printer(){ + #ifdef FILAMENT_SENSOR + swi2c_init(); + uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); + uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor + + #ifdef IR_SENSOR + if (pat9125_detected){ + lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));} + #endif + + #ifdef PAT9125 + if (ir_detected){ + lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));} + #endif + #endif +} + uint8_t check_printer_version() { uint8_t version_changed = 0; @@ -1506,6 +1525,7 @@ void setup() #ifndef DEBUG_DISABLE_STARTMSGS KEEPALIVE_STATE(PAUSED_FOR_USER); + check_if_fw_is_on_right_printer(); show_fw_version_warnings(); switch (hw_changed) { From dc4f30530dc58abdbf318ad6a0b5e30968b857e3 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 9 May 2019 13:44:35 +0200 Subject: [PATCH 24/39] Fix a number overflow to last line of LCD when doing large extruder in menu Settings -> Move axis -> Extruder --- Firmware/menu.cpp | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index a0743838..6467cb41 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -270,7 +270,7 @@ const char menu_20x_space[] PROGMEM = " "; const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; -const char menu_fmt_float31[] PROGMEM = "%c%.12S:%s%+06.1f"; +const char menu_fmt_float31[] PROGMEM = "%-12.12s%+8.1f"; const char menu_fmt_float13[] PROGMEM = "%c%.12S:%s%+06.3f"; @@ -312,15 +312,28 @@ void menu_draw_P(char chr, const char* str, int16_t val) } } -//draw up to 12 chars of text, ':' and float number in format +123.0 +//! Draw up to 10 chars of text, ':' and 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. +//! @param chr first character to print on the line +//! @param str string label to print, will be appended with ':' automatically inside the function +//! @param val value to print aligned to the right side of the display +//! +//! Implementation comments: +//! The text needs to be prerendered into the prerendered[] to enable left alignment of text str including the colon behind it. +//! If we didn't want the colon behind it, the whole operation would have been solved with a single vsprintf call, +//! but such line would look different compared to every other similar menu item +//! So it is almost the same amount of code like before, but with added string prerendering void menu_draw_float31(char chr, const char* str, float val) { - int text_len = strlen_P(str); - if (text_len > 12) text_len = 12; - char spaces[21]; - strcpy_P(spaces, menu_20x_space); - spaces[12 - text_len] = 0; - lcd_printf_P(menu_fmt_float31, chr, str, spaces, val); + uint8_t txtlen = strlen_P(str); + if( txtlen > 10 )txtlen = 10; + char prerendered[21]; + strcpy_P(prerendered, menu_20x_space); + prerendered[0] = chr; // start with the initial byte/space for menu navigation + strncpy_P(prerendered+1, str, 10); // render the text and limit it to max 10 characters + prerendered[txtlen+1] = ':'; // put the colon behind it + prerendered[txtlen+2] = 0; // terminate the string to be used inside the printf + lcd_printf_P(menu_fmt_float31, prerendered, val); } //draw up to 12 chars of text, ':' and float number in format +1.234 From 5707d4b85cc9476e13eae3c652a3f7219f88983f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 10 May 2019 15:27:25 +0200 Subject: [PATCH 25/39] Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 3bdf5459..24c82023 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1774,7 +1774,7 @@ void lcd_commands() pid_tuning_finished = false; custom_message_state = 0; lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20 r=1 - setTargetHotend(0, 0); // reset the target hotend temperature including the number displayed on the main screen + setAllTargetHotends(0); // reset all hotends temperature including the number displayed on the main screen if (_Kp != 0 || _Ki != 0 || _Kd != 0) { strcpy(cmd1, "M301 P"); strcat(cmd1, ftostr32(_Kp)); From a9d6ae296bf50c9eaec4f1809b54cca879751d73 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 10 May 2019 16:30:08 +0200 Subject: [PATCH 26/39] Enable watchdog for all variants. --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 +++ Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 ++ Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 3 +++ Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 3 +++ 4 files changed, 11 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 3b9f7698..7021d107 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -97,6 +97,9 @@ AXIS SETTINGS // New XYZ calibration //#define NEW_XYZCAL +// Watchdog support +#define WATCHDOG + /*------------------------------------ EXTRUDER SETTINGS diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 2d00929f..b7a66903 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -97,6 +97,8 @@ AXIS SETTINGS // New XYZ calibration //#define NEW_XYZCAL +// Watchdog support +#define WATCHDOG /*------------------------------------ EXTRUDER SETTINGS diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index a1822970..a0f53fad 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -103,6 +103,9 @@ // New XYZ calibration #define NEW_XYZCAL +// Watchdog support +#define WATCHDOG + // Fan check #define FANCHECK diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 92773807..5946bc80 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -104,6 +104,9 @@ // New XYZ calibration #define NEW_XYZCAL +// Watchdog support +#define WATCHDOG + // Fan check #define FANCHECK From e93f043feefc389c9fa8cbd214b51efd79dfdb62 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 13 May 2019 15:09:58 +0200 Subject: [PATCH 27/39] Increase version 3.7.1 final. --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 3cc7994a..bfa44a73 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -7,8 +7,8 @@ #define STR(x) STR_HELPER(x) // Firmware version -#define FW_VERSION "3.7.0" -#define FW_COMMIT_NR 2201 +#define FW_VERSION "3.7.1" +#define FW_COMMIT_NR 2266 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. #define FW_DEV_VERSION FW_VERSION_UNKNOWN From 7c4f66181fa5c7e6277edfd684a333ef256611b0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 15:47:25 +0200 Subject: [PATCH 28/39] Generate menu item texts Load filament and Eject filament during runtime to conserve flash. --- Firmware/menu.cpp | 42 +++++++++++++++++++++++++++++++++++++++--- Firmware/menu.h | 3 +++ Firmware/messages.c | 3 ++- Firmware/messages.h | 1 + Firmware/mmu.cpp | 2 +- Firmware/ultralcd.cpp | 40 ++++++++++++++++------------------------ lang/lang_en.txt | 30 ------------------------------ lang/lang_en_cz.txt | 40 ---------------------------------------- lang/lang_en_de.txt | 39 --------------------------------------- lang/lang_en_es.txt | 40 ---------------------------------------- lang/lang_en_fr.txt | 40 ---------------------------------------- lang/lang_en_it.txt | 40 ---------------------------------------- lang/lang_en_pl.txt | 40 ---------------------------------------- 13 files changed, 62 insertions(+), 298 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 6467cb41..e8404354 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -168,11 +168,19 @@ int menu_draw_item_printf_P(char type_char, const char* format, ...) } */ -static int menu_draw_item_puts_P(char type_char, const char* str) +static void menu_draw_item_puts_P(char type_char, const char* str) { lcd_set_cursor(0, menu_row); - int cnt = lcd_printf_P(PSTR("%c%-18.18S%c"), (lcd_encoder == menu_item)?'>':' ', str, type_char); - return cnt; + lcd_printf_P(PSTR("%c%-18.18S%c"), (lcd_encoder == menu_item)?'>':' ', str, type_char); +} + +static int menu_draw_item_puts_P(char type_char, const char* str, char num) +{ + lcd_set_cursor(0, menu_row); + lcd_printf_P(PSTR("%c%-.16S "), (lcd_encoder == menu_item)?'>':' ', str); + lcd_putc(num); + lcd_set_cursor(19, menu_row); + lcd_putc(type_char); } /* @@ -250,6 +258,34 @@ uint8_t menu_item_function_P(const char* str, menu_func_t func) return 0; } +//! @brief Menu item function taking single parameter +//! +//! Ideal for numbered lists calling functions with number parameter. +//! @param str Item caption +//! @param number aditional character to be added after str, e.g. number +//! @param func pointer to function taking uint8_t with no return value +//! @param fn_par value to be passed to function +//! @retval 0 +//! @retval 1 Item was clicked +uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par) +{ + if (menu_item == menu_line) + { + if (lcd_draw_update) menu_draw_item_puts_P(' ', str, number); + if (menu_clicked && (lcd_encoder == menu_item)) + { + menu_clicked = false; + lcd_consume_click(); + lcd_update_enabled = 0; + if (func) func(fn_par); + lcd_update_enabled = 1; + return menu_item_ret(); + } + } + menu_item++; + return 0; +} + uint8_t menu_item_gcode_P(const char* str, const char* str_gcode) { if (menu_item == menu_line) diff --git a/Firmware/menu.h b/Firmware/menu.h index 667f8675..7ddfe3f2 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -87,6 +87,9 @@ extern uint8_t menu_item_back_P(const char* str); #define MENU_ITEM_FUNCTION_P(str, func) do { if (menu_item_function_P(str, func)) return; } while (0) extern uint8_t menu_item_function_P(const char* str, menu_func_t func); +#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) +extern uint8_t menu_item_function_P(const char* str, char number, void (*func)(uint8_t), uint8_t fn_par); + #define MENU_ITEM_GCODE_P(str, str_gcode) do { if (menu_item_gcode_P(str, str_gcode)) return; } while (0) extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); diff --git a/Firmware/messages.c b/Firmware/messages.c index e4a24ce1..d5a10b48 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -48,8 +48,9 @@ const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20 const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); //// const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1 const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1 -const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////c=17 +const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 +const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16 const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25 r=1 const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); //// const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 752195e9..dd6062be 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -125,6 +125,7 @@ extern const char MSG_ENDSTOP_OPEN[]; extern const char MSG_POWERUP[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ENDSTOP_HIT[]; +extern const char MSG_EJECT_FILAMENT[]; #if defined(__cplusplus) } diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index ef5b021c..79bcb1b4 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1353,7 +1353,7 @@ void mmu_show_warning() void lcd_mmu_load_to_nozzle(uint8_t filament_nr) { -//-// +menu_back(); bFilamentAction=false; // NOT in "mmu_load_to_nozzle_menu()" if (degHotend0() > EXTRUDE_MINTEMP) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a82c347c..8f9e705f 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5923,35 +5923,28 @@ static void fil_load_menu() MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 - MENU_ITEM_FUNCTION_P(_i("Load filament 1"), extr_adj_0);////MSG_LOAD_FILAMENT_1 c=17 - MENU_ITEM_FUNCTION_P(_i("Load filament 2"), extr_adj_1);////MSG_LOAD_FILAMENT_2 c=17 - MENU_ITEM_FUNCTION_P(_i("Load filament 3"), extr_adj_2);////MSG_LOAD_FILAMENT_3 c=17 - MENU_ITEM_FUNCTION_P(_i("Load filament 4"), extr_adj_3);////MSG_LOAD_FILAMENT_4 c=17 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0);////MSG_LOAD_FILAMENT_1 c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1);////MSG_LOAD_FILAMENT_2 c=17 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2);////MSG_LOAD_FILAMENT_3 c=17 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3);////MSG_LOAD_FILAMENT_4 c=17 if (mmu_enabled) - MENU_ITEM_FUNCTION_P(_i("Load filament 5"), extr_adj_4); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); MENU_END(); } -template -static void mmu_load_to_nozzle() -{ - menu_back(); - lcd_mmu_load_to_nozzle(filament); -} - static void mmu_load_to_nozzle_menu() { if(bFilamentAction) { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Load filament 1"), mmu_load_to_nozzle<0>); - MENU_ITEM_FUNCTION_P(_i("Load filament 2"), mmu_load_to_nozzle<1>); - MENU_ITEM_FUNCTION_P(_i("Load filament 3"), mmu_load_to_nozzle<2>); - MENU_ITEM_FUNCTION_P(_i("Load filament 4"), mmu_load_to_nozzle<3>); - MENU_ITEM_FUNCTION_P(_i("Load filament 5"), mmu_load_to_nozzle<4>); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', lcd_mmu_load_to_nozzle, 1); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', lcd_mmu_load_to_nozzle, 2); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4); MENU_END(); } else { @@ -5966,8 +5959,7 @@ else { } } -template -static void mmu_eject_filament() +static void mmu_eject_filament(uint8_t filament) { menu_back(); mmu_eject_filament(filament, true); @@ -5979,11 +5971,11 @@ static void mmu_fil_eject_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Eject filament 1"), mmu_eject_filament<0>); - MENU_ITEM_FUNCTION_P(_i("Eject filament 2"), mmu_eject_filament<1>); - MENU_ITEM_FUNCTION_P(_i("Eject filament 3"), mmu_eject_filament<2>); - MENU_ITEM_FUNCTION_P(_i("Eject filament 4"), mmu_eject_filament<3>); - MENU_ITEM_FUNCTION_P(_i("Eject filament 5"), mmu_eject_filament<4>); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_eject_filament, 0); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '2', mmu_eject_filament, 1); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '3', mmu_eject_filament, 2); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_eject_filament, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_eject_filament, 4); MENU_END(); } else diff --git a/lang/lang_en.txt b/lang/lang_en.txt index dedc258d..3de507cb 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -166,21 +166,6 @@ #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" - # "Eject" @@ -928,35 +913,20 @@ #MSG_LOAD_ALL c=17 "Load all" -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" - # "XYZ calibration failed. Bed calibration point was not found." # "XYZ calibration failed. Front calibration points not reachable." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" - # "XYZ calibration failed. Right front calibration point not reachable." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" - # "Y distance from min" # "Y-correct" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" - #MSG_OFF " [off]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 51d16f56..9db15b02 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -222,26 +222,6 @@ "Eject filament" "Vysunout filament" -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" -"Vysunout filament 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" -"Vysunout filament 2" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" -"Vysunout filament 3" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" -"Vysunout filament 4" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" -"Vysunout filament 5" - # "Eject" "Vysunout" @@ -1238,10 +1218,6 @@ "Load all" "Zavest vse" -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" -"Zavest filament 1" - # "XYZ calibration failed. Bed calibration point was not found." "Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen." @@ -1250,18 +1226,10 @@ "XYZ calibration failed. Front calibration points not reachable." "Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" -"Zavest filament 2" - # "XYZ calibration failed. Right front calibration point not reachable." "Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" -"Zavest filament 3" - # "Y distance from min" "Y vzdalenost od min" @@ -1270,14 +1238,6 @@ "Y-correct" "Korekce Y" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" -"Zavest filament 4" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" -"Zavest filament 5" - #MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 48da055f..66995f4e 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -222,26 +222,6 @@ "Eject filament" "Filamentauswurf" -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" -"Filamentauswurf 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" -"Fil.2 auswerfen" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" -"Fil.3 auswerfen" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" -"Fil.4 auswerfen" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" -"Fil.5 auswerfen" - # "Eject" "Auswurf" @@ -1238,10 +1218,6 @@ "Load all" "Alle laden" -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" -"Filament 1 laden" - # "XYZ calibration failed. Bed calibration point was not found." "XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden." @@ -1250,17 +1226,10 @@ "XYZ calibration failed. Front calibration points not reachable." "XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" -"Filament 2 laden" - # "XYZ calibration failed. Right front calibration point not reachable." "XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" -"Filament 3 laden" # "Y distance from min" @@ -1270,14 +1239,6 @@ "Y-correct" "Y-Korrektur" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" -"Filament 4 laden" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" -"Filament 5 laden" - #MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3d8b17dc..05757313 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -222,26 +222,6 @@ "Eject filament" "Expulsar filamento" -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" -"Expulsar filamento 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" -"Expulsar filamento 2" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" -"Expulsar filamento 3" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" -"Expulsar filamento 4" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" -"Expulsar filamento 5" - # "Eject" "Expulsar" @@ -1238,10 +1218,6 @@ "Load all" "Intr. todos fil." -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" -"Introducir fil. 1" - # "XYZ calibration failed. Bed calibration point was not found." "Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados." @@ -1250,18 +1226,10 @@ "XYZ calibration failed. Front calibration points not reachable." "Calibracion XYZ fallada. Puntos frontales no alcanzables." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" -"Introducir fil. 2" - # "XYZ calibration failed. Right front calibration point not reachable." "Calibracion XYZ fallad. Punto frontal derecho no alcanzable." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" -"Introducir fil. 3" - # "Y distance from min" "Distancia en Y desde el min" @@ -1270,14 +1238,6 @@ "Y-correct" "Y-correcion" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" -"Introducir fil. 4" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" -"Cargar filamento 5" - #MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7e91c029..9dd3d489 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -222,26 +222,6 @@ "Eject filament" "Ejecter le fil." -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" -"Ejecter fil. 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" -"Ejecter fil. 2" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" -"Ejecter fil. 3" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" -"Ejecter fil. 4" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" -"Ejecter fil. 5" - # "Eject" "Ejecter" @@ -1238,10 +1218,6 @@ "Load all" "Tout charger" -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" -"Charger fil. 1" - # "XYZ calibration failed. Bed calibration point was not found." "Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve." @@ -1250,18 +1226,10 @@ "XYZ calibration failed. Front calibration points not reachable." "Echec calibration XYZ. Les points de calibration avant ne sont pas atteignables." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" -"Charger fil. 2" - # "XYZ calibration failed. Right front calibration point not reachable." "Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" -"Charger fil. 3" - # "Y distance from min" "Distance Y du min" @@ -1270,14 +1238,6 @@ "Y-correct" "Correction-Y" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" -"Charger fil. 4" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" -"Charger fil. 5" - #MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 12a12fa9..45bddac7 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -222,26 +222,6 @@ "Eject filament" "Espelli filamento " -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" -"Espelli filamento 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" -"Espellere filamento 2" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" -"Espelli filamento 3" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" -"Espellere filamento 4" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" -"Espelli filamento 5" - # "Eject" "Espellere" @@ -1238,10 +1218,6 @@ "Load all" "Caricare tutti" -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" -"Caricare fil. 1" - # "XYZ calibration failed. Bed calibration point was not found." "Calibrazione XYZ fallita. Il punto di calibrazione sul letto non e' stato trovato." @@ -1250,18 +1226,10 @@ "XYZ calibration failed. Front calibration points not reachable." "Calibrazione XYZ fallita. Punti anteriori non raggiungibili." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" -"Caricare fil. 2" - # "XYZ calibration failed. Right front calibration point not reachable." "Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" -"Carica fil. 3" - # "Y distance from min" "Distanza Y dal min" @@ -1270,14 +1238,6 @@ "Y-correct" "Correzione-Y" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" -"Caricare fil. 4" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" -"Caricare fil. 5" - #MSG_OFF " [off]" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index bdac8819..d0937dd8 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -222,26 +222,6 @@ "Eject filament" "Wysun filament" -#MSG_EJECT_FILAMENT1 c=17 r=1 -"Eject filament 1" -"Wysun filament 1" - -#MSG_EJECT_FILAMENT2 c=17 r=1 -"Eject filament 2" -"Wysun filament 2" - -#MSG_EJECT_FILAMENT3 c=17 r=1 -"Eject filament 3" -"Wysun filament 3" - -#MSG_EJECT_FILAMENT4 c=17 r=1 -"Eject filament 4" -"Wysun filament 4" - -#MSG_EJECT_FILAMENT5 c=17 r=1 -"Eject filament 5" -"Wysun filament 5" - # "Eject" "Wysun" @@ -1238,10 +1218,6 @@ "Load all" "Zalad. wszystkie" -#MSG_LOAD_FILAMENT_1 c=17 -"Load filament 1" -"Zaladuj fil. 1" - # "XYZ calibration failed. Bed calibration point was not found." "Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych." @@ -1250,18 +1226,10 @@ "XYZ calibration failed. Front calibration points not reachable." "Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki." -#MSG_LOAD_FILAMENT_2 c=17 -"Load filament 2" -"Zaladuj fil. 2" - # "XYZ calibration failed. Right front calibration point not reachable." "Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki." -#MSG_LOAD_FILAMENT_3 c=17 -"Load filament 3" -"Zaladuj fil. 3" - # "Y distance from min" "Dystans od 0 w osi Y" @@ -1270,14 +1238,6 @@ "Y-correct" "Korekcja Y" -#MSG_LOAD_FILAMENT_4 c=17 -"Load filament 4" -"Zaladuj fil. 4" - -#MSG_LOAD_FILAMENT_5 c=17 -"Load filament 5" -"Laduj filament 5" - #MSG_OFF " [off]" "\x00" From 6495a8fa5874f4166c505c93e47032275115954b Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 16:10:04 +0200 Subject: [PATCH 29/39] Decrease flash reserved for secondary language. --- Firmware/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index faf4b7b0..a712839b 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -49,7 +49,7 @@ //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2900 // reserved space for secondary language (10496 bytes) +#define LANG_SIZE_RESERVED 0x2800 // reserved space for secondary language (10240 bytes) #endif //_CONFIG_H From 150787efbd7b0f470425521b272efd1bce1d5aca Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 16:25:29 +0200 Subject: [PATCH 30/39] Generate menu item texts Cut filament during runtime to conserve flash. --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/mmu.cpp | 1 + Firmware/ultralcd.cpp | 16 +++++----------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index d5a10b48..53ec20e8 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -51,6 +51,7 @@ const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=20 const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16 +const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); //// Number 1 to 5 is added behind text e.g. "Cut filament 1" c=16 const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25 r=1 const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); //// const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index dd6062be..d74412fc 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -126,6 +126,7 @@ extern const char MSG_POWERUP[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ENDSTOP_HIT[]; extern const char MSG_EJECT_FILAMENT[]; +extern const char MSG_CUT_FILAMENT[]; #if defined(__cplusplus) } diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 79bcb1b4..68e36cbc 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1387,6 +1387,7 @@ bFilamentAction=false; // NOT in "mmu_load_to_nozzle_ #ifdef MMU_HAS_CUTTER void mmu_cut_filament(uint8_t filament_nr) { + menu_back(); bFilamentAction=false; // NOT in "mmu_load_to_nozzle_menu()" if (degHotend0() > EXTRUDE_MINTEMP) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8f9e705f..632a7798 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5992,12 +5992,6 @@ static void mmu_fil_eject_menu() } #ifdef MMU_HAS_CUTTER -template -static void mmu_cut_filament() -{ - menu_back(); - mmu_cut_filament(filament); -} static void mmu_cut_filament_menu() { @@ -6005,11 +5999,11 @@ if(bFilamentAction) { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Cut filament 1"), mmu_cut_filament<0>); - MENU_ITEM_FUNCTION_P(_i("Cut filament 2"), mmu_cut_filament<1>); - MENU_ITEM_FUNCTION_P(_i("Cut filament 3"), mmu_cut_filament<2>); - MENU_ITEM_FUNCTION_P(_i("Cut filament 4"), mmu_cut_filament<3>); - MENU_ITEM_FUNCTION_P(_i("Cut filament 5"), mmu_cut_filament<4>); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 1, mmu_cut_filament, 0); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 2, mmu_cut_filament, 1); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 3, mmu_cut_filament, 2); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 4, mmu_cut_filament, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 5, mmu_cut_filament, 4); MENU_END(); } else { From 4de93ca19ce5afd83f3cd3c0d224d56791338390 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 16:43:33 +0200 Subject: [PATCH 31/39] Fix eject filament menu items numbering. --- Firmware/ultralcd.cpp | 68 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 632a7798..d793c7ee 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5920,43 +5920,43 @@ static void lcd_disable_farm_mode() static void fil_load_menu() { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0);////MSG_LOAD_FILAMENT_1 c=16 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1);////MSG_LOAD_FILAMENT_2 c=17 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2);////MSG_LOAD_FILAMENT_3 c=17 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3);////MSG_LOAD_FILAMENT_4 c=17 - if (mmu_enabled) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); + if (mmu_enabled) + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); - MENU_END(); + MENU_END(); } static void mmu_load_to_nozzle_menu() { if(bFilamentAction) { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', lcd_mmu_load_to_nozzle, 1); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', lcd_mmu_load_to_nozzle, 2); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4); - MENU_END(); + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', lcd_mmu_load_to_nozzle, 1); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', lcd_mmu_load_to_nozzle, 2); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4); + MENU_END(); } else { eFilamentAction=e_FILAMENT_ACTION_mmuLoad; bFilamentFirstRun=false; if(target_temperature[0]>=EXTRUDE_MINTEMP) - { + { bFilamentPreheatState=true; mFilamentItem(target_temperature[0],target_temperature_bed); - } - else mFilamentMenu(); - } + } + else mFilamentMenu(); + } } static void mmu_eject_filament(uint8_t filament) @@ -5997,25 +5997,25 @@ static void mmu_cut_filament_menu() { if(bFilamentAction) { - MENU_BEGIN(); - MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 1, mmu_cut_filament, 0); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 2, mmu_cut_filament, 1); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 3, mmu_cut_filament, 2); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 4, mmu_cut_filament, 3); - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 5, mmu_cut_filament, 4); - MENU_END(); + MENU_BEGIN(); + MENU_ITEM_BACK_P(_T(MSG_MAIN)); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_cut_filament, 0); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '2', mmu_cut_filament, 1); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '3', mmu_cut_filament, 2); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_cut_filament, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_cut_filament, 4); + MENU_END(); } else { - eFilamentAction=e_FILAMENT_ACTION_mmuCut; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) - { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); - } - else mFilamentMenu(); - } + eFilamentAction=e_FILAMENT_ACTION_mmuCut; + bFilamentFirstRun=false; + if(target_temperature[0]>=EXTRUDE_MINTEMP) + { + bFilamentPreheatState=true; + mFilamentItem(target_temperature[0],target_temperature_bed); + } + else mFilamentMenu(); + } } #endif //MMU_HAS_CUTTER From 66d20f0297112066a1eff074d311208d2bf99509 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 16:45:15 +0200 Subject: [PATCH 32/39] Fix code formatting (indentation). --- Firmware/mmu.cpp | 59 ++++++++++++++++++++++--------------------- Firmware/ultralcd.cpp | 53 ++++++++++++++++++++------------------ 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 68e36cbc..78356432 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1353,35 +1353,36 @@ void mmu_show_warning() void lcd_mmu_load_to_nozzle(uint8_t filament_nr) { -menu_back(); -bFilamentAction=false; // NOT in "mmu_load_to_nozzle_menu()" - if (degHotend0() > EXTRUDE_MINTEMP) - { - tmp_extruder = filament_nr; - lcd_update_enable(false); - lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); - lcd_print(" "); - lcd_print(tmp_extruder + 1); - mmu_command(MmuCmd::T0 + tmp_extruder); - manage_response(true, true, MMU_TCODE_MOVE); - mmu_continue_loading(false); - mmu_extruder = tmp_extruder; //filament change is finished - mmu_load_to_nozzle(); - load_filament_final_feed(); - st_synchronize(); - custom_message_type = CUSTOM_MSG_TYPE_F_LOAD; - lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); - lcd_return_to_status(); - lcd_update_enable(true); - lcd_load_filament_color_check(); - lcd_setstatuspgm(_T(WELCOME_MSG)); - custom_message_type = CUSTOM_MSG_TYPE_STATUS; - } - else - { - show_preheat_nozzle_warning(); - } + menu_back(); + bFilamentAction = false; // NOT in "mmu_load_to_nozzle_menu()" + if (degHotend0() > EXTRUDE_MINTEMP) + { + tmp_extruder = filament_nr; + lcd_update_enable(false); + lcd_clear(); + lcd_set_cursor(0, 1); + lcd_puts_P(_T(MSG_LOADING_FILAMENT)); + lcd_print(" "); + lcd_print(tmp_extruder + 1); + mmu_command(MmuCmd::T0 + tmp_extruder); + manage_response(true, true, MMU_TCODE_MOVE); + mmu_continue_loading(false); + mmu_extruder = tmp_extruder; //filament change is finished + mmu_load_to_nozzle(); + load_filament_final_feed(); + st_synchronize(); + custom_message_type = CUSTOM_MSG_TYPE_F_LOAD; + lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); + lcd_return_to_status(); + lcd_update_enable(true); + lcd_load_filament_color_check(); + lcd_setstatuspgm(_T(WELCOME_MSG)); + custom_message_type = CUSTOM_MSG_TYPE_STATUS; + } + else + { + show_preheat_nozzle_warning(); + } } #ifdef MMU_HAS_CUTTER diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d793c7ee..5fc74c38 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5922,22 +5922,23 @@ static void fil_load_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); - MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0);////MSG_LOAD_FILAMENT_1 c=16 - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1);////MSG_LOAD_FILAMENT_2 c=17 - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2);////MSG_LOAD_FILAMENT_3 c=17 - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3);////MSG_LOAD_FILAMENT_4 c=17 + MENU_ITEM_FUNCTION_P(_i("Load all"), load_all); ////MSG_LOAD_ALL c=17 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1); ////MSG_LOAD_FILAMENT_2 c=17 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2); ////MSG_LOAD_FILAMENT_3 c=17 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3); ////MSG_LOAD_FILAMENT_4 c=17 if (mmu_enabled) + { MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); - + } MENU_END(); } static void mmu_load_to_nozzle_menu() { -if(bFilamentAction) -{ + if (bFilamentAction) + { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0); @@ -5946,14 +5947,15 @@ if(bFilamentAction) MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3); MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4); MENU_END(); -} -else { - eFilamentAction=e_FILAMENT_ACTION_mmuLoad; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) + } + else { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); + eFilamentAction = e_FILAMENT_ACTION_mmuLoad; + bFilamentFirstRun = false; + if (target_temperature[0] >= EXTRUDE_MINTEMP) + { + bFilamentPreheatState = true; + mFilamentItem(target_temperature[0], target_temperature_bed); } else mFilamentMenu(); } @@ -5967,7 +5969,7 @@ static void mmu_eject_filament(uint8_t filament) static void mmu_fil_eject_menu() { - if(bFilamentAction) + if (bFilamentAction) { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); @@ -5980,12 +5982,12 @@ static void mmu_fil_eject_menu() } else { - eFilamentAction=e_FILAMENT_ACTION_mmuEject; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) + eFilamentAction = e_FILAMENT_ACTION_mmuEject; + bFilamentFirstRun = false; + if (target_temperature[0] >= EXTRUDE_MINTEMP) { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); + bFilamentPreheatState = true; + mFilamentItem(target_temperature[0], target_temperature_bed); } else mFilamentMenu(); } @@ -5995,8 +5997,8 @@ static void mmu_fil_eject_menu() static void mmu_cut_filament_menu() { -if(bFilamentAction) -{ + if(bFilamentAction) + { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_cut_filament, 0); @@ -6005,8 +6007,9 @@ if(bFilamentAction) MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_cut_filament, 3); MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_cut_filament, 4); MENU_END(); -} -else { + } + else + { eFilamentAction=e_FILAMENT_ACTION_mmuCut; bFilamentFirstRun=false; if(target_temperature[0]>=EXTRUDE_MINTEMP) From ec1a979656ba7780a912a9601529881c57f9bb26 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 18:16:53 +0200 Subject: [PATCH 33/39] Enable compiler warnings. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3f81cd78..12005a24 100755 --- a/build.sh +++ b/build.sh @@ -31,7 +31,7 @@ if [ ! -f "$SCRIPT_PATH/Firmware/Configuration_prusa.h" ]; then cp $SCRIPT_PATH/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8 fi -$BUILD_ENV_PATH/arduino $SCRIPT_PATH/Firmware/Firmware.ino --verify --board rambo:avr:rambo --pref build.path=$BUILD_PATH || exit 9 +$BUILD_ENV_PATH/arduino $SCRIPT_PATH/Firmware/Firmware.ino --verify --board rambo:avr:rambo --pref build.path=$BUILD_PATH --pref compiler.warning_level=all || exit 9 export ARDUINO=$BUILD_ENV_PATH From 89fc9e7f924d8c2a899d4ad876a3bbc48ce3686a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 18:25:43 +0200 Subject: [PATCH 34/39] sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive] #define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0) ^ sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P' MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16 --- Firmware/mmu.cpp | 2 +- Firmware/mmu.h | 2 +- Firmware/ultralcd.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 78356432..0c127996 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -965,7 +965,7 @@ void display_loading() } } -void extr_adj(int extruder) //loading filament for SNMM +void extr_adj(uint8_t extruder) //loading filament for SNMM { #ifndef SNMM MmuCmd cmd = MmuCmd::L0 + extruder; diff --git a/Firmware/mmu.h b/Firmware/mmu.h index a7da0c2d..0f8784ba 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -103,7 +103,7 @@ extern void extr_mov(float shift, float feed_rate); extern void change_extr(int extr); extern int get_ext_nr(); extern void display_loading(); -extern void extr_adj(int extruder); +extern void extr_adj(uint8_t extruder); extern void extr_unload(); //-// extern void extr_unload_(); diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 84988c58..365f1797 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -129,7 +129,6 @@ void lcd_commands(); void change_extr(int extr); -void extr_adj(int extruder); #ifdef SNMM void extr_unload_all(); From acfcd59369cd5a64b06008cadf539e5a40a8cc4c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 18:32:40 +0200 Subject: [PATCH 35/39] Fix compiler warning: sketch/menu.cpp: In function 'int menu_draw_item_puts_P(char, const char*, char)': sketch/menu.cpp:184:1: warning: no return statement in function returning non-void [-Wreturn-type] --- Firmware/menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index e8404354..2534b43a 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -174,7 +174,7 @@ static void menu_draw_item_puts_P(char type_char, const char* str) lcd_printf_P(PSTR("%c%-18.18S%c"), (lcd_encoder == menu_item)?'>':' ', str, type_char); } -static int menu_draw_item_puts_P(char type_char, const char* str, char num) +static void menu_draw_item_puts_P(char type_char, const char* str, char num) { lcd_set_cursor(0, menu_row); lcd_printf_P(PSTR("%c%-.16S "), (lcd_encoder == menu_item)?'>':' ', str); From 91e72a79f0d1112a897741224560488e8278e8bc Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 19:07:50 +0200 Subject: [PATCH 36/39] Fix compiler warning sketch/Marlin_main.cpp:871:13: warning: unused variable 'ir_detected' [-Wunused-variable] --- Firmware/Marlin_main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f2b19067..c6d323a0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -865,23 +865,23 @@ void show_fw_version_warnings() { lcd_update_enable(true); } -//try to check if firmware is on right type of printer -void check_if_fw_is_on_right_printer(){ - #ifdef FILAMENT_SENSOR - swi2c_init(); - uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); - uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor - +//! @brief try to check if firmware is on right type of printer +static void check_if_fw_is_on_right_printer(){ +#ifdef FILAMENT_SENSOR #ifdef IR_SENSOR + swi2c_init(); + const uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); if (pat9125_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));} - #endif + #endif //IR_SENSOR #ifdef PAT9125 + //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor + const uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); if (ir_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));} - #endif - #endif + #endif //PAT9125 +#endif //FILAMENT_SENSOR } uint8_t check_printer_version() From 1a78bd53baf3ab77e63369c3e7f01eaed78102d9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 14 May 2019 19:11:46 +0200 Subject: [PATCH 37/39] Fix compiler warning sketch/Marlin_main.cpp: In function 'void marlin_wait_for_click()': sketch/Marlin_main.cpp:9646:12: warning: unused variable 'busy_state_backup' [-Wunused-variable] --- 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 c6d323a0..4f5a931b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9652,7 +9652,7 @@ void marlin_wait_for_click() manage_inactivity(true); lcd_update(0); } - KEEPALIVE_STATE(busy_state); + KEEPALIVE_STATE(busy_state_backup); } #define FIL_LOAD_LENGTH 60 From c851e158cc5036dd69397f69993e479c3380d432 Mon Sep 17 00:00:00 2001 From: Ondrej Tuma Date: Fri, 10 May 2019 08:52:24 +0200 Subject: [PATCH 38/39] Manual fan check menu have default (selected) option --- Firmware/ultralcd.cpp | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) mode change 100755 => 100644 Firmware/ultralcd.cpp diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp old mode 100755 new mode 100644 index 5fc74c38..f3e87fac --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -202,7 +202,9 @@ enum class TestError : uint_least8_t static int lcd_selftest_screen(testScreen screen, int _progress, int _progress_scale, bool _clear, int _delay); static void lcd_selftest_screen_step(int _row, int _col, int _state, const char *_name, const char *_indicator); -static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite); +static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, + bool _default=false); + #ifdef FANCHECK static bool lcd_selftest_fan_dialog(int _fan); #endif //FANCHECK @@ -6928,7 +6930,7 @@ bool lcd_selftest() lcd_selftest_error(TestError::extruderFan, "", ""); } #endif //defined(TACH_0) - + if (_result) { @@ -7712,19 +7714,20 @@ static bool selftest_irsensor() } #endif //FILAMENT_SENSOR -static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite) +static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, + bool _default) { bool _result = check_opposite; lcd_clear(); lcd_set_cursor(0, 0); lcd_puts_P(_T(MSG_SELFTEST_FAN)); - + switch (_fan) { case 0: // extruder cooling fan - lcd_set_cursor(0, 1); + lcd_set_cursor(0, 1); if(check_opposite == true) lcd_puts_P(_T(MSG_SELFTEST_COOLING_FAN)); else lcd_puts_P(_T(MSG_SELFTEST_EXTRUDER_FAN)); SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN); @@ -7750,10 +7753,11 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite) lcd_set_cursor(0, 3); lcd_print(">"); lcd_set_cursor(1, 3); lcd_puts_P(_T(MSG_SELFTEST_FAN_NO)); - int8_t enc_dif = 0; + int8_t enc_dif = int(_default)*3; + KEEPALIVE_STATE(PAUSED_FOR_USER); - lcd_button_pressed = false; + lcd_button_pressed = false; do { switch (_fan) @@ -7773,7 +7777,6 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite) #endif //FAN_SOFT_PWM break; } - if (abs((enc_dif - lcd_encoder_diff)) > 2) { if (enc_dif > lcd_encoder_diff) { _result = !check_opposite; @@ -7812,7 +7815,6 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite) manage_heater(); return _result; - } #ifdef FANCHECK @@ -7834,7 +7836,6 @@ static bool lcd_selftest_fan_dialog(int _fan) manage_heater(); //count average fan speed from 2s delay and turn off fans if (!fan_speed[0]) _result = false; - printf_P(PSTR("Test 1:\n")); printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]); printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]); @@ -7846,9 +7847,9 @@ static bool lcd_selftest_fan_dialog(int _fan) case 1: //will it work with Thotend > 50 C ? -#ifdef FAN_SOFT_PWM - fanSpeed = 255; - fanSpeedSoftPwm = 255; +#ifdef FAN_SOFT_PWM + fanSpeed = 255; + fanSpeedSoftPwm = 255; extruder_autofan_last_check = _millis(); //store time when measurement starts fan_measuring = true; //start fan measuring, rest is on manage_heater #else //FAN_SOFT_PWM @@ -7884,7 +7885,8 @@ static bool lcd_selftest_fan_dialog(int _fan) //check fans manually _result = lcd_selftest_manual_fan_check(1, true); //turn on print fan and check that left extruder fan is not spinning if (_result) { - _result = lcd_selftest_manual_fan_check(1, false); //print fan is stil turned on; check that it is spinning + //print fan is stil turned on; check that it is spinning + _result = lcd_selftest_manual_fan_check(1, false, true); if (!_result) testError = TestError::printFan; } else { From ebfc8c1c79f15129478bbef1a20621b35456bc24 Mon Sep 17 00:00:00 2001 From: Ondrej Tuma Date: Mon, 13 May 2019 16:25:47 +0200 Subject: [PATCH 39/39] Fan autotest for swapping in Selftest --- Firmware/ultralcd.cpp | 145 +++++++++++++++++++++++++++++------------- 1 file changed, 100 insertions(+), 45 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f3e87fac..205c562d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -206,8 +206,25 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, bool _default=false); #ifdef FANCHECK -static bool lcd_selftest_fan_dialog(int _fan); +/** Enumerate for lcd_selftest_fan_auto function. + */ +enum class FanCheck : uint_least8_t { + success, + printFan = TestError::printFan, + extruderFan = TestError::extruderFan, + swappedFan = TestError::swappedFan, +}; + +/** + * Try to check fan working and wiring. + * + * @param _fan i fan number 0 means extruder fan, 1 means print fan. + * + * @returns a TestError noerror, extruderFan, printFan or swappedFan. + */ +static FanCheck lcd_selftest_fan_auto(int _fan); #endif //FANCHECK + #ifdef PAT9125 static bool lcd_selftest_fsensor(); #endif //PAT9125 @@ -6911,6 +6928,7 @@ bool lcd_selftest() { int _progress = 0; bool _result = true; + bool _swapped_fan = false; lcd_wait_for_cool_down(); lcd_clear(); lcd_set_cursor(0, 0); lcd_puts_P(_i("Self test start "));////MSG_SELFTEST_START c=20 @@ -6922,29 +6940,63 @@ bool lcd_selftest() _progress = lcd_selftest_screen(testScreen::extruderFan, _progress, 3, true, 2000); #if (defined(FANCHECK) && defined(TACH_0)) - _result = lcd_selftest_fan_dialog(0); + switch (lcd_selftest_fan_auto(0)){ // check extruder Fan + case FanCheck::extruderFan: + _result = false; + break; + case FanCheck::swappedFan: + _swapped_fan = true; + // no break + default: + _result = true; + break; + } #else //defined(TACH_0) _result = lcd_selftest_manual_fan_check(0, false); +#endif //defined(TACH_0) if (!_result) { lcd_selftest_error(TestError::extruderFan, "", ""); } -#endif //defined(TACH_0) - if (_result) { _progress = lcd_selftest_screen(testScreen::printFan, _progress, 3, true, 2000); -#if (defined(FANCHECK) && defined(TACH_1)) - _result = lcd_selftest_fan_dialog(1); +#if (defined(FANCHECK) && defined(TACH_1)) + switch (lcd_selftest_fan_auto(1)){ // check print fan + case FanCheck::printFan: + _result = false; + break; + case FanCheck::swappedFan: + _swapped_fan = true; + // no break + default: + _result = true; + break; + } #else //defined(TACH_1) _result = lcd_selftest_manual_fan_check(1, false); +#endif //defined(TACH_1) if (!_result) - { + { lcd_selftest_error(TestError::printFan, "", ""); //print fan not spinning } + } -#endif //defined(TACH_1) + if (_swapped_fan) { + //turn on print fan and check that left extruder fan is not spinning + _result = lcd_selftest_manual_fan_check(1, true); + if (_result) { + //print fan is stil turned on; check that it is spinning + _result = lcd_selftest_manual_fan_check(1, false, true); + if (!_result){ + lcd_selftest_error(TestError::printFan, "", ""); + } + } + else { + // fans are swapped + lcd_selftest_error(TestError::swappedFan, "", ""); + } } if (_result) @@ -7818,10 +7870,8 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite, } #ifdef FANCHECK -static bool lcd_selftest_fan_dialog(int _fan) +static FanCheck lcd_selftest_fan_auto(int _fan) { - bool _result = true; - TestError testError = TestError::extruderFan; switch (_fan) { case 0: fanSpeed = 0; @@ -7834,16 +7884,20 @@ static bool lcd_selftest_fan_dialog(int _fan) _delay(2000); //delay_keep_alive would turn off extruder fan, because temerature is too low manage_heater(); //count average fan speed from 2s delay and turn off fans - if (!fan_speed[0]) _result = false; printf_P(PSTR("Test 1:\n")); printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]); printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]); - //SERIAL_ECHOPGM("Extruder fan speed: "); - //MYSERIAL.println(fan_speed[0]); - //SERIAL_ECHOPGM("Print fan speed: "); - //MYSERIAL.print(fan_speed[1]); + + if (!fan_speed[0]) { + return FanCheck::extruderFan; + } +#ifdef FAN_SOFT_PWM + else if (fan_speed[0] > 50 ) { // printerFan is faster + return FanCheck::swappedFan; + } break; +#endif case 1: //will it work with Thotend > 50 C ? @@ -7863,11 +7917,11 @@ static bool lcd_selftest_fan_dialog(int _fan) lcd_set_cursor(18, 3); lcd_print("|"); } + fanSpeed = 0; + #ifdef FAN_SOFT_PWM - fanSpeed = 0; - fanSpeedSoftPwm = 0; + fanSpeedSoftPwm = 0; #else //FAN_SOFT_PWM - fanSpeed = 0; manage_heater(); //turn off fan manage_inactivity(true); //to turn off print fan #endif //FAN_SOFT_PWM @@ -7875,36 +7929,37 @@ static bool lcd_selftest_fan_dialog(int _fan) printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]); printf_P(PSTR("Extr fan speed: %d \n"), fan_speed[0]); if (!fan_speed[1]) { - _result = false; testError = TestError::printFan; - } -#ifdef FAN_SOFT_PWM - else { -#else //FAN_SOFT_PWM - else if (fan_speed[1] < 34) { //fan is spinning, but measured RPM are too low for print fan, it must be left extruder fan -#endif //FAN_SOFT_PWM - //check fans manually - _result = lcd_selftest_manual_fan_check(1, true); //turn on print fan and check that left extruder fan is not spinning - if (_result) { - //print fan is stil turned on; check that it is spinning - _result = lcd_selftest_manual_fan_check(1, false, true); - if (!_result) testError = TestError::printFan; - } - else { - testError = TestError::swappedFan; - } + return FanCheck::printFan; } - //SERIAL_ECHOPGM("Extruder fan speed: "); - //MYSERIAL.println(fan_speed[0]); - //SERIAL_ECHOPGM("Print fan speed: "); - //MYSERIAL.println(fan_speed[1]); +#ifdef FAN_SOFT_PWM + fanSpeed = 80; + fanSpeedSoftPwm = 80; + + for (uint8_t i = 0; i < 5; i++) { + delay_keep_alive(1000); + lcd_set_cursor(18, 3); + lcd_print("-"); + delay_keep_alive(1000); + lcd_set_cursor(18, 3); + lcd_print("|"); + } + fanSpeed = 0; + + // noctua speed is between 17 and 24, turbine more then 30 + if (fan_speed[1] < 30) { + return FanCheck::swappedFan; + } +#else + // fan is spinning, but measured RPM are too low for print fan, it must + // be left extruder fan + else if (fan_speed[1] < 34) { + return FanCheck::swappedFan; + } +#endif //FAN_SOFT_PWM break; } - if (!_result) - { - lcd_selftest_error(testError, "", ""); - } - return _result; + return FanCheck::success; } #endif //FANCHECK