From 3f96dea4f96f52021f81e72d8243c9f211cc2d36 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Mon, 10 Dec 2018 07:09:03 -0700 Subject: [PATCH 001/168] 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 002/168] 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 e27fdafcec987f872b3cb63dfde484ae912514c2 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Feb 2019 19:42:09 +0100 Subject: [PATCH 003/168] menu switch - initial --- .gitignore | 1 + Firmware/Marlin_main.cpp | 2 +- Firmware/eeprom.h | 5 +++-- Firmware/mesh_bed_calibration.cpp | 17 +++++++++++++++++ Firmware/mesh_bed_calibration.h | 9 +++++++++ Firmware/ultralcd.cpp | 24 ++++++++++++++++++++++++ 6 files changed, 55 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7bae2ff6..bbd9b9ac 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ Firmware/Doc /lang/textaddr.txt /build-env/ /Firmware/Firmware.vcxproj +/Firmware/Configuration_prusa_bckp.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a89aac74..c89ac3ef 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1472,7 +1472,7 @@ void setup() if (eeprom_read_byte((uint8_t*)EEPROM_SD_SORT) == 255) { eeprom_write_byte((uint8_t*)EEPROM_SD_SORT, 0); } - + mbl_mode_init(); check_babystep(); //checking if Z babystep is in allowed range #ifdef UVLO_SUPPORT diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index eb99e5bc..907f8878 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -154,8 +154,9 @@ #define EEPROM_MMU_LOAD_FAIL_TOT (EEPROM_MMU_FAIL - 2) //uint16_t #define EEPROM_MMU_LOAD_FAIL (EEPROM_MMU_LOAD_FAIL_TOT - 1) //uint8_t -#define EEPROM_UVLO_MESH_BED_LEVELING_FULL (EEPROM_MMU_LOAD_FAIL - 1000 - 12*12*2) //allow 12 calibration points for future expansion -//-1000 is to be compatible with future updates from prusa if it not merged, real value is 2503 so there is space +#define EEPROM_UVLO_MESH_BED_LEVELING_FULL (EEPROM_MMU_LOAD_FAIL - 12*12*2) //allow 12 calibration points for future expansion +#define EEPROM_MBL_TYPE (EEPROM_UVLO_MESH_BED_LEVELING_FULL-1) //uint8_t for mesh bed leveling precision + // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 0f56d999..1ab22c4f 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3048,3 +3048,20 @@ void count_xyz_details(float (&distanceMin)[2]) { } } +e_MBL_TYPE e_mbl_type = e_MBL_OPTIMAL; + +void mbl_mode_set() { + switch (e_mbl_type) { + case e_MBL_OPTIMAL: e_mbl_type = e_MBL_PREC; break; + case e_MBL_PREC: e_mbl_type = e_MBL_FAST; break; + case e_MBL_FAST: e_mbl_type = e_MBL_OPTIMAL; break; + default: e_mbl_type = e_MBL_OPTIMAL; break; + } + eeprom_update_byte((uint8_t*)EEPROM_MBL_TYPE,(uint8_t)e_mbl_type); +} + +void mbl_mode_init() { + uint8_t mbl_type = eeprom_read_byte((uint8_t*)EEPROM_MBL_TYPE); + if (mbl_type == 0xFF) e_mbl_type = e_MBL_OPTIMAL; + else e_mbl_type = mbl_type; +} \ No newline at end of file diff --git a/Firmware/mesh_bed_calibration.h b/Firmware/mesh_bed_calibration.h index 4990d104..9c7f4545 100644 --- a/Firmware/mesh_bed_calibration.h +++ b/Firmware/mesh_bed_calibration.h @@ -201,4 +201,13 @@ extern void babystep_reset(); extern void count_xyz_details(float (&distanceMin)[2]); extern bool sample_z(); +typedef enum +{ + e_MBL_FAST, e_MBL_OPTIMAL, e_MBL_PREC +} e_MBL_TYPE; + +extern e_MBL_TYPE e_mbl_type; +extern void mbl_mode_set(); +extern void mbl_mode_init(); + #endif /* MESH_BED_CALIBRATION_H */ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5a04796f..37fd4746 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5265,6 +5265,28 @@ do\ while (0) #endif // SDCARD_SORT_ALPHA +#define SETTINGS_MBL_MODE \ +do\ +{\ + switch(e_mbl_type)\ + {\ + case e_MBL_FAST:\ + MENU_ITEM_FUNCTION_P(_i("MBL mode [Fast]"),mbl_mode_set);\ + break; \ + case e_MBL_OPTIMAL:\ + MENU_ITEM_FUNCTION_P(_i("MBL mode [Optimal]"), mbl_mode_set); \ + break; \ + case e_MBL_PREC:\ + MENU_ITEM_FUNCTION_P(_i("MBL mode [Precise]"), mbl_mode_set); \ + break; \ + default:\ + MENU_ITEM_FUNCTION_P(_i("MBL mode [Optimal]"), mbl_mode_set); \ + break; \ + }\ +}\ +while (0) + + #define SETTINGS_SOUND \ do\ {\ @@ -5311,6 +5333,8 @@ static void lcd_settings_menu() SETTINGS_SILENT_MODE; + SETTINGS_MBL_MODE; + #if defined (TMC2130) && defined (LINEARITY_CORRECTION) MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); #endif //LINEARITY_CORRECTION && TMC2130 From 17f095b9572990964ce096c318b0b5d5b9b34560 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 4 Mar 2019 20:32:56 +0100 Subject: [PATCH 004/168] shorter Z movements (makes calibration faster) --- Firmware/Marlin_main.cpp | 20 ++++++++++++++++---- Firmware/mesh_bed_calibration.cpp | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c89ac3ef..d6524121 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4487,7 +4487,8 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } // Move Z up to MESH_HOME_Z_SEARCH. - current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; + if((ix == 0) && (iy == 0)) current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; + else current_position[Z_AXIS] += 2.f / nMeasPoints; //use relative movement from Z coordinate where PINDa triggered on previous point. This makes calibration faster. plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); @@ -4515,9 +4516,20 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) kill_message = _T(MSG_BED_LEVELING_FAILED_POINT_LOW); break; } - if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { - kill_message = _i("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.");////MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 - break; + if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases. + + current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + st_synchronize(); + + if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point + kill_message = _T(MSG_BED_LEVELING_FAILED_POINT_LOW); + break; + } + if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { + kill_message = _i("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.");////MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 + break; + } } if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point kill_message = _i("Bed leveling failed. Sensor triggered too high. Waiting for reset.");////MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 1ab22c4f..c05c868f 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -936,6 +936,7 @@ static inline void update_current_position_z() } // At the current position, find the Z stop. + inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, int #ifdef SUPPORT_VERBOSITY verbosity_level From d9e93e8a77bea4adf39e963d603d45a28fbe8781 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 5 Mar 2019 20:40:08 +0100 Subject: [PATCH 005/168] measurements points moved 10mm to the left; measure only chosen points (e.g. not points affected by magnets proximity) --- Firmware/Marlin_main.cpp | 8 +++++++- Firmware/mesh_bed_calibration.cpp | 24 ++++++++++++++++++++++++ Firmware/mesh_bed_calibration.h | 6 ++++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d6524121..4b089fed 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4467,6 +4467,12 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) // Get coords of a measuring point. uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1 uint8_t iy = mesh_point / nMeasPoints; + if (!mbl_point_measurement_valid(ix, iy, nMeasPoints)) { + printf_P(PSTR("Skipping point [%d;%d] \n"), ix, iy); + custom_message_state--; + mesh_point++; + continue; //skip + } if (iy & 1) ix = (nMeasPoints - 1) - ix; // Zig zag float z0 = 0.f; if (has_z && (mesh_point > 0)) { @@ -4686,7 +4692,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } // SERIAL_ECHOLNPGM("Bed leveling correction finished"); if (nMeasPoints == 3) { - mbl.upsample_3x3(); //bilinear interpolation from 3x3 to 7x7 points while using the same array z_values[iy][ix] for storing (just coppying measured data to new destination and interpolating between them) + mbl.upsample_3x3(); //interpolation from 3x3 to 7x7 points using largrangian polynomials while using the same array z_values[iy][ix] for storing (just coppying measured data to new destination and interpolating between them) } // SERIAL_ECHOLNPGM("Upsample finished"); mbl.active = 1; //activate mesh bed leveling diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index c05c868f..85ed0554 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3065,4 +3065,28 @@ void mbl_mode_init() { uint8_t mbl_type = eeprom_read_byte((uint8_t*)EEPROM_MBL_TYPE); if (mbl_type == 0xFF) e_mbl_type = e_MBL_OPTIMAL; else e_mbl_type = mbl_type; +} + +bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points) { + //"human readable" heatbed plan + //magnet proximity influence Z coordinate measurements significantly (40 - 100 um) + //0 - measurement point is above magnet and Z coordinate can be influenced negatively + //1 - we should be in safe distance from magnets, measurement should be accurate + uint8_t valid_points_mask[7] = { + //[X_MAX,Y_MAX] + 0b1111101, + 0b1110111, + 0b1111111, + 0b0111011, + 0b1110111, + 0b1111111, + 0b1110111, + //[0,0] + }; + if (meas_points == 3) { + ix *= 3; + iy *= 3; + } + if((iy%2) == 0) return (valid_points_mask[6 - iy] & (1 << (6 - ix))); + else return (valid_points_mask[6 - iy] & (1 << ix)); } \ No newline at end of file diff --git a/Firmware/mesh_bed_calibration.h b/Firmware/mesh_bed_calibration.h index 9c7f4545..0d577271 100644 --- a/Firmware/mesh_bed_calibration.h +++ b/Firmware/mesh_bed_calibration.h @@ -6,9 +6,9 @@ #ifdef HEATBED_V2 -#define BED_X0 (13.f - BED_ZERO_REF_X) +#define BED_X0 (3.f - BED_ZERO_REF_X) #define BED_Y0 (10.4f - BED_ZERO_REF_Y) -#define BED_Xn (216.f - BED_ZERO_REF_X) +#define BED_Xn (206.f - BED_ZERO_REF_X) #define BED_Yn (202.4f - BED_ZERO_REF_Y) #else @@ -210,4 +210,6 @@ extern e_MBL_TYPE e_mbl_type; extern void mbl_mode_set(); extern void mbl_mode_init(); +extern bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points); + #endif /* MESH_BED_CALIBRATION_H */ From 7c187541e14f90ca54eded535c1bd379a360645d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 5 Mar 2019 22:36:30 +0100 Subject: [PATCH 006/168] function for valid points determination improved; simple Z-coordinate estimation; measure all points and use inaccurate Z-coordinate in case that we don't have enought information for counting Z-coordinate estimation --- Firmware/Marlin_main.cpp | 7 +++++-- Firmware/mesh_bed_calibration.cpp | 24 +++++++++++++++++++++++- Firmware/mesh_bed_calibration.h | 4 ++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4b089fed..ceefa39d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4467,12 +4467,12 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) // Get coords of a measuring point. uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1 uint8_t iy = mesh_point / nMeasPoints; - if (!mbl_point_measurement_valid(ix, iy, nMeasPoints)) { + /*if (!mbl_point_measurement_valid(ix, iy, nMeasPoints, true)) { printf_P(PSTR("Skipping point [%d;%d] \n"), ix, iy); custom_message_state--; mesh_point++; continue; //skip - } + }*/ if (iy & 1) ix = (nMeasPoints - 1) - ix; // Zig zag float z0 = 0.f; if (has_z && (mesh_point > 0)) { @@ -4694,6 +4694,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (nMeasPoints == 3) { mbl.upsample_3x3(); //interpolation from 3x3 to 7x7 points using largrangian polynomials while using the same array z_values[iy][ix] for storing (just coppying measured data to new destination and interpolating between them) } + if (nMeasPoints == 7) { + mbl_interpolation(nMeasPoints); + } // SERIAL_ECHOLNPGM("Upsample finished"); mbl.active = 1; //activate mesh bed leveling // SERIAL_ECHOLNPGM("Mesh bed leveling activated"); diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 85ed0554..c5fc5829 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3067,11 +3067,13 @@ void mbl_mode_init() { else e_mbl_type = mbl_type; } -bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points) { +bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag) { //"human readable" heatbed plan //magnet proximity influence Z coordinate measurements significantly (40 - 100 um) //0 - measurement point is above magnet and Z coordinate can be influenced negatively //1 - we should be in safe distance from magnets, measurement should be accurate + if ((ix >= meas_points) || (iy >= meas_points)) return false; + uint8_t valid_points_mask[7] = { //[X_MAX,Y_MAX] 0b1111101, @@ -3089,4 +3091,24 @@ bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points) { } if((iy%2) == 0) return (valid_points_mask[6 - iy] & (1 << (6 - ix))); else return (valid_points_mask[6 - iy] & (1 << ix)); +} + +void mbl_single_point_interpolation(uint8_t x, uint8_t y, uint8_t meas_points) { + uint8_t count = 0; + float z = 0; + if(mbl_point_measurement_valid(x, y+1, meas_points, false)) { z += mbl.z_values[x][y+1]; count++; } + if(mbl_point_measurement_valid(x, y-1, meas_points, false)) { z += mbl.z_values[x][y-1]; count++; } + if(mbl_point_measurement_valid(x+1, y, meas_points, false)) { z += mbl.z_values[x+1][y]; count++; } + if(mbl_point_measurement_valid(x-1, y, meas_points, false)) { z += mbl.z_values[x+1][y]; count++; } + if(count != 0) mbl.z_values[x][y] = z / count; //if we have at least one valid point in surrounding area use average value, otherwise use inaccurately measured Z-coordinate +} + +void mbl_interpolation(uint8_t meas_points) { + for (uint8_t x = 0; x < meas_points; x++) { + for (uint8_t y = 0; y < meas_points; y++) { + if (!mbl_point_measurement_valid(x, y, meas_points, false)) { + mbl_single_point_interpolation(x, y, meas_points); + } + } + } } \ No newline at end of file diff --git a/Firmware/mesh_bed_calibration.h b/Firmware/mesh_bed_calibration.h index 0d577271..7fd8011c 100644 --- a/Firmware/mesh_bed_calibration.h +++ b/Firmware/mesh_bed_calibration.h @@ -210,6 +210,6 @@ extern e_MBL_TYPE e_mbl_type; extern void mbl_mode_set(); extern void mbl_mode_init(); -extern bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points); - +extern bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag); +extern void mbl_interpolation(uint8_t meas_points); #endif /* MESH_BED_CALIBRATION_H */ From 5766a5537e128cd1a9d60c72e87230b0605bdb46 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 5 Mar 2019 22:43:44 +0100 Subject: [PATCH 007/168] limit number of probes --- 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 ceefa39d..0453b00a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4392,7 +4392,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (code_seen('R')) { nProbeRetry = code_value_uint8(); if (nProbeRetry > 10) { - nProbeRetry = 3; + nProbeRetry = 10; } } From 101453b674a179f7fd104ba08f4e58fa432bc275 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 6 Mar 2019 13:27:31 +0100 Subject: [PATCH 008/168] mbl submenu --- Firmware/ultralcd.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 37fd4746..cf93397b 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5271,16 +5271,16 @@ do\ switch(e_mbl_type)\ {\ case e_MBL_FAST:\ - MENU_ITEM_FUNCTION_P(_i("MBL mode [Fast]"),mbl_mode_set);\ + MENU_ITEM_FUNCTION_P(_i("Mode [Fast]"),mbl_mode_set);\ break; \ case e_MBL_OPTIMAL:\ - MENU_ITEM_FUNCTION_P(_i("MBL mode [Optimal]"), mbl_mode_set); \ + MENU_ITEM_FUNCTION_P(_i("Mode [Optimal]"), mbl_mode_set); \ break; \ case e_MBL_PREC:\ - MENU_ITEM_FUNCTION_P(_i("MBL mode [Precise]"), mbl_mode_set); \ + MENU_ITEM_FUNCTION_P(_i("Mode [Precise]"), mbl_mode_set); \ break; \ default:\ - MENU_ITEM_FUNCTION_P(_i("MBL mode [Optimal]"), mbl_mode_set); \ + MENU_ITEM_FUNCTION_P(_i("Mode [Optimal]"), mbl_mode_set); \ break; \ }\ }\ @@ -5333,7 +5333,7 @@ static void lcd_settings_menu() SETTINGS_SILENT_MODE; - SETTINGS_MBL_MODE; + MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_TEMPERATURE c=0 r=0 #if defined (TMC2130) && defined (LINEARITY_CORRECTION) MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); @@ -6524,6 +6524,12 @@ static void lcd_tune_menu() MENU_END(); } +static void mesh_bed_leveling_menu() +{ + + SETTINGS_MBL_MODE; +} + static void lcd_control_temperature_menu() { #ifdef PIDTEMP From f0cc313fede4c15233fa90a0be6c8d07dc521c26 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 6 Mar 2019 19:56:48 +0100 Subject: [PATCH 009/168] debug gcodes (fans, bed analysis) moved to Dcodes, HOST_KEEPALIVE_FEATURE simplified --- Firmware/Configuration.h | 2 + Firmware/Marlin.h | 14 +- Firmware/Marlin_main.cpp | 316 +++++++++++++++--- Firmware/pins_Rambo_1_3.h | 6 + Firmware/temperature.cpp | 2 - .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 3 + 6 files changed, 279 insertions(+), 64 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index c21325c7..a64e90a1 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -446,7 +446,9 @@ your extruder heater takes 2 minutes to hit the target on heating. // When enabled Marlin will send a busy status message to the host // every couple of seconds when it can't accept commands. // +#ifndef HEATBED_ANALYSIS #define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +#endif //HEATBED_ANALYSIS #define HOST_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. //LCD and SD support diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 2d469a76..ef342b0c 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -311,9 +311,9 @@ extern float retract_length_swap; extern float retract_recover_length_swap; #endif -#ifdef HOST_KEEPALIVE_FEATURE + extern uint8_t host_keepalive_interval; -#endif + extern unsigned long starttime; extern unsigned long stoptime; @@ -397,13 +397,12 @@ extern void check_babystep(); extern void long_pause(); extern void crashdet_stop_and_save_print(); -#ifdef DIS - +#ifdef HEATBED_ANALYSIS void d_setup(); float d_ReadData(); void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y); - -#endif +void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y); +#endif //HEATBED_ANALYSIS float temp_comp_interpolation(float temperature); void temp_compensation_apply(); void temp_compensation_start(); @@ -443,7 +442,7 @@ extern void restore_print_from_ram_and_continue(float e_move); extern uint16_t print_time_remaining(); extern uint8_t calc_percent_done(); -#ifdef HOST_KEEPALIVE_FEATURE + // States for managing Marlin and host communication // Marlin sends messages if blocked or busy @@ -466,7 +465,6 @@ extern void host_keepalive(); //extern MarlinBusyState busy_state; extern int busy_state; -#endif //HOST_KEEPALIVE_FEATURE #ifdef TMC2130 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d14226f3..53e84288 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -302,16 +302,9 @@ int fanSpeed=0; bool cancel_heatup = false ; -#ifdef HOST_KEEPALIVE_FEATURE - - int busy_state = NOT_BUSY; - static long prev_busy_signal_ms = -1; - uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; -#else - #define host_keepalive(); - #define KEEPALIVE_STATE(n); -#endif - +int busy_state = NOT_BUSY; +static long prev_busy_signal_ms = -1; +uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; const char errormagic[] PROGMEM = "Error:"; const char echomagic[] PROGMEM = "echo:"; @@ -1696,12 +1689,14 @@ void serial_read_stream() { } } -#ifdef HOST_KEEPALIVE_FEATURE /** * Output a "busy" message at regular intervals * while the machine is not accepting commands. */ void host_keepalive() { +#ifndef HOST_KEEPALIVE_FEATURE + return; +#endif //HOST_KEEPALIVE_FEATURE if (farm_mode) return; long ms = _millis(); if (host_keepalive_interval && busy_state != NOT_BUSY) { @@ -1726,7 +1721,7 @@ void host_keepalive() { } prev_busy_signal_ms = ms; } -#endif + // The loop() function is called in an endless loop by the Arduino framework from the default main() routine. // Before loop(), the setup() function is called by the main() routine. @@ -4295,44 +4290,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } break; -#ifdef DIS - case 77: - { - //! G77 X200 Y150 XP100 YP15 XO10 Y015 - //! for 9 point mesh bed leveling G77 X203 Y196 XP3 YP3 XO0 YO0 - //! G77 X232 Y218 XP116 YP109 XO-11 YO0 - float dimension_x = 40; - float dimension_y = 40; - int points_x = 40; - int points_y = 40; - float offset_x = 74; - float offset_y = 33; - - if (code_seen('X')) dimension_x = code_value(); - if (code_seen('Y')) dimension_y = code_value(); - if (code_seen("XP")) { strchr_pointer+=1; points_x = code_value(); } - if (code_seen("YP")) { strchr_pointer+=1; points_y = code_value(); } - if (code_seen("XO")) { strchr_pointer+=1; offset_x = code_value(); } - if (code_seen("YO")) { strchr_pointer+=1; offset_y = code_value(); } - - bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y); - - } break; - -#endif - - case 79: { - for (int i = 255; i > 0; i = i - 5) { - fanSpeed = i; - //delay_keep_alive(2000); - for (int j = 0; j < 100; j++) { - delay_keep_alive(100); - - } - printf_P(_N("%d: %d\n"), i, fan_speed[1]); - } - }break; /** * G80: Mesh-based Z probe, probes a grid and produces a @@ -5792,7 +5750,6 @@ Sigma_Exit: if (code_seen('N')) gcode_LastN = code_value_long(); break; -#ifdef HOST_KEEPALIVE_FEATURE case 113: // M113 - Get or set Host Keepalive interval if (code_seen('S')) { host_keepalive_interval = (uint8_t)code_value_short(); @@ -5804,7 +5761,6 @@ Sigma_Exit: SERIAL_PROTOCOLLN(""); } break; -#endif case 115: // M115 if (code_seen('V')) { // Report the Prusa version number. @@ -7138,7 +7094,66 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) dcode_9(); break; case 10: //! D10 - XYZ calibration = OK dcode_10(); break; - +#endif //DEBUG_DCODES +#ifdef HEATBED_ANALYSIS + case 80: + { + float dimension_x = 40; + float dimension_y = 40; + int points_x = 40; + int points_y = 40; + float offset_x = 74; + float offset_y = 33; + + if (code_seen('E')) dimension_x = code_value(); + if (code_seen('F')) dimension_y = code_value(); + if (code_seen('G')) {points_x = code_value(); } + if (code_seen('H')) {points_y = code_value(); } + if (code_seen('I')) {offset_x = code_value(); } + if (code_seen('J')) {offset_y = code_value(); } + printf_P(PSTR("DIM X: %f\n"), dimension_x); + printf_P(PSTR("DIM Y: %f\n"), dimension_y); + printf_P(PSTR("POINTS X: %d\n"), points_x); + printf_P(PSTR("POINTS Y: %d\n"), points_y); + printf_P(PSTR("OFFSET X: %f\n"), offset_x); + printf_P(PSTR("OFFSET Y: %f\n"), offset_y); + bed_check(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y); + }break; + + case 81: + { + float dimension_x = 40; + float dimension_y = 40; + int points_x = 40; + int points_y = 40; + float offset_x = 74; + float offset_y = 33; + + if (code_seen('E')) dimension_x = code_value(); + if (code_seen('F')) dimension_y = code_value(); + if (code_seen("G")) { strchr_pointer+=1; points_x = code_value(); } + if (code_seen("H")) { strchr_pointer+=1; points_y = code_value(); } + if (code_seen("I")) { strchr_pointer+=1; offset_x = code_value(); } + if (code_seen("J")) { strchr_pointer+=1; offset_y = code_value(); } + + bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y); + + } break; + +#endif //HEATBED_ANALYSIS +#ifdef DEBUG_DCODES + case 106: //D106 print measured fan speed for different pwm values + { + for (int i = 255; i > 0; i = i - 5) { + fanSpeed = i; + //delay_keep_alive(2000); + for (int j = 0; j < 100; j++) { + delay_keep_alive(100); + + } + printf_P(_N("%d: %d\n"), i, fan_speed[1]); + } + }break; #ifdef TMC2130 case 2130: //! D2130 - TMC2130 @@ -7934,7 +7949,7 @@ void check_babystep() lcd_update_enable(true); } } -#ifdef DIS +#ifdef HEATBED_ANALYSIS void d_setup() { pinMode(D_DATACLOCK, INPUT_PULLUP); @@ -7984,6 +7999,199 @@ float d_ReadData() } +void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y) { + int t1 = 0; + int t_delay = 0; + int digit[13]; + int m; + char str[3]; + //String mergeOutput; + char mergeOutput[15]; + float output; + + int mesh_point = 0; //index number of calibration point + float bed_zero_ref_x = (-22.f + X_PROBE_OFFSET_FROM_EXTRUDER); //shift between zero point on bed and target and between probe and nozzle + float bed_zero_ref_y = (-0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER); + + float mesh_home_z_search = 4; + float measure_z_heigth = 0.2f; + float row[x_points_num]; + int ix = 0; + int iy = 0; + + const char* filename_wldsd = "mesh.txt"; + char data_wldsd[x_points_num * 7 + 1]; //6 chars(" -A.BCD")for each measurement + null + char numb_wldsd[8]; // (" -A.BCD" + null) +#ifdef MICROMETER_LOGGING + d_setup(); +#endif //MICROMETER_LOGGING + + int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20; + int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40; + + unsigned int custom_message_type_old = custom_message_type; + unsigned int custom_message_state_old = custom_message_state; + custom_message_type = CUSTOM_MSG_TYPE_MESHBL; + custom_message_state = (x_points_num * y_points_num) + 10; + lcd_update(1); + + //mbl.reset(); + babystep_undo(); + + card.openFile(filename_wldsd, false); + + /*destination[Z_AXIS] = mesh_home_z_search; + //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + + plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + for(int8_t i=0; i < NUM_AXIS; i++) { + current_position[i] = destination[i]; + } + st_synchronize(); + */ + destination[Z_AXIS] = measure_z_heigth; + plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + for(int8_t i=0; i < NUM_AXIS; i++) { + current_position[i] = destination[i]; + } + st_synchronize(); + /*int l_feedmultiply = */setup_for_endstop_move(false); + + SERIAL_PROTOCOLPGM("Num X,Y: "); + SERIAL_PROTOCOL(x_points_num); + SERIAL_PROTOCOLPGM(","); + SERIAL_PROTOCOL(y_points_num); + SERIAL_PROTOCOLPGM("\nZ search height: "); + SERIAL_PROTOCOL(mesh_home_z_search); + SERIAL_PROTOCOLPGM("\nDimension X,Y: "); + SERIAL_PROTOCOL(x_dimension); + SERIAL_PROTOCOLPGM(","); + SERIAL_PROTOCOL(y_dimension); + SERIAL_PROTOCOLLNPGM("\nMeasured points:"); + + while (mesh_point != x_points_num * y_points_num) { + ix = mesh_point % x_points_num; // from 0 to MESH_NUM_X_POINTS - 1 + iy = mesh_point / x_points_num; + if (iy & 1) ix = (x_points_num - 1) - ix; // Zig zag + float z0 = 0.f; + /*destination[Z_AXIS] = mesh_home_z_search; + //plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + + plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); + for(int8_t i=0; i < NUM_AXIS; i++) { + current_position[i] = destination[i]; + } + st_synchronize();*/ + + + //current_position[X_AXIS] = 13.f + ix * (x_dimension / (x_points_num - 1)) - bed_zero_ref_x + shift_x; + //current_position[Y_AXIS] = 6.4f + iy * (y_dimension / (y_points_num - 1)) - bed_zero_ref_y + shift_y; + + destination[X_AXIS] = ix * (x_dimension / (x_points_num - 1)) + shift_x; + destination[Y_AXIS] = iy * (y_dimension / (y_points_num - 1)) + shift_y; + + mesh_plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], XY_AXIS_FEEDRATE/6, active_extruder); + for(int8_t i=0; i < NUM_AXIS; i++) { + current_position[i] = destination[i]; + } + st_synchronize(); + + // printf_P(PSTR("X = %f; Y= %f \n"), current_position[X_AXIS], current_position[Y_AXIS]); + + delay_keep_alive(1000); +#ifdef MICROMETER_LOGGING + + //memset(numb_wldsd, 0, sizeof(numb_wldsd)); + //dtostrf(d_ReadData(), 8, 5, numb_wldsd); + //strcat(data_wldsd, numb_wldsd); + + + + //MYSERIAL.println(data_wldsd); + //delay(1000); + //delay(3000); + //t1 = millis(); + + //while (digitalRead(D_DATACLOCK) == LOW) {} + //while (digitalRead(D_DATACLOCK) == HIGH) {} + memset(digit, 0, sizeof(digit)); + //cli(); + digitalWrite(D_REQUIRE, LOW); + + for (int i = 0; i<13; i++) + { + //t1 = millis(); + for (int j = 0; j < 4; j++) + { + while (digitalRead(D_DATACLOCK) == LOW) {} + while (digitalRead(D_DATACLOCK) == HIGH) {} + //printf_P(PSTR("Done %d\n"), j); + bitWrite(digit[i], j, digitalRead(D_DATA)); + } + //t_delay = (millis() - t1); + //SERIAL_PROTOCOLPGM(" "); + //SERIAL_PROTOCOL_F(t_delay, 5); + //SERIAL_PROTOCOLPGM(" "); + + } + //sei(); + digitalWrite(D_REQUIRE, HIGH); + mergeOutput[0] = '\0'; + output = 0; + for (int r = 5; r <= 10; r++) //Merge digits + { + sprintf(str, "%d", digit[r]); + strcat(mergeOutput, str); + } + + output = atof(mergeOutput); + + if (digit[4] == 8) //Handle sign + { + output *= -1; + } + + for (int i = digit[11]; i > 0; i--) //Handle floating point + { + output *= 0.1; + } + + + //output = d_ReadData(); + + //row[ix] = current_position[Z_AXIS]; + + + + //row[ix] = d_ReadData(); + + row[ix] = output; + + if (iy % 2 == 1 ? ix == 0 : ix == x_points_num - 1) { + memset(data_wldsd, 0, sizeof(data_wldsd)); + for (int i = 0; i < x_points_num; i++) { + SERIAL_PROTOCOLPGM(" "); + SERIAL_PROTOCOL_F(row[i], 5); + memset(numb_wldsd, 0, sizeof(numb_wldsd)); + dtostrf(row[i], 7, 3, numb_wldsd); + strcat(data_wldsd, numb_wldsd); + } + card.write_command(data_wldsd); + SERIAL_PROTOCOLPGM("\n"); + + } + + custom_message_state--; + mesh_point++; + lcd_update(1); + + } + #endif //MICROMETER_LOGGING + card.closefile(); + //clean_up_after_endstop_move(l_feedmultiply); + +} + void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_points_num, float shift_x, float shift_y) { int t1 = 0; int t_delay = 0; @@ -8167,7 +8375,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_ card.closefile(); clean_up_after_endstop_move(l_feedmultiply); } -#endif +#endif //HEATBED_ANALYSIS void temp_compensation_start() { diff --git a/Firmware/pins_Rambo_1_3.h b/Firmware/pins_Rambo_1_3.h index c1adf596..538fb4f3 100644 --- a/Firmware/pins_Rambo_1_3.h +++ b/Firmware/pins_Rambo_1_3.h @@ -14,6 +14,12 @@ #define SWI2C_SDA 20 //SDA on P3 #define SWI2C_SCL 21 //SCL on P3 +#ifdef MICROMETER_LOGGING +#define D_DATACLOCK 24 //Y_MAX (green) +#define D_DATA 30 //X_MAX (blue) +#define D_REQUIRE 23 //Z_MAX (white) +#endif //MICROMETER_LOGGING + #define X_STEP_PIN 37 diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 4ce13bd6..d6019eeb 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -888,9 +888,7 @@ void manage_heater() } #endif -#ifdef HOST_KEEPALIVE_FEATURE host_keepalive(); -#endif } #define PGM_RD_W(x) (short)pgm_read_word(&x) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index e316c4f0..99dd1e65 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -504,4 +504,7 @@ #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning +//#define HEATBED_ANALYSIS //for meash bed leveling and heatbed analysis D-codes D80 and D81 +//#define MICROMETER_LOGGING //related to D-codes D80 and D81, currently works on MK2.5 only (MK3 board pin definitions missing) + #endif //__CONFIGURATION_PRUSA_H From 6a864ffbab45d28fbf3f4680e2696a625a70786b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 8 Mar 2019 15:43:37 +0100 Subject: [PATCH 010/168] G80 parameters configurable via settings menu --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 14 +++++++-- Firmware/eeprom.h | 3 ++ Firmware/mesh_bed_calibration.cpp | 22 ++++++++++++-- Firmware/mesh_bed_calibration.h | 11 +++---- Firmware/ultralcd.cpp | 48 +++++++++++++++++++++++++++---- 6 files changed, 85 insertions(+), 14 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 78929e9f..d91f74fb 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -21,6 +21,7 @@ #include "Configuration.h" #include "pins.h" #include "Timer.h" +extern int mbl_z_probe_nr; #ifndef AT90USB #define HardwareSerial_h // trick to disable the standard HWserial diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index d70e66ea..084241c5 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -167,6 +167,7 @@ CardReader card; unsigned long PingTime = _millis(); unsigned long NcTime; +int mbl_z_probe_nr = 4; //numer of Z measurements for each point in mesh bed leveling calibration //used for PINDA temp calibration and pause print #define DEFAULT_RETRACTION 1 @@ -1465,7 +1466,8 @@ void setup() if (eeprom_read_byte((uint8_t*)EEPROM_SD_SORT) == 255) { eeprom_write_byte((uint8_t*)EEPROM_SD_SORT, 0); } - mbl_mode_init(); + //mbl_mode_init(); + mbl_settings_init(); check_babystep(); //checking if Z babystep is in allowed range #ifdef UVLO_SUPPORT @@ -4325,6 +4327,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) */ case 80: + #ifdef MK1BP break; #endif //MK1BP @@ -4363,6 +4366,9 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) nMeasPoints = 3; } } + else { + nMeasPoints = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + } uint8_t nProbeRetry = 3; if (code_seen('R')) { @@ -4371,6 +4377,10 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) nProbeRetry = 10; } } + else { + nProbeRetry = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR) - 1; + } + bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); bool temp_comp_start = true; #ifdef PINDA_THERMISTOR @@ -4670,7 +4680,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (nMeasPoints == 3) { mbl.upsample_3x3(); //interpolation from 3x3 to 7x7 points using largrangian polynomials while using the same array z_values[iy][ix] for storing (just coppying measured data to new destination and interpolating between them) } - if (nMeasPoints == 7) { + if (nMeasPoints == 7 && magnet_elimination) { mbl_interpolation(nMeasPoints); } // SERIAL_ECHOLNPGM("Upsample finished"); diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 3dc0a092..8a15248e 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -156,6 +156,9 @@ #define EEPROM_MMU_CUTTER_ENABLED (EEPROM_MMU_LOAD_FAIL - 1) #define EEPROM_UVLO_MESH_BED_LEVELING_FULL (EEPROM_MMU_CUTTER_ENABLED - 12*12*2) //allow 12 calibration points for future expansion #define EEPROM_MBL_TYPE (EEPROM_UVLO_MESH_BED_LEVELING_FULL-1) //uint8_t for mesh bed leveling precision +#define EEPROM_MBL_MAGNET_ELIMINATION (EEPROM_MBL_TYPE -1) +#define EEPROM_MBL_POINTS_NR (EEPROM_MBL_MAGNET_ELIMINATION -1) //uint8_t number of points in one exis for mesh bed leveling +#define EEPROM_MBL_PROBE_NR (EEPROM_MBL_POINTS_NR-1) // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index c5fc5829..9b3c78f1 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -985,7 +985,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i // SERIAL_ECHOLNPGM(""); float dz = i?abs(current_position[Z_AXIS] - (z / i)):0; z += current_position[Z_AXIS]; -// printf_P(PSTR(" Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); + printf_P(PSTR("Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); if (dz > 0.05) goto error;//deviation > 50um } current_position[Z_AXIS] = z; @@ -3048,7 +3048,7 @@ void count_xyz_details(float (&distanceMin)[2]) { distanceMin[mesh_point] = (y - Y_MIN_POS_CALIBRATION_POINT_OUT_OF_REACH); } } - +/* e_MBL_TYPE e_mbl_type = e_MBL_OPTIMAL; void mbl_mode_set() { @@ -3066,6 +3066,24 @@ void mbl_mode_init() { if (mbl_type == 0xFF) e_mbl_type = e_MBL_OPTIMAL; else e_mbl_type = mbl_type; } +*/ + +void mbl_settings_init() { +//3x3 mesh; 3 Z-probes on each point, magnet elimination on +//magnet elimination: use aaproximate Z-coordinate instead of measured values for points which are near magnets + if (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) == 0xFF) { + eeprom_update_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION, 1); + } + if (eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR) == 0xFF) { + eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, 3); + } + mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + if (mbl_z_probe_nr == 0xFF) { + mbl_z_probe_nr = 4; + eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr); + } + +} bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag) { //"human readable" heatbed plan diff --git a/Firmware/mesh_bed_calibration.h b/Firmware/mesh_bed_calibration.h index 7fd8011c..954db9c3 100644 --- a/Firmware/mesh_bed_calibration.h +++ b/Firmware/mesh_bed_calibration.h @@ -200,15 +200,16 @@ extern void babystep_reset(); extern void count_xyz_details(float (&distanceMin)[2]); extern bool sample_z(); - +/* typedef enum { e_MBL_FAST, e_MBL_OPTIMAL, e_MBL_PREC } e_MBL_TYPE; - -extern e_MBL_TYPE e_mbl_type; -extern void mbl_mode_set(); -extern void mbl_mode_init(); +*/ +//extern e_MBL_TYPE e_mbl_type; +//extern void mbl_mode_set(); +//extern void mbl_mode_init(); +extern void mbl_settings_init(); extern bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag); extern void mbl_interpolation(uint8_t meas_points); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4e3d76b4..77492ac0 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -47,6 +47,7 @@ char longFilenameOLD[LONG_FILENAME_LENGTH]; static void lcd_sd_updir(); +static void lcd_mesh_bed_leveling_settings(); int8_t ReInitLCD = 0; @@ -5325,6 +5326,7 @@ do\ while (0) #endif // SDCARD_SORT_ALPHA +/* #define SETTINGS_MBL_MODE \ do\ {\ @@ -5345,7 +5347,7 @@ do\ }\ }\ while (0) - +*/ #define SETTINGS_SOUND \ do\ @@ -5395,7 +5397,7 @@ static void lcd_settings_menu() SETTINGS_SILENT_MODE; - MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_TEMPERATURE c=0 r=0 + MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_MBL_SETTINGS c=18 r=1 #if defined (TMC2130) && defined (LINEARITY_CORRECTION) MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu); @@ -6632,10 +6634,46 @@ static void lcd_tune_menu() MENU_END(); } -static void mesh_bed_leveling_menu() -{ +static void mbl_magnets_elimination_set() { + bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); + magnet_elimination = !magnet_elimination; + eeprom_update_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION, (uint8_t)magnet_elimination); +} - SETTINGS_MBL_MODE; +static void mbl_mesh_set() { + uint8_t mesh_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + if(mesh_nr == 3) mesh_nr = 7; + else mesh_nr = 3; + eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mesh_nr); +} + +static void lcd_mesh_bed_leveling_settings() +{ + + bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); + uint8_t points_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + + 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) + { + eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, (uint8_t)mbl_z_probe_nr); + } + MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); + if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); + MENU_ITEM_EDIT_int3_P(_i("Probe nr."), &mbl_z_probe_nr, 1, 5); + if (points_nr == 7) { + if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets eli [On]"), mbl_magnets_elimination_set); + else MENU_ITEM_FUNCTION_P(_i("Magnets eli [Off]"), mbl_magnets_elimination_set); + } + else menu_item_text_P(_i("MAgnets eli [N/A]")); + MENU_END(); + /*if(menu_leaving) + { + eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr); + }*/ + //SETTINGS_MBL_MODE; } static void lcd_control_temperature_menu() From f293d61d3d26bb529c856b0283c5887f89900aa6 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 8 Mar 2019 18:52:14 +0100 Subject: [PATCH 011/168] faster Z probe: move Z 150um relatively to last measurement. If PINDA is triggered at the beginning of measurement, move Z 500um higher and repeat measurement --- Firmware/mesh_bed_calibration.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 9b3c78f1..7b53e285 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -967,15 +967,29 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i #endif //TMC2130 for (uint8_t i = 0; i < n_iter; ++ i) { - // Move up the retract distance. - current_position[Z_AXIS] += .5f; - go_to_current(homing_feedrate[Z_AXIS]/60); - // Move back down slowly to find bed. + + current_position[Z_AXIS] += 0.15; + float z_bckp = current_position[Z_AXIS]; + go_to_current(homing_feedrate[Z_AXIS]/60); + // Move back down slowly to find bed. current_position[Z_AXIS] = minimum_z; go_to_current(homing_feedrate[Z_AXIS]/(4*60)); // we have to let the planner know where we are right now as it is not where we said to go. update_current_position_z(); - if (! endstop_z_hit_on_purpose()) + //printf_P(PSTR("Zs: %f, Z: %f, delta Z: %f"), z_bckp, current_position[Z_AXIS], (z_bckp - current_position[Z_AXIS])); + if (abs(current_position[Z_AXIS] - z_bckp) < 0.025) { + printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); + current_position[Z_AXIS] += 0.5; + go_to_current(homing_feedrate[Z_AXIS]/60); + current_position[Z_AXIS] = minimum_z; + go_to_current(homing_feedrate[Z_AXIS]/(4*60)); + // we have to let the planner know where we are right now as it is not where we said to go. + update_current_position_z(); + } + + + + if (! endstop_z_hit_on_purpose()) goto error; #ifdef TMC2130 if (READ(Z_TMC2130_DIAG) != 0) goto error; //crash Z detected @@ -2748,7 +2762,7 @@ void go_home_with_z_lift() current_position[Y_AXIS] = Y_MIN_POS+0.2; // Clamp to the physical coordinates. world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); - go_to_current(homing_feedrate[X_AXIS]/60); + go_to_current(homing_feedrate[X_AXIS]/20); // Third move up to a safe height. current_position[Z_AXIS] = Z_MIN_POS; go_to_current(homing_feedrate[Z_AXIS]/60); From 952e0e1e772135f389d1ae19cbf6c903fb14c40d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 8 Mar 2019 19:49:10 +0100 Subject: [PATCH 012/168] change min. nProbeRetry to 1 --- 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 084241c5..fe88c8ca 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4378,7 +4378,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } } else { - nProbeRetry = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR) - 1; + nProbeRetry = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR); } bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); From 315959c13aab15abc9fce571201f5d4453256417 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 8 Mar 2019 20:03:23 +0100 Subject: [PATCH 013/168] menu update --- Firmware/ultralcd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 77492ac0..ce38a35d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6660,14 +6660,14 @@ static void lcd_mesh_bed_leveling_settings() eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, (uint8_t)mbl_z_probe_nr); } MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); - MENU_ITEM_EDIT_int3_P(_i("Probe nr."), &mbl_z_probe_nr, 1, 5); + if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); + MENU_ITEM_EDIT_int3_P(_i("Z-probe nr."), &mbl_z_probe_nr, 1, 5); if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets eli [On]"), mbl_magnets_elimination_set); - else MENU_ITEM_FUNCTION_P(_i("Magnets eli [Off]"), mbl_magnets_elimination_set); + if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets eli [On]"), mbl_magnets_elimination_set); + else MENU_ITEM_FUNCTION_P(_i("Magnets comp. [Off]"), mbl_magnets_elimination_set); } - else menu_item_text_P(_i("MAgnets eli [N/A]")); + else menu_item_text_P(_i("Magnets comp. [N/A]")); MENU_END(); /*if(menu_leaving) { From 091934462d09f52c61f7b68c04cb23fe1c090e9f Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 8 Mar 2019 20:06:30 +0100 Subject: [PATCH 014/168] menu correction --- Firmware/ultralcd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ce38a35d..5cdf6b8a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6660,14 +6660,14 @@ static void lcd_mesh_bed_leveling_settings() eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, (uint8_t)mbl_z_probe_nr); } MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); + if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); MENU_ITEM_EDIT_int3_P(_i("Z-probe nr."), &mbl_z_probe_nr, 1, 5); if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets eli [On]"), mbl_magnets_elimination_set); - else MENU_ITEM_FUNCTION_P(_i("Magnets comp. [Off]"), mbl_magnets_elimination_set); + if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets eli [On]"), mbl_magnets_elimination_set); + else MENU_ITEM_FUNCTION_P(_i("Magnets comp. [Off]"), mbl_magnets_elimination_set); } - else menu_item_text_P(_i("Magnets comp. [N/A]")); + else menu_item_text_P(_i("Magnets comp. [N/A]")); MENU_END(); /*if(menu_leaving) { From 141b78c048c76cff09866c68036d5ff7f9e10d27 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 10 Mar 2019 16:03:46 +0100 Subject: [PATCH 015/168] number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu --- Firmware/Marlin_main.cpp | 7 ++++++- Firmware/eeprom.h | 1 + Firmware/mesh_bed_calibration.cpp | 2 +- Firmware/mmu.cpp | 6 ++---- Firmware/ultralcd.cpp | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fe88c8ca..22fb576b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -167,7 +167,7 @@ CardReader card; unsigned long PingTime = _millis(); unsigned long NcTime; -int mbl_z_probe_nr = 4; //numer of Z measurements for each point in mesh bed leveling calibration +int mbl_z_probe_nr = 3; //numer of Z measurements for each point in mesh bed leveling calibration //used for PINDA temp calibration and pause print #define DEFAULT_RETRACTION 1 @@ -1468,6 +1468,11 @@ void setup() } //mbl_mode_init(); mbl_settings_init(); + SilentModeMenu_MMU = eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH); + if (SilentModeMenu_MMU == 255) { + SilentModeMenu_MMU = 1; + eeprom_write_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU); + } check_babystep(); //checking if Z babystep is in allowed range #ifdef UVLO_SUPPORT diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 8a15248e..56ee5f77 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -159,6 +159,7 @@ #define EEPROM_MBL_MAGNET_ELIMINATION (EEPROM_MBL_TYPE -1) #define EEPROM_MBL_POINTS_NR (EEPROM_MBL_MAGNET_ELIMINATION -1) //uint8_t number of points in one exis for mesh bed leveling #define EEPROM_MBL_PROBE_NR (EEPROM_MBL_POINTS_NR-1) +#define EEPROM_MMU_STEALTH (EEPROM_MBL_PROBE_NR-1) // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! // !!!!! diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 7b53e285..8de8fe81 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3093,7 +3093,7 @@ void mbl_settings_init() { } mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); if (mbl_z_probe_nr == 0xFF) { - mbl_z_probe_nr = 4; + mbl_z_probe_nr = 3; eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr); } diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 449efabd..6d5cc514 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -185,10 +185,8 @@ static bool activate_stealth_mode() { #if defined (MMU_FORCE_STEALTH_MODE) return true; -#elif defined (SILENT_MODE_STEALTH) - return (eeprom_read_byte((uint8_t*)EEPROM_SILENT) == SILENT_MODE_STEALTH); -#else - return false; +#elif + return (eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) == 1); #endif } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5cdf6b8a..169ae143 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -53,6 +53,7 @@ int8_t ReInitLCD = 0; int8_t SilentModeMenu = SILENT_MODE_OFF; +uint8_t SilentModeMenu_MMU = 1; //activate mmu unit stealth mode int8_t FSensorStateMenu = 1; @@ -4515,6 +4516,12 @@ static void lcd_sound_state_set(void) Sound_CycleState(); } +static void lcd_silent_mode_mmu_set() { + if (SilentModeMenu_MMU == 1) SilentModeMenu_MMU = 0; + else SilentModeMenu_MMU = 1; + eeprom_update_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU); +} + static void lcd_silent_mode_set() { switch (SilentModeMenu) { #ifdef TMC2130 @@ -5288,6 +5295,13 @@ do\ break; /* (probably) not needed*/\ }\ }\ +#ifndef MMU_FORCE_STEALTH_MODE + if(mmu_enabled)\ + {\ + if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set);\ + else MENU_ITEM_FUNCTION_P(_i("MMU Mode [Stealth]"), lcd_silent_mode_mmu_set);\ + }\ +#endif //MMU_FORCE_STEALTH_MODE }\ while (0) #endif //TMC2130 From 819a91ab1e88d96e7eaae630bc6c9a29a4471007 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 11 Mar 2019 12:33:22 +0100 Subject: [PATCH 016/168] switching stealth/normal mode for mmu in settings menu and tune menu --- Firmware/mmu.cpp | 27 ++++++++++++++++++++++++--- Firmware/ultralcd.cpp | 30 +++++++++++++++++++++--------- Firmware/ultralcd.h | 1 + 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 6d5cc514..3e587ce9 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -45,6 +45,7 @@ namespace WaitCmd, //!< wait for command response Pause, GetDrvError, //!< get power failures count + SwitchMode //switch mmu between stealth and normal mode }; } @@ -183,9 +184,9 @@ bool check_for_ir_sensor() static bool activate_stealth_mode() { -#if defined (MMU_FORCE_STEALTH_MODE) +#ifdef MMU_FORCE_STEALTH_MODE return true; -#elif +#else return (eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) == 1); #endif } @@ -335,6 +336,12 @@ void mmu_loop(void) mmu_last_cmd = mmu_cmd; mmu_cmd = MmuCmd::None; } + else if ((eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) != SilentModeMenu_MMU) && mmu_ready) { + DEBUG_PRINTF_P(PSTR("MMU <= 'M%d'\n"), SilentModeMenu_MMU); + mmu_printf_P(PSTR("M%d\n"), SilentModeMenu_MMU); + mmu_ready = false; + mmu_state = S::SwitchMode; + } else if ((mmu_last_response + 300) < _millis()) //request every 300ms { #ifndef IR_SENSOR @@ -450,9 +457,23 @@ void mmu_loop(void) mmu_state = S::Idle; } else if ((mmu_last_request + MMU_CMD_TIMEOUT) < _millis()) - { //resend request after timeout (5 min) + { //timeout 45 s mmu_state = S::Idle; } + return; + case S::SwitchMode: + if (mmu_rx_ok() > 0) + { + DEBUG_PRINTF_P(PSTR("MMU => 'ok'\n")); + eeprom_update_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU); + mmu_ready = true; + mmu_state = S::Idle; + } + else if ((mmu_last_request + MMU_CMD_TIMEOUT) < _millis()) + { //timeout 45 s + mmu_state = S::Idle; + } + return; } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 169ae143..2627a8aa 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4516,11 +4516,13 @@ static void lcd_sound_state_set(void) Sound_CycleState(); } +#ifndef MMU_FORCE_STEALTH_MODE static void lcd_silent_mode_mmu_set() { if (SilentModeMenu_MMU == 1) SilentModeMenu_MMU = 0; else SilentModeMenu_MMU = 1; - eeprom_update_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU); + //saving to eeprom is done in mmu_loop() after mmu actually switches state and confirms with "ok" } +#endif //MMU_FORCE_STEALTH_MODE static void lcd_silent_mode_set() { switch (SilentModeMenu) { @@ -5295,17 +5297,26 @@ do\ break; /* (probably) not needed*/\ }\ }\ -#ifndef MMU_FORCE_STEALTH_MODE - if(mmu_enabled)\ - {\ - if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set);\ - else MENU_ITEM_FUNCTION_P(_i("MMU Mode [Stealth]"), lcd_silent_mode_mmu_set);\ - }\ -#endif //MMU_FORCE_STEALTH_MODE + }\ while (0) #endif //TMC2130 +#ifndef MMU_FORCE_STEALTH_MODE +#define SETTINGS_MMU_MODE \ +do\ +{\ + if (mmu_enabled)\ + {\ + if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set); \ + else MENU_ITEM_FUNCTION_P(_i("MMU Mode[Stealth]"), lcd_silent_mode_mmu_set); \ + }\ +}\ +while (0) +#else //MMU_FORCE_STEALTH_MODE +#define SETTINGS_MMU_MODE +#endif //MMU_FORCE_STEALTH_MODE + #ifdef SDCARD_SORT_ALPHA #define SETTINGS_SD \ do\ @@ -5410,6 +5421,7 @@ static void lcd_settings_menu() MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1 SETTINGS_SILENT_MODE; + SETTINGS_MMU_MODE; MENU_ITEM_SUBMENU_P(_i("Mesh bed leveling"), lcd_mesh_bed_leveling_settings);////MSG_MBL_SETTINGS c=18 r=1 @@ -6626,7 +6638,7 @@ static void lcd_tune_menu() } } #endif //TMC2130 - + SETTINGS_MMU_MODE; switch(eSoundMode) { case e_SOUND_MODE_LOUD: diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 0b286181..8ed42442 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -117,6 +117,7 @@ extern int farm_status; #endif extern int8_t SilentModeMenu; +extern uint8_t SilentModeMenu_MMU; extern bool cancel_heatup; extern bool isPrintPaused; From 698f81abe00e2462e2020f177c8f156607bdcbf4 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 11 Mar 2019 15:55:48 +0100 Subject: [PATCH 017/168] fix compile error --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2627a8aa..c1372f0e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5297,7 +5297,6 @@ do\ break; /* (probably) not needed*/\ }\ }\ - }\ while (0) #endif //TMC2130 From 9a83925a97eeb26c9260aace19e2a5ab41a9b0ba Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 11 Mar 2019 23:13:55 +0100 Subject: [PATCH 018/168] fixed bug in counting approximate Z coordinate --- Firmware/Marlin_main.cpp | 32 +++++++++++++++++++++++++++++++ Firmware/mesh_bed_calibration.cpp | 21 +++++++++++++------- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 22fb576b..6aadd69c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4685,9 +4685,41 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (nMeasPoints == 3) { mbl.upsample_3x3(); //interpolation from 3x3 to 7x7 points using largrangian polynomials while using the same array z_values[iy][ix] for storing (just coppying measured data to new destination and interpolating between them) } +/* + SERIAL_PROTOCOLPGM("Num X,Y: "); + SERIAL_PROTOCOL(MESH_NUM_X_POINTS); + SERIAL_PROTOCOLPGM(","); + SERIAL_PROTOCOL(MESH_NUM_Y_POINTS); + SERIAL_PROTOCOLPGM("\nZ search height: "); + SERIAL_PROTOCOL(MESH_HOME_Z_SEARCH); + SERIAL_PROTOCOLLNPGM("\nMeasured points:"); + for (int y = MESH_NUM_Y_POINTS-1; y >= 0; y--) { + for (int x = 0; x < MESH_NUM_X_POINTS; x++) { + SERIAL_PROTOCOLPGM(" "); + SERIAL_PROTOCOL_F(mbl.z_values[y][x], 5); + } + SERIAL_PROTOCOLPGM("\n"); + } +*/ if (nMeasPoints == 7 && magnet_elimination) { mbl_interpolation(nMeasPoints); } +/* + SERIAL_PROTOCOLPGM("Num X,Y: "); + SERIAL_PROTOCOL(MESH_NUM_X_POINTS); + SERIAL_PROTOCOLPGM(","); + SERIAL_PROTOCOL(MESH_NUM_Y_POINTS); + SERIAL_PROTOCOLPGM("\nZ search height: "); + SERIAL_PROTOCOL(MESH_HOME_Z_SEARCH); + SERIAL_PROTOCOLLNPGM("\nMeasured points:"); + for (int y = MESH_NUM_Y_POINTS-1; y >= 0; y--) { + for (int x = 0; x < MESH_NUM_X_POINTS; x++) { + SERIAL_PROTOCOLPGM(" "); + SERIAL_PROTOCOL_F(mbl.z_values[y][x], 5); + } + SERIAL_PROTOCOLPGM("\n"); + } +*/ // SERIAL_ECHOLNPGM("Upsample finished"); mbl.active = 1; //activate mesh bed leveling // SERIAL_ECHOLNPGM("Mesh bed leveling activated"); diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 8de8fe81..f9c21c00 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3121,18 +3121,25 @@ bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bo ix *= 3; iy *= 3; } - if((iy%2) == 0) return (valid_points_mask[6 - iy] & (1 << (6 - ix))); - else return (valid_points_mask[6 - iy] & (1 << ix)); + if (zigzag) { + if ((iy % 2) == 0) return (valid_points_mask[6 - iy] & (1 << (6 - ix))); + else return (valid_points_mask[6 - iy] & (1 << ix)); + } + else { + return (valid_points_mask[6 - iy] & (1 << (6 - ix))); + } } void mbl_single_point_interpolation(uint8_t x, uint8_t y, uint8_t meas_points) { + printf_P(PSTR("x = %d; y = %d \n"), x, y); uint8_t count = 0; float z = 0; - if(mbl_point_measurement_valid(x, y+1, meas_points, false)) { z += mbl.z_values[x][y+1]; count++; } - if(mbl_point_measurement_valid(x, y-1, meas_points, false)) { z += mbl.z_values[x][y-1]; count++; } - if(mbl_point_measurement_valid(x+1, y, meas_points, false)) { z += mbl.z_values[x+1][y]; count++; } - if(mbl_point_measurement_valid(x-1, y, meas_points, false)) { z += mbl.z_values[x+1][y]; count++; } - if(count != 0) mbl.z_values[x][y] = z / count; //if we have at least one valid point in surrounding area use average value, otherwise use inaccurately measured Z-coordinate + if (mbl_point_measurement_valid(x, y + 1, meas_points, false)) { z += mbl.z_values[y + 1][x]; /*printf_P(PSTR("x; y+1: Z = %f \n")*/, mbl.z_values[y + 1][x]); count++; } + if (mbl_point_measurement_valid(x, y - 1, meas_points, false)) { z += mbl.z_values[y - 1][x]; /*printf_P(PSTR("x; y-1: Z = %f \n")*/, mbl.z_values[y - 1][x]); count++; } + if (mbl_point_measurement_valid(x + 1, y, meas_points, false)) { z += mbl.z_values[y][x + 1]; /*printf_P(PSTR("x+1; y: Z = %f \n")*/, mbl.z_values[y][x + 1]); count++; } + if (mbl_point_measurement_valid(x - 1, y, meas_points, false)) { z += mbl.z_values[y][x - 1]; /*printf_P(PSTR("x-1; y: Z = %f \n")*/, mbl.z_values[y][x - 1]); count++; } + if(count != 0) mbl.z_values[y][x] = z / count; //if we have at least one valid point in surrounding area use average value, otherwise use inaccurately measured Z-coordinate + //printf_P(PSTR("result: Z = %f \n\n"), mbl.z_values[y][x]); } void mbl_interpolation(uint8_t meas_points) { From 0aa21c362ef25db5ed8abeb992d60c4c207b37be Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 11 Mar 2019 23:37:30 +0100 Subject: [PATCH 019/168] compile error fix --- Firmware/mesh_bed_calibration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index f9c21c00..0a675550 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3134,10 +3134,10 @@ void mbl_single_point_interpolation(uint8_t x, uint8_t y, uint8_t meas_points) { printf_P(PSTR("x = %d; y = %d \n"), x, y); uint8_t count = 0; float z = 0; - if (mbl_point_measurement_valid(x, y + 1, meas_points, false)) { z += mbl.z_values[y + 1][x]; /*printf_P(PSTR("x; y+1: Z = %f \n")*/, mbl.z_values[y + 1][x]); count++; } - if (mbl_point_measurement_valid(x, y - 1, meas_points, false)) { z += mbl.z_values[y - 1][x]; /*printf_P(PSTR("x; y-1: Z = %f \n")*/, mbl.z_values[y - 1][x]); count++; } - if (mbl_point_measurement_valid(x + 1, y, meas_points, false)) { z += mbl.z_values[y][x + 1]; /*printf_P(PSTR("x+1; y: Z = %f \n")*/, mbl.z_values[y][x + 1]); count++; } - if (mbl_point_measurement_valid(x - 1, y, meas_points, false)) { z += mbl.z_values[y][x - 1]; /*printf_P(PSTR("x-1; y: Z = %f \n")*/, mbl.z_values[y][x - 1]); count++; } + if (mbl_point_measurement_valid(x, y + 1, meas_points, false)) { z += mbl.z_values[y + 1][x]; /*printf_P(PSTR("x; y+1: Z = %f \n"), mbl.z_values[y + 1][x]);*/ count++; } + if (mbl_point_measurement_valid(x, y - 1, meas_points, false)) { z += mbl.z_values[y - 1][x]; /*printf_P(PSTR("x; y-1: Z = %f \n"), mbl.z_values[y - 1][x]);*/ count++; } + if (mbl_point_measurement_valid(x + 1, y, meas_points, false)) { z += mbl.z_values[y][x + 1]; /*printf_P(PSTR("x+1; y: Z = %f \n"), mbl.z_values[y][x + 1]);*/ count++; } + if (mbl_point_measurement_valid(x - 1, y, meas_points, false)) { z += mbl.z_values[y][x - 1]; /*printf_P(PSTR("x-1; y: Z = %f \n"), mbl.z_values[y][x - 1]);*/ count++; } if(count != 0) mbl.z_values[y][x] = z / count; //if we have at least one valid point in surrounding area use average value, otherwise use inaccurately measured Z-coordinate //printf_P(PSTR("result: Z = %f \n\n"), mbl.z_values[y][x]); } From c3a95ab79baa4dfebd346fb7f99308b0affc39f5 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 12 Mar 2019 11:57:35 +0100 Subject: [PATCH 020/168] variants update --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 3b9f7698..a036a11a 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -438,7 +438,7 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds -#define MMU_REQUIRED_FW_BUILDNR 132 +#define MMU_REQUIRED_FW_BUILDNR 310 #ifndef SNMM //#define SUPPORT_VERBOSITY diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 2d00929f..d2ada705 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -438,7 +438,7 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds -#define MMU_REQUIRED_FW_BUILDNR 132 +#define MMU_REQUIRED_FW_BUILDNR 310 #ifndef SNMM //#define SUPPORT_VERBOSITY diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 40a3a229..424d2a7e 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -497,7 +497,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 132 +#define MMU_REQUIRED_FW_BUILDNR 310 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 99dd1e65..0912748a 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -498,7 +498,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 132 +#define MMU_REQUIRED_FW_BUILDNR 310 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index d3badf6a..c02868c9 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -497,7 +497,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 132 +#define MMU_REQUIRED_FW_BUILDNR 310 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 2563f848..008f1b17 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -498,7 +498,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 132 +#define MMU_REQUIRED_FW_BUILDNR 310 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index c400b016..baebd0ec 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -623,7 +623,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 83 +#define MMU_REQUIRED_FW_BUILDNR 310 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 37512071..a99d38f7 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -623,7 +623,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 83 +#define MMU_REQUIRED_FW_BUILDNR 310 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning From 6c70d598100a6801e70e1020e0efa64671c164a1 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Mar 2019 15:05:10 +0100 Subject: [PATCH 021/168] mbl settings initialization fix --- Firmware/eeprom.h | 2 +- Firmware/mesh_bed_calibration.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index 56ee5f77..c96e1d8d 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -158,7 +158,7 @@ #define EEPROM_MBL_TYPE (EEPROM_UVLO_MESH_BED_LEVELING_FULL-1) //uint8_t for mesh bed leveling precision #define EEPROM_MBL_MAGNET_ELIMINATION (EEPROM_MBL_TYPE -1) #define EEPROM_MBL_POINTS_NR (EEPROM_MBL_MAGNET_ELIMINATION -1) //uint8_t number of points in one exis for mesh bed leveling -#define EEPROM_MBL_PROBE_NR (EEPROM_MBL_POINTS_NR-1) +#define EEPROM_MBL_PROBE_NR (EEPROM_MBL_POINTS_NR-1) //number of measurements for each point #define EEPROM_MMU_STEALTH (EEPROM_MBL_PROBE_NR-1) // !!!!! // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 0a675550..e50fb435 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3088,15 +3088,14 @@ void mbl_settings_init() { if (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) == 0xFF) { eeprom_update_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION, 1); } - if (eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR) == 0xFF) { - eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, 3); + if (eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR) == 0xFF) { + eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, 3); } - mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); + mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR); if (mbl_z_probe_nr == 0xFF) { mbl_z_probe_nr = 3; - eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr); + eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, mbl_z_probe_nr); } - } bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag) { From 32138ea09af8f3a1700d55d0c9e54eed49ce542d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Mar 2019 15:08:09 +0100 Subject: [PATCH 022/168] menu item alignment --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cae2f274..655b1590 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5309,7 +5309,7 @@ do\ {\ if (mmu_enabled)\ {\ - if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set); \ + if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set); \ else MENU_ITEM_FUNCTION_P(_i("MMU Mode[Stealth]"), lcd_silent_mode_mmu_set); \ }\ }\ From 900ee0c5efb8c60ff4fba889c2291de486f7d78f Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 13 Mar 2019 19:10:43 +0100 Subject: [PATCH 023/168] Update build environment to fix maximum flash size check. --- PF-build.sh | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 1875c689..f4f30085 100644 --- a/PF-build.sh +++ b/PF-build.sh @@ -117,7 +117,7 @@ if ! type zip > /dev/null; then fi ###End prepare bash enviroment -BUILD_ENV="1.0.1" +BUILD_ENV="1.0.2" SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" # List few useful data diff --git a/build.sh b/build.sh index 051f1352..3f81cd78 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -BUILD_ENV="1.0.1" +BUILD_ENV="1.0.2" SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )" if [ ! -d "build-env" ]; then From 72f51989fa7b3df34da645548a3c2227c58a0757 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 13 Mar 2019 19:41:09 +0100 Subject: [PATCH 024/168] compare measured Z-value during mesh bed leveling with Z-calibration value even for 7x7 mesh --- Firmware/Marlin_main.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2b22383b..140c680b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4447,7 +4447,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20; int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40; - bool has_z = (nMeasPoints == 3) && is_bed_z_jitter_data_valid(); //checks if we have data from Z calibration (offsets of the Z heiths of the 8 calibration points from the first point) + bool has_z = is_bed_z_jitter_data_valid(); //checks if we have data from Z calibration (offsets of the Z heiths of the 8 calibration points from the first point) #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 1) { has_z ? SERIAL_PROTOCOLPGM("Z jitter data from Z cal. valid.\n") : SERIAL_PROTOCOLPGM("Z jitter data from Z cal. not valid.\n"); @@ -4466,11 +4466,14 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) continue; //skip }*/ if (iy & 1) ix = (nMeasPoints - 1) - ix; // Zig zag + if (nMeasPoints == 7) //if we have 7x7 mesh, compare with Z-calibration for points which are in 3x3 mesh + { + has_z = ((ix % 3 == 0) && (iy % 3 == 0)) && is_bed_z_jitter_data_valid(); + } float z0 = 0.f; if (has_z && (mesh_point > 0)) { uint16_t z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1))); z0 = mbl.z_values[0][0] + *reinterpret_cast(&z_offset_u) * 0.01; - //#if 0 #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 1) { SERIAL_ECHOLNPGM(""); @@ -4481,7 +4484,6 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) SERIAL_ECHOLNPGM(""); } #endif // SUPPORT_VERBOSITY - //#endif } // Move Z up to MESH_HOME_Z_SEARCH. @@ -4511,7 +4513,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) // Go down until endstop is hit const float Z_CALIBRATION_THRESHOLD = 1.f; if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - kill_message = _T(MSG_BED_LEVELING_FAILED_POINT_LOW); + printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases. @@ -4521,16 +4523,16 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) st_synchronize(); if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - kill_message = _T(MSG_BED_LEVELING_FAILED_POINT_LOW); + printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { - kill_message = _i("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.");////MSG_BED_LEVELING_FAILED_PROBE_DISCONNECTED c=20 r=4 + printf_P(PSTR("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.\n")); break; } } if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point - kill_message = _i("Bed leveling failed. Sensor triggered too high. Waiting for reset.");////MSG_BED_LEVELING_FAILED_POINT_HIGH c=20 r=4 + printf_P(PSTR("Bed leveling failed. Sensor triggered too high. Waiting for reset.\n")); break; } #ifdef SUPPORT_VERBOSITY From 3b78e61b6836af27727ef5c77b00cf41851e413b Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 13 Mar 2019 21:01:56 +0100 Subject: [PATCH 025/168] Fix flash size check --- PF-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PF-build.sh b/PF-build.sh index f4f30085..7c1e26d4 100644 --- a/PF-build.sh +++ b/PF-build.sh @@ -76,6 +76,8 @@ # $2 = multi language OR english only [ALL/EN_ONLY] # $3 = development status [GOLD/RC/BETA/ALPHA/DEVEL/DEBUG] # If one argument is wrong a list of valid one will be shown +# 13 Mar 2019, 3d-gussner, MKbel updated the linux build enviromentto version 1.0.2 with an Fix maximum firmware flash size. +# So did I ###Check if OSTYPE is supported From 9e0e4198c5b2f9f30df4cba839d020793699dcdc Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 14 Mar 2019 01:52:44 +0100 Subject: [PATCH 026/168] Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update --- Firmware/Marlin_main.cpp | 2 +- Firmware/mesh_bed_calibration.cpp | 14 +++++++------- Firmware/mesh_bed_calibration.h | 8 ++++---- Firmware/ultralcd.cpp | 10 +++++----- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 6 +++--- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 6 +++--- .../variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 6 +++--- .../variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 6 +++--- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 6 +++--- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 6 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 140c680b..437af16f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4496,7 +4496,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) current_position[X_AXIS] = BED_X(ix, nMeasPoints); current_position[Y_AXIS] = BED_Y(iy, nMeasPoints); - + //printf_P(PSTR("[%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); #ifdef SUPPORT_VERBOSITY diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index e50fb435..acbe3408 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -978,7 +978,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i update_current_position_z(); //printf_P(PSTR("Zs: %f, Z: %f, delta Z: %f"), z_bckp, current_position[Z_AXIS], (z_bckp - current_position[Z_AXIS])); if (abs(current_position[Z_AXIS] - z_bckp) < 0.025) { - printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); + //printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); current_position[Z_AXIS] += 0.5; go_to_current(homing_feedrate[Z_AXIS]/60); current_position[Z_AXIS] = minimum_z; @@ -999,7 +999,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i // SERIAL_ECHOLNPGM(""); float dz = i?abs(current_position[Z_AXIS] - (z / i)):0; z += current_position[Z_AXIS]; - printf_P(PSTR("Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); + //printf_P(PSTR("Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); if (dz > 0.05) goto error;//deviation > 50um } current_position[Z_AXIS] = z; @@ -3107,13 +3107,13 @@ bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bo uint8_t valid_points_mask[7] = { //[X_MAX,Y_MAX] - 0b1111101, - 0b1110111, 0b1111111, - 0b0111011, - 0b1110111, 0b1111111, 0b1110111, + 0b1111011, + 0b1110111, + 0b1111111, + 0b1111111, //[0,0] }; if (meas_points == 3) { @@ -3130,7 +3130,7 @@ bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bo } void mbl_single_point_interpolation(uint8_t x, uint8_t y, uint8_t meas_points) { - printf_P(PSTR("x = %d; y = %d \n"), x, y); + //printf_P(PSTR("x = %d; y = %d \n"), x, y); uint8_t count = 0; float z = 0; if (mbl_point_measurement_valid(x, y + 1, meas_points, false)) { z += mbl.z_values[y + 1][x]; /*printf_P(PSTR("x; y+1: Z = %f \n"), mbl.z_values[y + 1][x]);*/ count++; } diff --git a/Firmware/mesh_bed_calibration.h b/Firmware/mesh_bed_calibration.h index 954db9c3..8adc1c11 100644 --- a/Firmware/mesh_bed_calibration.h +++ b/Firmware/mesh_bed_calibration.h @@ -6,10 +6,10 @@ #ifdef HEATBED_V2 -#define BED_X0 (3.f - BED_ZERO_REF_X) -#define BED_Y0 (10.4f - BED_ZERO_REF_Y) -#define BED_Xn (206.f - BED_ZERO_REF_X) -#define BED_Yn (202.4f - BED_ZERO_REF_Y) +#define BED_X0 (2.f - BED_ZERO_REF_X) //1 +#define BED_Y0 (9.4f - BED_ZERO_REF_Y) //1 +#define BED_Xn (206.f - BED_ZERO_REF_X) //205 +#define BED_Yn (213.4f - BED_ZERO_REF_Y) //205 #else diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 655b1590..d907e2c7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6687,14 +6687,14 @@ static void lcd_mesh_bed_leveling_settings() eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, (uint8_t)mbl_z_probe_nr); } MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); + if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); MENU_ITEM_EDIT_int3_P(_i("Z-probe nr."), &mbl_z_probe_nr, 1, 5); if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets eli [On]"), mbl_magnets_elimination_set); - else MENU_ITEM_FUNCTION_P(_i("Magnets comp. [Off]"), mbl_magnets_elimination_set); + if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_set); + else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_set); } - else menu_item_text_P(_i("Magnets comp. [N/A]")); + else menu_item_text_P(_i("Magnets comp.[N/A]")); MENU_END(); /*if(menu_leaving) { diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 424d2a7e..a6ca8c61 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -290,10 +290,10 @@ #define MBL_Z_STEP 0.01 // Mesh definitions -#define MESH_MIN_X 35 -#define MESH_MAX_X 238 +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 #define MESH_MIN_Y 6 -#define MESH_MAX_Y 202 +#define MESH_MAX_Y 210 // Mesh upsample definition #define MESH_NUM_X_POINTS 7 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 0912748a..4cd2e977 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -291,10 +291,10 @@ #define MBL_Z_STEP 0.01 // Mesh definitions -#define MESH_MIN_X 35 -#define MESH_MAX_X 238 +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 #define MESH_MIN_Y 6 -#define MESH_MAX_Y 202 +#define MESH_MAX_Y 210 // Mesh upsample definition #define MESH_NUM_X_POINTS 7 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index c02868c9..603274eb 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -290,10 +290,10 @@ #define MBL_Z_STEP 0.01 // Mesh definitions -#define MESH_MIN_X 35 -#define MESH_MAX_X 238 +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 #define MESH_MIN_Y 6 -#define MESH_MAX_Y 202 +#define MESH_MAX_Y 210 // Mesh upsample definition #define MESH_NUM_X_POINTS 7 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 008f1b17..a45d23c2 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -291,10 +291,10 @@ #define MBL_Z_STEP 0.01 // Mesh definitions -#define MESH_MIN_X 35 -#define MESH_MAX_X 238 +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 #define MESH_MIN_Y 6 -#define MESH_MAX_Y 202 +#define MESH_MAX_Y 210 // Mesh upsample definition #define MESH_NUM_X_POINTS 7 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index baebd0ec..d3e16855 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -400,10 +400,10 @@ #define MBL_Z_STEP 0.01 // Mesh definitions -#define MESH_MIN_X 35 -#define MESH_MAX_X 238 +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 #define MESH_MIN_Y 6 -#define MESH_MAX_Y 202 +#define MESH_MAX_Y 210 // Mesh upsample definition #define MESH_NUM_X_POINTS 7 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index a99d38f7..fed7863b 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -400,10 +400,10 @@ #define MBL_Z_STEP 0.01 // Mesh definitions -#define MESH_MIN_X 35 -#define MESH_MAX_X 238 +#define MESH_MIN_X 24 +#define MESH_MAX_X 228 #define MESH_MIN_Y 6 -#define MESH_MAX_Y 202 +#define MESH_MAX_Y 210 // Mesh upsample definition #define MESH_NUM_X_POINTS 7 From ef198856a470e471d81d90958291098e84045cea Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 14 Mar 2019 14:10:52 +0100 Subject: [PATCH 027/168] increase relative movement in Z to work better with higher hysteresis PINDAs --- Firmware/mesh_bed_calibration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index acbe3408..0aca64a5 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -968,7 +968,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i for (uint8_t i = 0; i < n_iter; ++ i) { - current_position[Z_AXIS] += 0.15; + current_position[Z_AXIS] += 0.2; float z_bckp = current_position[Z_AXIS]; go_to_current(homing_feedrate[Z_AXIS]/60); // Move back down slowly to find bed. From 6e26f61726330051cf122f8b5ac03145fa0507c8 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 14 Mar 2019 14:48:01 +0100 Subject: [PATCH 028/168] fixed 7x7 mesh bed leveling vs. Z calibration check --- Firmware/Marlin_main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 437af16f..7be151f9 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4472,16 +4472,17 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } float z0 = 0.f; if (has_z && (mesh_point > 0)) { - uint16_t z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1))); + uint16_t z_offset_u = 0; + if (nMeasPoints == 7) { + z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * ((ix/3) + iy - 1))); + } + else { + z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1))); + } z0 = mbl.z_values[0][0] + *reinterpret_cast(&z_offset_u) * 0.01; #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 1) { - SERIAL_ECHOLNPGM(""); - SERIAL_ECHOPGM("Bed leveling, point: "); - MYSERIAL.print(mesh_point); - SERIAL_ECHOPGM(", calibration z: "); - MYSERIAL.print(z0, 5); - SERIAL_ECHOLNPGM(""); + printf_P(PSTR("Bed leveling, point: %d, calibration Z stored in eeprom: %d, calibration z: %f \n"), mesh_point, z_offset_u, z0); } #endif // SUPPORT_VERBOSITY } From 80ef2686aec783b378db5771caf6b3377e0b3573 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 14 Mar 2019 18:17:40 +0100 Subject: [PATCH 029/168] mmu mode switching fix --- Firmware/mmu.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 087753a6..f82ea05a 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -339,7 +339,6 @@ void mmu_loop(void) else if ((eeprom_read_byte((uint8_t*)EEPROM_MMU_STEALTH) != SilentModeMenu_MMU) && mmu_ready) { DEBUG_PRINTF_P(PSTR("MMU <= 'M%d'\n"), SilentModeMenu_MMU); mmu_printf_P(PSTR("M%d\n"), SilentModeMenu_MMU); - mmu_ready = false; mmu_state = S::SwitchMode; } else if ((mmu_last_response + 300) < _millis()) //request every 300ms @@ -466,7 +465,6 @@ void mmu_loop(void) { DEBUG_PRINTF_P(PSTR("MMU => 'ok'\n")); eeprom_update_byte((uint8_t*)EEPROM_MMU_STEALTH, SilentModeMenu_MMU); - mmu_ready = true; mmu_state = S::Idle; } else if ((mmu_last_request + MMU_CMD_TIMEOUT) < _millis()) From ffe45bdef33a4a16d06fa5e5a966218eb3f2755b Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 15 Mar 2019 03:38:37 +0100 Subject: [PATCH 030/168] Disable mmu filament cutter feature. --- Firmware/mmu.cpp | 36 ++++++++++--------- Firmware/mmu.h | 2 ++ Firmware/ultralcd.cpp | 16 ++++++++- .../variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 1 + .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 1 + .../1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 1 + .../1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 1 + .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 1 + .../variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 1 + 9 files changed, 43 insertions(+), 17 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 65c73ca3..8cdfc6c6 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1365,25 +1365,27 @@ bFilamentAction=false; // NOT in "mmu_load_to_nozzle_ } } +#ifdef MMU_HAS_CUTTER void mmu_cut_filament(uint8_t filament_nr) { -bFilamentAction=false; // NOT in "mmu_load_to_nozzle_menu()" - if (degHotend0() > EXTRUDE_MINTEMP) - { - LcdUpdateDisabler disableLcdUpdate; - lcd_clear(); - lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18 r=1 - lcd_print(" "); - lcd_print(filament_nr + 1); - mmu_filament_ramming(); - mmu_command(MmuCmd::K0 + filament_nr); - manage_response(false, false, MMU_UNLOAD_MOVE); - } - else - { - show_preheat_nozzle_warning(); - } + bFilamentAction=false; // NOT in "mmu_load_to_nozzle_menu()" + if (degHotend0() > EXTRUDE_MINTEMP) + { + LcdUpdateDisabler disableLcdUpdate; + lcd_clear(); + lcd_set_cursor(0, 1); lcd_puts_P(_i("Cutting filament")); //// c=18 r=1 + lcd_print(" "); + lcd_print(filament_nr + 1); + mmu_filament_ramming(); + mmu_command(MmuCmd::K0 + filament_nr); + manage_response(false, false, MMU_UNLOAD_MOVE); + } + else + { + show_preheat_nozzle_warning(); + } } +#endif //MMU_HAS_CUTTER void mmu_eject_filament(uint8_t filament, bool recover) { @@ -1457,11 +1459,13 @@ void mmu_continue_loading() if(mmu_load_fail < 255) eeprom_update_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL, mmu_load_fail + 1); if(mmu_load_fail_tot < 65535) eeprom_update_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT, mmu_load_fail_tot + 1); +#ifdef MMU_HAS_CUTTER if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { mmu_command(MmuCmd::K0 + tmp_extruder); manage_response(true, true, MMU_UNLOAD_MOVE); } +#endif //MMU_HAS_CUTTER mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); diff --git a/Firmware/mmu.h b/Firmware/mmu.h index c2e8b713..9c233d05 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -132,7 +132,9 @@ extern bool mmu_check_version(); extern void mmu_show_warning(); extern void lcd_mmu_load_to_nozzle(uint8_t filament_nr); extern void mmu_eject_filament(uint8_t filament, bool recover); +#ifdef MMU_HAS_CUTTER extern void mmu_cut_filament(uint8_t filament_nr); +#endif //MMU_HAS_CUTTER extern void mmu_continue_loading(); extern void mmu_filament_ramming(); extern void mmu_wait_for_heater_blocking(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6bd94642..15ca1121 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -142,7 +142,9 @@ static void lcd_menu_fails_stats_mmu_total(); static void mmu_fil_eject_menu(); static void mmu_load_to_nozzle_menu(); +#ifdef MMU_HAS_CUTTER static void mmu_cut_filament_menu(); +#endif //MMU_HAS_CUTTER #if defined(TMC2130) || defined(FILAMENT_SENSOR) static void lcd_menu_fails_stats(); @@ -2295,6 +2297,7 @@ void lcd_set_fan_check() { eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled); } +#ifdef MMU_HAS_CUTTER void lcd_cutter_enabled() { if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) @@ -2306,6 +2309,7 @@ void lcd_cutter_enabled() eeprom_update_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED, 1); } } +#endif //MMU_HAS_CUTTER void lcd_set_filament_autoload() { fsensor_autoload_set(!fsensor_autoload_enabled); @@ -2536,10 +2540,12 @@ if(current_temperature[0]>(target_temperature[0]*0.95)) menu_submenu(mmu_fil_eject_menu); break; case e_FILAMENT_ACTION_mmuCut: +#ifdef MMU_HAS_CUTTER nLevel=bFilamentPreheatState?1:2; bFilamentAction=true; menu_back(nLevel); menu_submenu(mmu_cut_filament_menu); +#endif //MMU_HAS_CUTTER break; case e_FILAMENT_ACTION_none: break; @@ -5220,6 +5226,7 @@ do\ }\ while(0)\ +#ifdef MMU_HAS_CUTTER static bool settingsCutter() { if (mmu_enabled) @@ -5241,7 +5248,10 @@ do\ {\ if(settingsCutter()) return;\ }\ -while(0)\ +while(0) +#else +#define SETTINGS_CUTTER +#endif //MMU_HAS_CUTTER #ifdef TMC2130 #define SETTINGS_SILENT_MODE \ @@ -5919,6 +5929,7 @@ static void mmu_fil_eject_menu() } } +#ifdef MMU_HAS_CUTTER template static void mmu_cut_filament() { @@ -5950,6 +5961,7 @@ else { else mFilamentMenu(); } } +#endif //MMU_HAS_CUTTER #ifdef SNMM static void fil_unload_menu() @@ -6423,7 +6435,9 @@ static void lcd_main_menu() //bFilamentFirstRun=true; MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), extr_unload_); MENU_ITEM_SUBMENU_P(_i("Eject filament"), mmu_fil_eject_menu); +#ifdef MMU_HAS_CUTTER MENU_ITEM_SUBMENU_P(_i("Cut filament"), mmu_cut_filament_menu); +#endif //MMU_HAS_CUTTER } else { diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 40a3a229..18007e06 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -500,6 +500,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial +//#define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index e316c4f0..b79147ae 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -501,6 +501,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial +//#define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index d3badf6a..196cba00 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -500,6 +500,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial +//#define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 2563f848..68310625 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -501,6 +501,7 @@ #define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial +//#define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index c400b016..04b73223 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -626,6 +626,7 @@ #define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial +//#define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 37512071..edac6c0e 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -626,6 +626,7 @@ #define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial +//#define MMU_HAS_CUTTER #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning #endif //__CONFIGURATION_PRUSA_H From 0ca52216f3d0c8e94b831addb1f4118bef23dec5 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 15 Mar 2019 13:14:32 +0100 Subject: [PATCH 031/168] Revert "variants update" This reverts commit c3a95ab79baa4dfebd346fb7f99308b0affc39f5. --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 2 +- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index a036a11a..3b9f7698 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -438,7 +438,7 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 132 #ifndef SNMM //#define SUPPORT_VERBOSITY diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index d2ada705..2d00929f 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -438,7 +438,7 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 132 #ifndef SNMM //#define SUPPORT_VERBOSITY diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index a6ca8c61..63d03dfe 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -497,7 +497,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 4cd2e977..262ec865 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -498,7 +498,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index 603274eb..bf91b732 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -497,7 +497,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index a45d23c2..ff7e1f58 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -498,7 +498,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU2 and printer on serial diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index d3e16855..4a430d7d 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -623,7 +623,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index fed7863b..9ddb71e5 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -623,7 +623,7 @@ //#define SUPPORT_VERBOSITY -#define MMU_REQUIRED_FW_BUILDNR 310 +#define MMU_REQUIRED_FW_BUILDNR 83 #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning From 7c5e9500a8ed69f5f459856c1c517848d4f27a4f Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 15 Mar 2019 20:00:07 +0100 Subject: [PATCH 032/168] version change --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index a64e90a1..b20db88c 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.6.0" -#define FW_COMMIT_NR 2069 +#define FW_VERSION "3.7.0" +#define FW_COMMIT_NR 2174 // 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 e37c2e0b2e4dad710660a75374a4be92124284d5 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 15 Mar 2019 20:01:02 +0100 Subject: [PATCH 033/168] version change --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index b20db88c..e086a16c 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 2174 +#define FW_VERSION "3.7.0-RC1" +#define FW_COMMIT_NR 2175 // 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 4100bd33a798c6b805b740967a1a2129d24b9697 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 19 Mar 2019 13:53:58 +0100 Subject: [PATCH 034/168] Fix Dcodes compilation errors and warnings. --- Firmware/Dcodes.cpp | 24 ++++++++++++------------ Firmware/Marlin_main.cpp | 2 +- Firmware/temperature.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Firmware/Dcodes.cpp b/Firmware/Dcodes.cpp index a21e3220..44dfc465 100644 --- a/Firmware/Dcodes.cpp +++ b/Firmware/Dcodes.cpp @@ -5,6 +5,9 @@ #include #include +#define SHOW_TEMP_ADC_VALUES +#include "temperature.h" + #define DBG(args...) printf_P(args) @@ -150,7 +153,7 @@ void dcode_3() #include #include "bootapp.h" -/* +#if 0 #define FLASHSIZE 0x40000 #define RAMSIZE 0x2000 @@ -169,9 +172,10 @@ extern float current_temperature_pinda; extern float axis_steps_per_unit[NUM_AXIS]; -//#define LOG(args...) printf(args) +#define LOG(args...) printf(args) +#endif //0 #define LOG(args...) -*/ + #ifdef DEBUG_DCODES void dcode__1() @@ -227,7 +231,7 @@ void dcode_2() count = parse_hex(strchr_pointer + 1, data, 16); if (count > 0) { - for (int i = 0; i < count; i++) + for (uint16_t i = 0; i < count; i++) *((uint8_t*)(address + i)) = data[i]; LOG("%d bytes written to RAM at address %04x", count, address); } @@ -380,7 +384,7 @@ void dcode_8() { uint16_t offs = 0; if (i > 0) offs = eeprom_read_word(((uint16_t*)EEPROM_PROBE_TEMP_SHIFT) + (i - 1)); - float foffs = ((float)offs) / axis_steps_per_unit[Z_AXIS]; + float foffs = ((float)offs) / cs.axis_steps_per_unit[Z_AXIS]; offs = 1000 * foffs; printf_P(PSTR("temp_pinda=%dC temp_shift=%dum\n"), 35 + i * 5, offs); } @@ -423,10 +427,6 @@ const char* dcode_9_ADC_name(uint8_t i) return 0; } -extern int current_temperature_raw[EXTRUDERS]; -extern int current_temperature_bed_raw; -extern int current_temperature_raw_pinda; - #ifdef AMBIENT_THERMISTOR extern int current_temperature_raw_ambient; #endif //AMBIENT_THERMISTOR @@ -606,16 +606,16 @@ void dcode_2130() else if (strncmp(strchr_pointer + 7, "mres", 4) == 0) { uint8_t mres = strchr_pointer[11] - '0'; - if ((mres >= 0) && (mres <= 8)) + if (mres <= 8) { st_synchronize(); uint16_t res = tmc2130_get_res(axis); uint16_t res_new = tmc2130_mres2usteps(mres); tmc2130_set_res(axis, res_new); if (res_new > res) - axis_steps_per_unit[axis] *= (res_new / res); + cs.axis_steps_per_unit[axis] *= (res_new / res); else - axis_steps_per_unit[axis] /= (res / res_new); + cs.axis_steps_per_unit[axis] /= (res / res_new); } } else if (strncmp(strchr_pointer + 7, "wave", 4) == 0) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 7be151f9..669008bd 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7251,7 +7251,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) dcode_2130(); break; #endif //TMC2130 -#ifdef FILAMENT_SENSOR +#if (defined (FILAMENT_SENSOR) && defined(PAT9125)) case 9125: //! D9125 - FILAMENT_SENSOR dcode_9125(); break; #endif //FILAMENT_SENSOR diff --git a/Firmware/temperature.h b/Firmware/temperature.h index daee5c08..ba9632cf 100644 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -57,7 +57,7 @@ extern int target_temperature_bed; extern float current_temperature_bed; #ifdef PINDA_THERMISTOR -//extern int current_temperature_raw_pinda; +extern uint16_t current_temperature_raw_pinda; extern float current_temperature_pinda; #endif From cfd185f31598136958ad0ffe4b6a6d3ce2e25bb5 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 19 Mar 2019 14:50:57 +0100 Subject: [PATCH 035/168] Phase correct PWM for bed, frequency 40KHz. --- Firmware/timer02.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 8309f940..113c7246 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -11,19 +11,11 @@ uint8_t timer02_pwm0 = 0; + void timer02_set_pwm0(uint8_t pwm0) { - if (timer02_pwm0 == pwm0) return; - if (pwm0) - { - TCCR0A |= (2 << COM0B0); - OCR0B = pwm0 - 1; - } - else - { - TCCR0A &= ~(2 << COM0B0); - OCR0B = 0; - } + TCCR0A |= (2 << COM0B0); //switch OC0B to OCR mode + OCR0B = (uint16_t)OCR0A * pwm0 / 255; timer02_pwm0 = pwm0; } @@ -39,13 +31,12 @@ void timer02_init(void) TIMSK0 &= ~(1< Date: Tue, 19 Mar 2019 20:28:31 +0000 Subject: [PATCH 036/168] 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 175f840d16790ea6030fe516fe7f6568ef7145f2 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 21 Mar 2019 18:46:07 +0100 Subject: [PATCH 037/168] return statement not used (fixes Pronterface issues) --- Firmware/Marlin_main.cpp | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 669008bd..19b0d868 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6991,13 +6991,16 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (mmu_enabled) { tmp_extruder = choose_menu_P(_T(MSG_CHOOSE_FILAMENT), _T(MSG_FILAMENT)); - if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) { - printf_P(PSTR("Duplicit T-code ignored.\n")); - return; //dont execute the same T-code twice in a row + if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row + { + printf_P(PSTR("Duplicate T-code ignored.\n")); + } + else + { + st_synchronize(); + mmu_command(MmuCmd::T0 + tmp_extruder); + manage_response(true, true, MMU_TCODE_MOVE); } - st_synchronize(); - mmu_command(MmuCmd::T0 + tmp_extruder); - manage_response(true, true, MMU_TCODE_MOVE); } } else if (*(strchr_pointer + index) == 'c') { //load to from bondtech gears to nozzle (nozzle should be preheated) @@ -7033,20 +7036,23 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (mmu_enabled) { - if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) { - printf_P(PSTR("Duplicit T-code ignored.\n")); - return; //dont execute the same T-code twice in a row + if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row + { + printf_P(PSTR("Duplicate T-code ignored.\n")); } - mmu_command(MmuCmd::T0 + tmp_extruder); + else + { + mmu_command(MmuCmd::T0 + tmp_extruder); - manage_response(true, true, MMU_TCODE_MOVE); - mmu_continue_loading(); - mmu_extruder = tmp_extruder; //filament change is finished + manage_response(true, true, MMU_TCODE_MOVE); + mmu_continue_loading(); + mmu_extruder = tmp_extruder; //filament change is finished - if (load_to_nozzle)// for single material usage with mmu - { - mmu_load_to_nozzle(); - } + if (load_to_nozzle)// for single material usage with mmu + { + mmu_load_to_nozzle(); + } + } } else { From 576bfb17c738bd2ba5f4024bcfc7842bb71ad9f5 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 21 Mar 2019 18:51:54 +0100 Subject: [PATCH 038/168] whitespace --- 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 19b0d868..caf23b5e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7037,7 +7037,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (mmu_enabled) { if ((tmp_extruder == mmu_extruder) && mmu_fil_loaded) //dont execute the same T-code twice in a row - { + { printf_P(PSTR("Duplicate T-code ignored.\n")); } else From fbe68cb287370927fb9811bb9df0594eccc4b147 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 21 Mar 2019 19:37:34 +0100 Subject: [PATCH 039/168] variables scope changed --- Firmware/mmu.cpp | 4 ++-- Firmware/mmu.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 5cf650c9..dad00f8e 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -58,9 +58,9 @@ static S mmu_state = S::Disabled; MmuCmd mmu_cmd = MmuCmd::None; //idler ir sensor -uint8_t mmu_idl_sens = 0; +static uint8_t mmu_idl_sens = 0; bool ir_sensor_detected = false; -bool mmu_loading_flag = false; //when set to true, we assume that mmu2 unload was finished and loading phase is now performed; printer can send 'A' to mmu2 to abort loading process +static bool mmu_loading_flag = false; //when set to true, we assume that mmu2 unload was finished and loading phase is now performed; printer can send 'A' to mmu2 to abort loading process uint8_t mmu_extruder = MMU_FILAMENT_UNKNOWN; diff --git a/Firmware/mmu.h b/Firmware/mmu.h index 9c233d05..41e0ba1f 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -15,7 +15,6 @@ extern uint8_t tmp_extruder; extern int8_t mmu_finda; extern bool ir_sensor_detected; -extern bool mmu_loading_flag; extern int16_t mmu_version; extern int16_t mmu_buildnr; From 6c28ed6349692f4b35ea358ff7253ef13a621da4 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 21 Mar 2019 22:48:57 +0100 Subject: [PATCH 040/168] Convert lcd_selftest_error() first parameter to enum class. --- Firmware/ultralcd.cpp | 68 ++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bee46ca2..79f56b70 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -165,7 +165,7 @@ static bool lcd_selfcheck_pulleys(int axis); #endif //TMC2130 static bool lcd_selfcheck_check_heater(bool _isbed); -enum class testScreen +enum class testScreen : uint_least8_t { extruderFan, printFan, @@ -184,6 +184,22 @@ enum class testScreen home, }; +enum class TestError : uint_least8_t +{ + unused, + heater, + bed, + endstops, + motor, + endstop, + printFan, + extruderFan, + pulley, + axis, + swappedFan, + wiringFsensor, +}; + 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); @@ -194,7 +210,7 @@ static bool lcd_selftest_fan_dialog(int _fan); static bool lcd_selftest_fsensor(); #endif //PAT9125 static bool selftest_irsensor(); -static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2); +static void lcd_selftest_error(TestError error, const char *_error_1, const char *_error_2); static void lcd_colorprint_change(); #ifdef SNMM static int get_ext_nr(); @@ -7184,7 +7200,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { if (axis == Y_AXIS) _error_1 = "Y"; if (axis == Z_AXIS) _error_1 = "Z"; - lcd_selftest_error(9, _error_1, NULL); + lcd_selftest_error(TestError::axis, _error_1, NULL); current_position[axis] = 0; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); reset_crash_det(axis); @@ -7202,7 +7218,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { if (axis == Y_AXIS) _error_1 = "Y"; if (axis == Z_AXIS) _error_1 = "Z"; - lcd_selftest_error(8, _error_1, NULL); + lcd_selftest_error(TestError::pulley, _error_1, NULL); current_position[axis] = 0; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); reset_crash_det(axis); @@ -7309,11 +7325,11 @@ static bool lcd_selfcheck_axis(int _axis, int _travel) if (_travel_done >= _travel) { - lcd_selftest_error(5, _error_1, _error_2); + lcd_selftest_error(TestError::endstop, _error_1, _error_2); } else { - lcd_selftest_error(4, _error_1, _error_2); + lcd_selftest_error(TestError::motor, _error_1, _error_2); } } @@ -7479,12 +7495,12 @@ static bool lcd_selfcheck_check_heater(bool _isbed) } else { - lcd_selftest_error(1, "", ""); + lcd_selftest_error(TestError::heater, "", ""); } } else { - lcd_selftest_error(2, "", ""); + lcd_selftest_error(TestError::bed, "", ""); } manage_heater(); @@ -7493,7 +7509,7 @@ static bool lcd_selfcheck_check_heater(bool _isbed) return _stepresult; } -static void lcd_selftest_error(int _error_no, const char *_error_1, const char *_error_2) +static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2) { lcd_beeper_quick_feedback(); @@ -7509,21 +7525,21 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(0, 1); lcd_puts_P(_i("Please check :"));////MSG_SELFTEST_PLEASECHECK c=0 r=0 - switch (_error_no) + switch (testError) { - case 1: + case TestError::heater: lcd_set_cursor(0, 2); lcd_puts_P(_i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR c=0 r=0 lcd_set_cursor(0, 3); lcd_puts_P(_i("Not connected"));////MSG_SELFTEST_NOTCONNECTED c=0 r=0 break; - case 2: + case TestError::bed: lcd_set_cursor(0, 2); lcd_puts_P(_i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER c=0 r=0 lcd_set_cursor(0, 3); lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); break; - case 3: + case TestError::endstops: lcd_set_cursor(0, 2); lcd_puts_P(_i("Endstops"));////MSG_SELFTEST_ENDSTOPS c=0 r=0 lcd_set_cursor(0, 3); @@ -7531,7 +7547,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(17, 3); lcd_print(_error_1); break; - case 4: + case TestError::motor: lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_SELFTEST_MOTOR)); lcd_set_cursor(18, 2); @@ -7541,7 +7557,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_2); break; - case 5: + case TestError::endstop: lcd_set_cursor(0, 2); lcd_puts_P(_i("Endstop not hit"));////MSG_SELFTEST_ENDSTOP_NOTHIT c=20 r=1 lcd_set_cursor(0, 3); @@ -7549,7 +7565,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_1); break; - case 6: + case TestError::printFan: lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_SELFTEST_COOLING_FAN)); lcd_set_cursor(0, 3); @@ -7557,7 +7573,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_1); break; - case 7: + case TestError::extruderFan: lcd_set_cursor(0, 2); lcd_puts_P(_T(MSG_SELFTEST_EXTRUDER_FAN)); lcd_set_cursor(0, 3); @@ -7565,7 +7581,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_1); break; - case 8: + case TestError::pulley: lcd_set_cursor(0, 2); lcd_puts_P(_i("Loose pulley"));////MSG_LOOSE_PULLEY c=20 r=1 lcd_set_cursor(0, 3); @@ -7573,7 +7589,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_1); break; - case 9: + case TestError::axis: lcd_set_cursor(0, 2); lcd_puts_P(_i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH c=0 r=0 lcd_set_cursor(0, 3); @@ -7581,7 +7597,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_1); break; - case 10: + case TestError::swappedFan: lcd_set_cursor(0, 2); lcd_puts_P(_i("Front/left fans"));////MSG_SELFTEST_FANS c=0 r=0 lcd_set_cursor(0, 3); @@ -7589,7 +7605,7 @@ static void lcd_selftest_error(int _error_no, const char *_error_1, const char * lcd_set_cursor(18, 3); lcd_print(_error_1); break; - case 11: + case TestError::wiringFsensor: lcd_set_cursor(0, 2); lcd_puts_P(_i("Filament sensor"));////MSG_FILAMENT_SENSOR c=20 r=0 lcd_set_cursor(0, 3); @@ -7796,7 +7812,7 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite) static bool lcd_selftest_fan_dialog(int _fan) { bool _result = true; - int _errno = 7; + TestError testError = TestError::extruderFan; switch (_fan) { case 0: fanSpeed = 0; @@ -7851,7 +7867,7 @@ 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; _errno = 6; //print fan not spinning + _result = false; testError = TestError::printFan; } #ifdef FAN_SOFT_PWM else { @@ -7862,10 +7878,10 @@ static bool lcd_selftest_fan_dialog(int _fan) _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 - if (!_result) _errno = 6; //print fan not spinning + if (!_result) testError = TestError::printFan; } else { - _errno = 10; //swapped fans + testError = TestError::swappedFan; } } @@ -7877,7 +7893,7 @@ static bool lcd_selftest_fan_dialog(int _fan) } if (!_result) { - lcd_selftest_error(_errno, NULL, NULL); + lcd_selftest_error(testError, NULL, NULL); } return _result; } From ba23b1b2c580d6f86e4f138daeb10820c76021a6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 21 Mar 2019 22:50:46 +0100 Subject: [PATCH 041/168] Remove unused. --- Firmware/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 79f56b70..1729ec58 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -186,7 +186,6 @@ enum class testScreen : uint_least8_t enum class TestError : uint_least8_t { - unused, heater, bed, endstops, From 91779a5d04d6ae1cc6cba582187a116ca30627b6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 21 Mar 2019 23:36:59 +0100 Subject: [PATCH 042/168] Add filament sensor false triggering message. --- Firmware/messages.c | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 029cf0c6..faa5283d 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -78,6 +78,7 @@ 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 diff --git a/Firmware/messages.h b/Firmware/messages.h index 5083b26d..752195e9 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -80,6 +80,7 @@ extern const char MSG_SELFTEST_FAN_YES[]; extern const char MSG_SELFTEST_CHECK_BED[]; extern const char MSG_SELFTEST_CHECK_FSENSOR[]; extern const char MSG_SELFTEST_MOTOR[]; +extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; extern const char MSG_SILENT_MODE_OFF[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1729ec58..f5c44db6 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -197,6 +197,7 @@ enum class TestError : uint_least8_t axis, swappedFan, wiringFsensor, + triggeringFsensor, }; static int lcd_selftest_screen(testScreen screen, int _progress, int _progress_scale, bool _clear, int _delay); @@ -7606,10 +7607,16 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const break; case TestError::wiringFsensor: lcd_set_cursor(0, 2); - lcd_puts_P(_i("Filament sensor"));////MSG_FILAMENT_SENSOR c=20 r=0 + lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); lcd_set_cursor(0, 3); lcd_puts_P(_T(MSG_SELFTEST_WIRINGERROR)); break; + case TestError::triggeringFsensor: + lcd_set_cursor(0, 2); + lcd_puts_P(_T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_set_cursor(0, 3); + lcd_puts_P(_i("False triggering"));////c=20 r=0 + break; } _delay(1000); @@ -7685,7 +7692,11 @@ static bool selftest_irsensor() mmu_load_step(false); while (blocks_queued()) { - if (PIN_GET(IR_SENSOR_PIN) == 0) return false; + if (PIN_GET(IR_SENSOR_PIN) == 0) + { + lcd_selftest_error(TestError::triggeringFsensor, "", ""); + return false; + } #ifdef TMC2130 manage_heater(); // Vojtech: Don't disable motors inside the planner! @@ -7941,7 +7952,8 @@ static int lcd_selftest_screen(testScreen screen, int _progress, int _progress_s } else if (screen >= testScreen::fsensor && screen <= testScreen::fsensorOk) { - lcd_puts_at_P(0, 2, _i("Filament sensor:"));////MSG_SELFTEST_FILAMENT_SENSOR c=18 r=0 + lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_FILAMENT_SENSOR)); + lcd_putc(':'); lcd_set_cursor(18, 2); (screen == testScreen::fsensor) ? lcd_print(_indicator) : lcd_print("OK"); } From c45a7f86410b62da7f37976da643a190ea9c3e2c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 21 Mar 2019 23:50:01 +0100 Subject: [PATCH 043/168] Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f5c44db6..8bdb00c2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7640,7 +7640,7 @@ static bool lcd_selftest_fsensor(void) fsensor_init(); if (fsensor_not_responding) { - lcd_selftest_error(11, NULL, NULL); + lcd_selftest_error(TestError::wiringFsensor, NULL, NULL); } return (!fsensor_not_responding); } From d1c5c0390718f4cfd1a9f95a2ae12f870698c379 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 22 Mar 2019 00:03:14 +0100 Subject: [PATCH 044/168] Fix compile error for manual fan check. --- Firmware/ultralcd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8bdb00c2..0513356f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6921,14 +6921,13 @@ bool lcd_selftest() KEEPALIVE_STATE(IN_HANDLER); _progress = lcd_selftest_screen(testScreen::extruderFan, _progress, 3, true, 2000); -#if (defined(FANCHECK) && defined(TACH_0)) +#if (defined(FANCHECK) && defined(TACH_0)) _result = lcd_selftest_fan_dialog(0); #else //defined(TACH_0) _result = lcd_selftest_manual_fan_check(0, false); if (!_result) { - const char *_err; - lcd_selftest_error(7, _err, _err); //extruder fan not spinning + lcd_selftest_error(TestError::extruderFan, "", ""); } #endif //defined(TACH_0) From 8582babddb2b3d16485b484070d28d2d79628882 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 22 Mar 2019 00:08:44 +0100 Subject: [PATCH 045/168] Fix compile error for manual fan check. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0513356f..b42eacf2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6941,7 +6941,7 @@ bool lcd_selftest() _result = lcd_selftest_manual_fan_check(1, false); if (!_result) { - lcd_selftest_error(6, 0, 0); //print fan not spinning + lcd_selftest_error(TestError::printFan, "", ""); //print fan not spinning } #endif //defined(TACH_1) From 89f1a3bacfb7e70f35775ba43e5fa8a47e2809b6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 22 Mar 2019 00:11:02 +0100 Subject: [PATCH 046/168] Fix compile error for non TMC2130 pulley check. --- Firmware/ultralcd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b42eacf2..192cc8f1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7368,7 +7368,7 @@ static bool lcd_selfcheck_pulleys(int axis) st_synchronize(); if (((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING) == 1) || ((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1)) { - lcd_selftest_error(8, (axis == 0) ? "X" : "Y", ""); + lcd_selftest_error(TestError::pulley, (axis == 0) ? "X" : "Y", ""); return(false); } } @@ -7386,7 +7386,7 @@ static bool lcd_selfcheck_pulleys(int axis) return(true); } else { - lcd_selftest_error(8, (axis == 0) ? "X" : "Y", ""); + lcd_selftest_error(TestError::pulley, (axis == 0) ? "X" : "Y", ""); return(false); } } @@ -7395,7 +7395,7 @@ static bool lcd_selfcheck_pulleys(int axis) plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[3], manual_feedrate[0] / 60, active_extruder); st_synchronize(); if (_millis() > timeout_counter) { - lcd_selftest_error(8, (axis == 0) ? "X" : "Y", ""); + lcd_selftest_error(TestError::pulley, (axis == 0) ? "X" : "Y", ""); return(false); } } From 966e772702c5ad634d1cc76660eb0022043ef7aa Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 22 Mar 2019 00:14:29 +0100 Subject: [PATCH 047/168] Fix compile error for non TMC2130 endstops check. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 192cc8f1..e07dd4b7 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7428,7 +7428,7 @@ static bool lcd_selfcheck_endstops() if ((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING) == 1) strcat(_error, "X"); if ((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING) == 1) strcat(_error, "Y"); if ((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING) == 1) strcat(_error, "Z"); - lcd_selftest_error(3, _error, ""); + lcd_selftest_error(TestError::endstops, _error, ""); } manage_heater(); manage_inactivity(true); From baeee5817e50ed9f0e4e96ac164ce75694e37213 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 22 Mar 2019 00:24:22 +0100 Subject: [PATCH 048/168] Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash. --- Firmware/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index e07dd4b7..13058569 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7199,7 +7199,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { if (axis == Y_AXIS) _error_1 = "Y"; if (axis == Z_AXIS) _error_1 = "Z"; - lcd_selftest_error(TestError::axis, _error_1, NULL); + lcd_selftest_error(TestError::axis, _error_1, ""); current_position[axis] = 0; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); reset_crash_det(axis); @@ -7217,7 +7217,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { if (axis == Y_AXIS) _error_1 = "Y"; if (axis == Z_AXIS) _error_1 = "Z"; - lcd_selftest_error(TestError::pulley, _error_1, NULL); + lcd_selftest_error(TestError::pulley, _error_1, ""); current_position[axis] = 0; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); reset_crash_det(axis); @@ -7639,7 +7639,7 @@ static bool lcd_selftest_fsensor(void) fsensor_init(); if (fsensor_not_responding) { - lcd_selftest_error(TestError::wiringFsensor, NULL, NULL); + lcd_selftest_error(TestError::wiringFsensor, "", ""); } return (!fsensor_not_responding); } @@ -7902,7 +7902,7 @@ static bool lcd_selftest_fan_dialog(int _fan) } if (!_result) { - lcd_selftest_error(testError, NULL, NULL); + lcd_selftest_error(testError, "", ""); } return _result; } From a9ce38df711485778ae1090c81df69f46f24e724 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 26 Mar 2019 17:14:05 +0100 Subject: [PATCH 049/168] Function for decision if we have valid Z-calibration data in eeprom fixed, mesh bed leveling: possible crash fix, temporaty debug info on serial line. --- Firmware/Marlin_main.cpp | 39 ++++++++++++++++---------- Firmware/mesh_bed_calibration.cpp | 46 ++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 27 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 669008bd..76d26989 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4438,7 +4438,10 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) bool clamped = world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); clamped ? SERIAL_PROTOCOLPGM("First calibration point clamped.\n") : SERIAL_PROTOCOLPGM("No clamping for first calibration point.\n"); } - #endif //SUPPORT_VERBOSITY + #else //SUPPORT_VERBOSITY + world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); + #endif //SUPPORT_VERBOSITY + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate[X_AXIS] / 30, active_extruder); // Wait until the move is finished. st_synchronize(); @@ -4475,21 +4478,24 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) uint16_t z_offset_u = 0; if (nMeasPoints == 7) { z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * ((ix/3) + iy - 1))); + printf_P(PSTR("[%d;%d]: Z_offset = %d \n"), ix, iy, z_offset_u); } else { z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1))); + printf_P(PSTR("[%d;%d]: Z_offset = %d \n"), ix, iy, z_offset_u); } z0 = mbl.z_values[0][0] + *reinterpret_cast(&z_offset_u) * 0.01; - #ifdef SUPPORT_VERBOSITY - if (verbosity_level >= 1) { + //#ifdef SUPPORT_VERBOSITY + //if (verbosity_level >= 1) { printf_P(PSTR("Bed leveling, point: %d, calibration Z stored in eeprom: %d, calibration z: %f \n"), mesh_point, z_offset_u, z0); - } - #endif // SUPPORT_VERBOSITY + //} + //#endif // SUPPORT_VERBOSITY } // Move Z up to MESH_HOME_Z_SEARCH. if((ix == 0) && (iy == 0)) current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; else current_position[Z_AXIS] += 2.f / nMeasPoints; //use relative movement from Z coordinate where PINDa triggered on previous point. This makes calibration faster. + float init_z_bckp = current_position[Z_AXIS]; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); @@ -4497,43 +4503,48 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) current_position[X_AXIS] = BED_X(ix, nMeasPoints); current_position[Y_AXIS] = BED_Y(iy, nMeasPoints); - //printf_P(PSTR("[%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); + printf_P(PSTR("[%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); - world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); + #ifdef SUPPORT_VERBOSITY if (verbosity_level >= 1) { - + clamped = world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); SERIAL_PROTOCOL(mesh_point); clamped ? SERIAL_PROTOCOLPGM(": xy clamped.\n") : SERIAL_PROTOCOLPGM(": no xy clamping\n"); } + #else //SUPPORT_VERBOSITY + world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); #endif // SUPPORT_VERBOSITY + printf_P(PSTR("after clamping: [%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], XY_AXIS_FEEDRATE, active_extruder); st_synchronize(); // Go down until endstop is hit const float Z_CALIBRATION_THRESHOLD = 1.f; if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); + //printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); + printf_P("Point too low 1 \n"); break; } - if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases. - + if (init_z_bckp - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases. + printf_P(PSTR("Another attempt! Current Z position: %f\n"), current_position[Z_AXIS]); current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); + //printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); + printf_P("Point too low 2 \n"); break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { - printf_P(PSTR("Bed leveling failed. Sensor disconnected or cable broken. Waiting for reset.\n")); + printf_P(PSTR("Bed leveling failed. Sensor disconnected or cable broken.\n")); break; } } if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point - printf_P(PSTR("Bed leveling failed. Sensor triggered too high. Waiting for reset.\n")); + printf_P(PSTR("Bed leveling failed. Sensor triggered too high.\n")); break; } #ifdef SUPPORT_VERBOSITY diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 0aca64a5..e1cd51a9 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -678,11 +678,13 @@ void reset_bed_offset_and_skew() bool is_bed_z_jitter_data_valid() // offsets of the Z heiths of the calibration points from the first point are saved as 16bit signed int, scaled to tenths of microns -{ - for (int8_t i = 0; i < 8; ++ i) - if (eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER+i*2)) == 0x0FFFF) - return false; - return true; +// if at least one 16bit integer has different value then -1 (0x0FFFF), data are considered valid and function returns true, otherwise it returns false +{ + bool data_valid = false; + for (int8_t i = 0; i < 8; ++i) { + if (eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + i * 2)) != 0x0FFFF) data_valid = true; + } + return data_valid; } static void world2machine_update(const float vec_x[2], const float vec_y[2], const float cntr[2]) @@ -946,7 +948,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif - + printf_P(PSTR("Min. Z: %f\n"), minimum_z); #ifdef SUPPORT_VERBOSITY if(verbosity_level >= 10) SERIAL_ECHOLNPGM("find bed induction sensor point z"); #endif // SUPPORT_VERBOSITY @@ -961,9 +963,16 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i // we have to let the planner know where we are right now as it is not where we said to go. update_current_position_z(); if (! endstop_z_hit_on_purpose()) - goto error; + { + printf_P(PSTR("endstop not hit 1, current_pos[Z]: %f \n"), current_position[Z_AXIS]); + goto error; + } #ifdef TMC2130 - if (READ(Z_TMC2130_DIAG) != 0) goto error; //crash Z detected + if (READ(Z_TMC2130_DIAG) != 0) + { + printf_P(PSTR("crash detected 1, current_pos[Z]: %f \n"), current_position[Z_AXIS]); + goto error; //crash Z detected + } #endif //TMC2130 for (uint8_t i = 0; i < n_iter; ++ i) { @@ -973,12 +982,13 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i go_to_current(homing_feedrate[Z_AXIS]/60); // Move back down slowly to find bed. current_position[Z_AXIS] = minimum_z; + printf_P(PSTR("init Z = %f, min_z = %f\n"), z_bckp, minimum_z); go_to_current(homing_feedrate[Z_AXIS]/(4*60)); // we have to let the planner know where we are right now as it is not where we said to go. update_current_position_z(); //printf_P(PSTR("Zs: %f, Z: %f, delta Z: %f"), z_bckp, current_position[Z_AXIS], (z_bckp - current_position[Z_AXIS])); if (abs(current_position[Z_AXIS] - z_bckp) < 0.025) { - //printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); + printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); current_position[Z_AXIS] += 0.5; go_to_current(homing_feedrate[Z_AXIS]/60); current_position[Z_AXIS] = minimum_z; @@ -989,10 +999,16 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i - if (! endstop_z_hit_on_purpose()) - goto error; + if (!endstop_z_hit_on_purpose()) + { + printf_P(PSTR("i = %d, endstop not hit 2, current_pos[Z]: %f \n"), i, current_position[Z_AXIS]); + goto error; + } #ifdef TMC2130 - if (READ(Z_TMC2130_DIAG) != 0) goto error; //crash Z detected + if (READ(Z_TMC2130_DIAG) != 0) { + printf_P(PSTR("crash detected 2, current_pos[Z]: %f \n"), current_position[Z_AXIS]); + goto error; //crash Z detected + } #endif //TMC2130 // SERIAL_ECHOPGM("Bed find_bed_induction_sensor_point_z low, height: "); // MYSERIAL.print(current_position[Z_AXIS], 5); @@ -1000,7 +1016,11 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i float dz = i?abs(current_position[Z_AXIS] - (z / i)):0; z += current_position[Z_AXIS]; //printf_P(PSTR("Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); - if (dz > 0.05) goto error;//deviation > 50um + if (dz > 0.05) { + printf_P(PSTR("big deviation \n")); + goto error;//deviation > 50um + } + printf_P(PSTR("PINDA triggered at %f\n"), current_position[Z_AXIS]); } current_position[Z_AXIS] = z; if (n_iter > 1) From 58632975384acdc727dd95f9d60b3df294f0ac5d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 27 Mar 2019 20:25:00 +0100 Subject: [PATCH 050/168] if deviation between current Z-probe and avg, value > 50um, enlarge Z-probe movements and repeat measurement --- Firmware/mesh_bed_calibration.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index e1cd51a9..3ff92a42 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -945,6 +945,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i #endif //SUPPORT_VERBOSITY ) { + bool high_deviation_occured = false; #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif @@ -977,12 +978,12 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i for (uint8_t i = 0; i < n_iter; ++ i) { - current_position[Z_AXIS] += 0.2; + current_position[Z_AXIS] += high_deviation_occured ? 0.5 : 0.2; float z_bckp = current_position[Z_AXIS]; go_to_current(homing_feedrate[Z_AXIS]/60); // Move back down slowly to find bed. current_position[Z_AXIS] = minimum_z; - printf_P(PSTR("init Z = %f, min_z = %f\n"), z_bckp, minimum_z); + printf_P(PSTR("init Z = %f, min_z = %f, i = %d\n"), z_bckp, minimum_z, i); go_to_current(homing_feedrate[Z_AXIS]/(4*60)); // we have to let the planner know where we are right now as it is not where we said to go. update_current_position_z(); @@ -1016,9 +1017,19 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i float dz = i?abs(current_position[Z_AXIS] - (z / i)):0; z += current_position[Z_AXIS]; //printf_P(PSTR("Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); - if (dz > 0.05) { - printf_P(PSTR("big deviation \n")); - goto error;//deviation > 50um + printf_P(PSTR("Z- measurement deviation from avg value %f um\n"), dz); + if (dz > 0.05) { //deviation > 50um + if (high_deviation_occured == false) { //first occurence may be caused in some cases by mechanic resonance probably especially if printer is placed on unstable surface + printf_P(PSTR("high dev. first occurence\n")); + delay_keep_alive(500); //damping + //start measurement from the begining, but this time with higher movements in Z axis which should help to reduce mechanical resonance + high_deviation_occured = true; + i = -1; + z = 0; + } + else { + goto error; + } } printf_P(PSTR("PINDA triggered at %f\n"), current_position[Z_AXIS]); } From e259967991c5dbb9bdb29220569b4dcce83de59b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 27 Mar 2019 20:41:45 +0100 Subject: [PATCH 051/168] remove / comment debug code --- Firmware/Marlin_main.cpp | 22 +++++++++------------- Firmware/mesh_bed_calibration.cpp | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 76d26989..63f4f298 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4478,18 +4478,16 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) uint16_t z_offset_u = 0; if (nMeasPoints == 7) { z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * ((ix/3) + iy - 1))); - printf_P(PSTR("[%d;%d]: Z_offset = %d \n"), ix, iy, z_offset_u); } else { z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1))); - printf_P(PSTR("[%d;%d]: Z_offset = %d \n"), ix, iy, z_offset_u); } z0 = mbl.z_values[0][0] + *reinterpret_cast(&z_offset_u) * 0.01; - //#ifdef SUPPORT_VERBOSITY - //if (verbosity_level >= 1) { + #ifdef SUPPORT_VERBOSITY + if (verbosity_level >= 1) { printf_P(PSTR("Bed leveling, point: %d, calibration Z stored in eeprom: %d, calibration z: %f \n"), mesh_point, z_offset_u, z0); - //} - //#endif // SUPPORT_VERBOSITY + } + #endif // SUPPORT_VERBOSITY } // Move Z up to MESH_HOME_Z_SEARCH. @@ -4503,7 +4501,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) current_position[X_AXIS] = BED_X(ix, nMeasPoints); current_position[Y_AXIS] = BED_Y(iy, nMeasPoints); - printf_P(PSTR("[%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); + //printf_P(PSTR("[%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); #ifdef SUPPORT_VERBOSITY @@ -4516,26 +4514,24 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]); #endif // SUPPORT_VERBOSITY - printf_P(PSTR("after clamping: [%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); + //printf_P(PSTR("after clamping: [%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], XY_AXIS_FEEDRATE, active_extruder); st_synchronize(); // Go down until endstop is hit const float Z_CALIBRATION_THRESHOLD = 1.f; if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - //printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); - printf_P("Point too low 1 \n"); + printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); break; } if (init_z_bckp - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases. - printf_P(PSTR("Another attempt! Current Z position: %f\n"), current_position[Z_AXIS]); + //printf_P(PSTR("Another attempt! Current Z position: %f\n"), current_position[Z_AXIS]); current_position[Z_AXIS] = MESH_HOME_Z_SEARCH; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], Z_LIFT_FEEDRATE, active_extruder); st_synchronize(); if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point - //printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); - printf_P("Point too low 2 \n"); + printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW)); break; } if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) { diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 3ff92a42..62bcca3c 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -949,7 +949,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i #ifdef TMC2130 FORCE_HIGH_POWER_START; #endif - printf_P(PSTR("Min. Z: %f\n"), minimum_z); + //printf_P(PSTR("Min. Z: %f\n"), minimum_z); #ifdef SUPPORT_VERBOSITY if(verbosity_level >= 10) SERIAL_ECHOLNPGM("find bed induction sensor point z"); #endif // SUPPORT_VERBOSITY @@ -965,13 +965,13 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i update_current_position_z(); if (! endstop_z_hit_on_purpose()) { - printf_P(PSTR("endstop not hit 1, current_pos[Z]: %f \n"), current_position[Z_AXIS]); + //printf_P(PSTR("endstop not hit 1, current_pos[Z]: %f \n"), current_position[Z_AXIS]); goto error; } #ifdef TMC2130 if (READ(Z_TMC2130_DIAG) != 0) { - printf_P(PSTR("crash detected 1, current_pos[Z]: %f \n"), current_position[Z_AXIS]); + //printf_P(PSTR("crash detected 1, current_pos[Z]: %f \n"), current_position[Z_AXIS]); goto error; //crash Z detected } #endif //TMC2130 @@ -983,13 +983,13 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i go_to_current(homing_feedrate[Z_AXIS]/60); // Move back down slowly to find bed. current_position[Z_AXIS] = minimum_z; - printf_P(PSTR("init Z = %f, min_z = %f, i = %d\n"), z_bckp, minimum_z, i); + //printf_P(PSTR("init Z = %f, min_z = %f, i = %d\n"), z_bckp, minimum_z, i); go_to_current(homing_feedrate[Z_AXIS]/(4*60)); // we have to let the planner know where we are right now as it is not where we said to go. update_current_position_z(); //printf_P(PSTR("Zs: %f, Z: %f, delta Z: %f"), z_bckp, current_position[Z_AXIS], (z_bckp - current_position[Z_AXIS])); if (abs(current_position[Z_AXIS] - z_bckp) < 0.025) { - printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); + //printf_P(PSTR("PINDA triggered immediately, move Z higher and repeat measurement\n")); current_position[Z_AXIS] += 0.5; go_to_current(homing_feedrate[Z_AXIS]/60); current_position[Z_AXIS] = minimum_z; @@ -1002,12 +1002,12 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i if (!endstop_z_hit_on_purpose()) { - printf_P(PSTR("i = %d, endstop not hit 2, current_pos[Z]: %f \n"), i, current_position[Z_AXIS]); + //printf_P(PSTR("i = %d, endstop not hit 2, current_pos[Z]: %f \n"), i, current_position[Z_AXIS]); goto error; } #ifdef TMC2130 if (READ(Z_TMC2130_DIAG) != 0) { - printf_P(PSTR("crash detected 2, current_pos[Z]: %f \n"), current_position[Z_AXIS]); + //printf_P(PSTR("crash detected 2, current_pos[Z]: %f \n"), current_position[Z_AXIS]); goto error; //crash Z detected } #endif //TMC2130 @@ -1017,10 +1017,10 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i float dz = i?abs(current_position[Z_AXIS] - (z / i)):0; z += current_position[Z_AXIS]; //printf_P(PSTR("Z[%d] = %d, dz=%d\n"), i, (int)(current_position[Z_AXIS] * 1000), (int)(dz * 1000)); - printf_P(PSTR("Z- measurement deviation from avg value %f um\n"), dz); + //printf_P(PSTR("Z- measurement deviation from avg value %f um\n"), dz); if (dz > 0.05) { //deviation > 50um if (high_deviation_occured == false) { //first occurence may be caused in some cases by mechanic resonance probably especially if printer is placed on unstable surface - printf_P(PSTR("high dev. first occurence\n")); + //printf_P(PSTR("high dev. first occurence\n")); delay_keep_alive(500); //damping //start measurement from the begining, but this time with higher movements in Z axis which should help to reduce mechanical resonance high_deviation_occured = true; @@ -1031,7 +1031,7 @@ inline bool find_bed_induction_sensor_point_z(float minimum_z, uint8_t n_iter, i goto error; } } - printf_P(PSTR("PINDA triggered at %f\n"), current_position[Z_AXIS]); + //printf_P(PSTR("PINDA triggered at %f\n"), current_position[Z_AXIS]); } current_position[Z_AXIS] = z; if (n_iter > 1) From 02faadf0b9fe50c991a6a2c29fee906d4bea8384 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 09:49:08 +0100 Subject: [PATCH 052/168] MMU mode renamed --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index bee46ca2..04f4d763 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5319,7 +5319,7 @@ do\ {\ if (mmu_enabled)\ {\ - if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Fast]"), lcd_silent_mode_mmu_set); \ + if (SilentModeMenu_MMU == 0) MENU_ITEM_FUNCTION_P(_i("MMU Mode [Normal]"), lcd_silent_mode_mmu_set); \ else MENU_ITEM_FUNCTION_P(_i("MMU Mode[Stealth]"), lcd_silent_mode_mmu_set); \ }\ }\ From d22793f2766a14d1c07609336baa843e9557f4cd Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 12:02:46 +0100 Subject: [PATCH 053/168] Z-probe nr. states reduced to 1; 3; 5 --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 30 ++++++++++++++++++------------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 2477d1c2..1a278013 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -21,7 +21,7 @@ #include "Configuration.h" #include "pins.h" #include "Timer.h" -extern int mbl_z_probe_nr; +extern uint8_t mbl_z_probe_nr; #ifndef AT90USB #define HardwareSerial_h // trick to disable the standard HWserial diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 67601fb1..45a1d401 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -167,7 +167,7 @@ CardReader card; unsigned long PingTime = _millis(); unsigned long NcTime; -int mbl_z_probe_nr = 3; //numer of Z measurements for each point in mesh bed leveling calibration +uint8_t mbl_z_probe_nr = 3; //numer of Z measurements for each point in mesh bed leveling calibration //used for PINDA temp calibration and pause print #define DEFAULT_RETRACTION 1 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 04f4d763..7a6581f8 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6688,6 +6688,17 @@ static void mbl_mesh_set() { eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mesh_nr); } +static void mbl_probe_nr_set() { + mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR); + switch (mbl_z_probe_nr) { + case 1: mbl_z_probe_nr = 3; break; + case 3: mbl_z_probe_nr = 5; break; + case 5: mbl_z_probe_nr = 1; break; + default: mbl_z_probe_nr = 3; break; + } + eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, mbl_z_probe_nr); +} + static void lcd_mesh_bed_leveling_settings() { @@ -6695,25 +6706,20 @@ static void lcd_mesh_bed_leveling_settings() uint8_t points_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); 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) - { - eeprom_update_byte((uint8_t*)EEPROM_MBL_PROBE_NR, (uint8_t)mbl_z_probe_nr); - } MENU_ITEM_BACK_P(_T(MSG_SETTINGS)); - if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); - MENU_ITEM_EDIT_int3_P(_i("Z-probe nr."), &mbl_z_probe_nr, 1, 5); + if(points_nr == 3) MENU_ITEM_FUNCTION_P(_i("Mesh [3x3]"), mbl_mesh_set); ////MSG_MESH_3x3 c=18 r=0 + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); ////MSG_MESH_7x7 c=18 r=0 + switch (mbl_z_probe_nr) { + case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 + case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 + default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 + } if (points_nr == 7) { if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_set); else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_set); } else menu_item_text_P(_i("Magnets comp.[N/A]")); MENU_END(); - /*if(menu_leaving) - { - eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mbl_z_probe_nr); - }*/ //SETTINGS_MBL_MODE; } From 1dd486d86d4b35e49c51d146f56c1e72233cf891 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 13:18:28 +0100 Subject: [PATCH 054/168] max length of menu item strings added --- Firmware/ultralcd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 7a6581f8..5128c77a 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6715,10 +6715,10 @@ static void lcd_mesh_bed_leveling_settings() default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 } if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_set); - else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_set); + if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_set); ////MSG_MAGNETS_COMP_ON c=18 r=0 + else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_set); ////MSG_MAGNETS_COMP_OFF c=18 r=0 } - else menu_item_text_P(_i("Magnets comp.[N/A]")); + else menu_item_text_P(_i("Magnets comp.[N/A]")); ////MSG_MAGNETS_COMP_NA c=18 r=0 MENU_END(); //SETTINGS_MBL_MODE; } From 8f69d5a501619b84a929d6499e14ca870894dfa5 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 14:48:35 +0100 Subject: [PATCH 055/168] document --- Firmware/mesh_bed_calibration.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 62bcca3c..8ac050af 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3129,6 +3129,11 @@ void mbl_settings_init() { } } +//parameter ix: index of mesh bed leveling point in X-axis +//parameter iy: index of mesh bed leveling point in Y-axis +//parameter meas_points: number of mesh bed leveling points in one axis; currently designed and tested for values 3 and 7 +//parameter zigzag: false if ix is considered 0 on left side of bed and ix rises with rising X coordinate; true if ix is considered 0 on the right side of heatbed for odd iy values (zig zag mesh bed leveling movements) +//function returns true if point is considered valid (typicaly in safe distance from magnet or another object which inflences PINDA measurements) bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bool zigzag) { //"human readable" heatbed plan //magnet proximity influence Z coordinate measurements significantly (40 - 100 um) From 96a111119b874da4e999e39c9c5fba1104dc9c71 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 14:52:50 +0100 Subject: [PATCH 056/168] document --- Firmware/mesh_bed_calibration.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 8ac050af..006cc487 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -3129,8 +3129,8 @@ void mbl_settings_init() { } } -//parameter ix: index of mesh bed leveling point in X-axis -//parameter iy: index of mesh bed leveling point in Y-axis +//parameter ix: index of mesh bed leveling point in X-axis (for meas_points == 7 is valid range from 0 to 6; for meas_points == 3 is valid range from 0 to 2 ) +//parameter iy: index of mesh bed leveling point in Y-axis (for meas_points == 7 is valid range from 0 to 6; for meas_points == 3 is valid range from 0 to 2 ) //parameter meas_points: number of mesh bed leveling points in one axis; currently designed and tested for values 3 and 7 //parameter zigzag: false if ix is considered 0 on left side of bed and ix rises with rising X coordinate; true if ix is considered 0 on the right side of heatbed for odd iy values (zig zag mesh bed leveling movements) //function returns true if point is considered valid (typicaly in safe distance from magnet or another object which inflences PINDA measurements) @@ -3143,13 +3143,14 @@ bool mbl_point_measurement_valid(uint8_t ix, uint8_t iy, uint8_t meas_points, bo uint8_t valid_points_mask[7] = { //[X_MAX,Y_MAX] - 0b1111111, - 0b1111111, - 0b1110111, - 0b1111011, - 0b1110111, - 0b1111111, - 0b1111111, + //0123456 + 0b1111111,//6 + 0b1111111,//5 + 0b1110111,//4 + 0b1111011,//3 + 0b1110111,//2 + 0b1111111,//1 + 0b1111111,//0 //[0,0] }; if (meas_points == 3) { From 97594c83bb9946a4ff8277ed4d57109db55c3f11 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 14:58:58 +0100 Subject: [PATCH 057/168] function misleading names changed --- Firmware/ultralcd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5128c77a..f5edc5ff 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6675,13 +6675,13 @@ static void lcd_tune_menu() MENU_END(); } -static void mbl_magnets_elimination_set() { +static void mbl_magnets_elimination_toggle() { bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0); magnet_elimination = !magnet_elimination; eeprom_update_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION, (uint8_t)magnet_elimination); } -static void mbl_mesh_set() { +static void mbl_mesh_toggle() { uint8_t mesh_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR); if(mesh_nr == 3) mesh_nr = 7; else mesh_nr = 3; @@ -6707,16 +6707,16 @@ 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_set); ////MSG_MESH_3x3 c=18 r=0 - else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_set); ////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 r=0 + else MENU_ITEM_FUNCTION_P(_i("Mesh [7x7]"), mbl_mesh_toggle); ////MSG_MESH_7x7 c=18 r=0 switch (mbl_z_probe_nr) { case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 } if (points_nr == 7) { - if (magnet_elimination) MENU_ITEM_FUNCTION_P(_i("Magnets comp. [On]"), mbl_magnets_elimination_set); ////MSG_MAGNETS_COMP_ON c=18 r=0 - else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_set); ////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 r=0 + else MENU_ITEM_FUNCTION_P(_i("Magnets comp.[Off]"), mbl_magnets_elimination_toggle); ////MSG_MAGNETS_COMP_OFF c=18 r=0 } else menu_item_text_P(_i("Magnets comp.[N/A]")); ////MSG_MAGNETS_COMP_NA c=18 r=0 MENU_END(); From ae11c1e26f1bf8ecd4f45d99869ef58c5584a6aa Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 28 Mar 2019 16:39:56 +0100 Subject: [PATCH 058/168] rename function --- Firmware/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f5edc5ff..017df6a9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6688,7 +6688,7 @@ static void mbl_mesh_toggle() { eeprom_update_byte((uint8_t*)EEPROM_MBL_POINTS_NR, mesh_nr); } -static void mbl_probe_nr_set() { +static void mbl_probe_nr_toggle() { mbl_z_probe_nr = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR); switch (mbl_z_probe_nr) { case 1: mbl_z_probe_nr = 3; break; @@ -6710,9 +6710,9 @@ static void lcd_mesh_bed_leveling_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 switch (mbl_z_probe_nr) { - case 1: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [1]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 - case 5: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [5]"), mbl_probe_nr_set); break; ////MSG_Z_PROBE_NR_1 c=18 r=0 - default: MENU_ITEM_FUNCTION_P(_i("Z-probe nr. [3]"), mbl_probe_nr_set); 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 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 } 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 From c440ca7369ce4bde939c51de03c0117b1b642ccc Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 1 Apr 2019 18:44:13 +0200 Subject: [PATCH 059/168] Revert "Phase correct PWM for bed, frequency 40KHz." --- Firmware/timer02.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 113c7246..8309f940 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -11,11 +11,19 @@ uint8_t timer02_pwm0 = 0; - void timer02_set_pwm0(uint8_t pwm0) { - TCCR0A |= (2 << COM0B0); //switch OC0B to OCR mode - OCR0B = (uint16_t)OCR0A * pwm0 / 255; + if (timer02_pwm0 == pwm0) return; + if (pwm0) + { + TCCR0A |= (2 << COM0B0); + OCR0B = pwm0 - 1; + } + else + { + TCCR0A &= ~(2 << COM0B0); + OCR0B = 0; + } timer02_pwm0 = pwm0; } @@ -31,12 +39,13 @@ void timer02_init(void) TIMSK0 &= ~(1< Date: Mon, 1 Apr 2019 20:52:24 +0200 Subject: [PATCH 060/168] version change --- Firmware/Configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index e086a16c..acdd2d6f 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-RC1" -#define FW_COMMIT_NR 2175 +#define FW_VERSION "3.7.0" +#define FW_COMMIT_NR 2201 // 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 b0566b2bc9f66d5424aa6bf885a3c78fac7d0b02 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 3 Apr 2019 16:45:34 +0200 Subject: [PATCH 061/168] Translation fix for https://github.com/prusa3d/Prusa-Firmware/pull/1601 --- lang/lang_en.txt | 6 +++--- lang/lang_en_cz.txt | 8 ++++---- lang/lang_en_de.txt | 12 ++++++------ lang/lang_en_es.txt | 12 ++++++------ lang/lang_en_fr.txt | 10 +++++----- lang/lang_en_it.txt | 12 ++++++------ lang/lang_en_pl.txt | 12 ++++++------ 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index b26968d7..cea52bd3 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -812,16 +812,16 @@ "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" +"Sort [none]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" +"Sort [time]" # "Severe skew" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" +"Sort [alphabet]" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index c4e1b7d8..85f8ffab 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1083,19 +1083,19 @@ "Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" +"Sort [none]" "Trideni [Zadne]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" -"Trideni: [cas]" +"Sort [time]" +"Trideni [cas]" # "Severe skew" "Tezke zkoseni" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" +"Sort [alphabet]" "Trideni [Abeceda]" #MSG_SORTING c=20 r=1 diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 5e2198c7..144dfc70 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1083,20 +1083,20 @@ "Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" -"Sort.: [Keine]" +"Sort [none]" +"Sort. [Keine]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" -"Sort.: [Zeit]" +"Sort [time]" +"Sort. [Zeit]" # "Severe skew" "Schwerer Schraeglauf" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" -"Sort.: [Alphabet]" +"Sort [alphabet]" +"Sort. [Alphabet]" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index c62a3578..86e4268b 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1083,20 +1083,20 @@ "Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. " #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" -"Ordenar: [nada]" +"Sort [none]" +"Ordenar [nada]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" -"Orden: [Fecha]" +"Sort [time]" +"Ordenar [Fecha]" # "Severe skew" "Inclinacion severa" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" -"Ordenar:[alfabet]" +"Sort [alphabet]" +"Ordenar [alfabet]" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d3fd4f7b..930fbb57 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1083,20 +1083,20 @@ "Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier." #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" +"Sort [none]" "Tri : [aucun]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" -"Tri : [heure]" +"Sort [time]" +"Tri [heure]" # "Severe skew" "Deviation severe" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" -"Tri : [alphabet]" +"Sort [alphabet]" +"Tri [alphabet]" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 919a542a..0b47c724 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1083,20 +1083,20 @@ "Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati." #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" -"Ordina: [none]" +"Sort [none]" +"Ordina [none]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" -"Ordina: [time]" +"Sort [time]" +"Ordina [time]" # "Severe skew" "Disassamento grave" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" -"Ordine: [alfabet]" +"Sort [alphabet]" +"Ordine [alfabet]" #MSG_SORTING c=20 r=1 "Sorting files" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index a23f89e3..26be40bd 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1083,20 +1083,20 @@ "Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100." #MSG_SORT_NONE c=17 r=1 -"Sort: [none]" -"Sortuj: [brak]" +"Sort [none]" +"Sortuj [brak]" #MSG_SORT_TIME c=17 r=1 -"Sort: [time]" -"Sortuj: [czas]" +"Sort [time]" +"Sortuj [czas]" # "Severe skew" "Znaczny skos" #MSG_SORT_ALPHA c=17 r=1 -"Sort: [alphabet]" -"Sortuj: [alfabet]" +"Sort [alphabet]" +"Sortuj [alfabet]" #MSG_SORTING c=20 r=1 "Sorting files" From aa0edd09f57b3b1d96ceaa05ab29f7e3add841b0 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Wed, 3 Apr 2019 22:48:58 +0200 Subject: [PATCH 062/168] (preliminary) fix @ (bed) preHeatError --- Firmware/temperature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index d6019eeb..197237f4 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1301,7 +1301,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren SERIAL_ECHOPGM(" Tstart:"); MYSERIAL.print(__preheat_start[_heater_id]);*/ - if (_current_temperature - __preheat_start[_heater_id] < 2) { + if (_current_temperature - __preheat_start[_heater_id] < ((_isbed &&(_current_temperature>105.0))?0.6:2.0)) { __preheat_errors[_heater_id]++; /*SERIAL_ECHOPGM(" Preheat errors:"); MYSERIAL.println(__preheat_errors[_heater_id]);*/ @@ -1311,7 +1311,7 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren __preheat_errors[_heater_id] = 0; } - if (__preheat_errors[_heater_id] > ((_isbed) ? 2 : 5)) + if (__preheat_errors[_heater_id] > ((_isbed) ? 3 : 5)) { if (farm_mode) { prusa_statistics(0); } temp_runaway_stop(true, _isbed); From bf1a55ab02b7e6f7e516f91c1850461313398263 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 4 Apr 2019 18:15:37 +0200 Subject: [PATCH 063/168] Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed. Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print. --- Firmware/Marlin_main.cpp | 5 +++-- Firmware/mmu.cpp | 34 ++++++++++++++++++++++++++++------ Firmware/mmu.h | 2 +- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 45a1d401..f199df2a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7014,7 +7014,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) if (mmu_enabled) { st_synchronize(); - mmu_continue_loading(); + mmu_continue_loading(is_usb_printing); mmu_extruder = tmp_extruder; //filament change is finished mmu_load_to_nozzle(); } @@ -7052,7 +7052,8 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); - mmu_continue_loading(); + mmu_continue_loading(is_usb_printing); + mmu_extruder = tmp_extruder; //filament change is finished if (load_to_nozzle)// for single material usage with mmu diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index dad00f8e..1c671cfa 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -878,7 +878,7 @@ void mmu_M600_load_filament(bool automatic, float nozzle_temp) mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(false, true, MMU_LOAD_MOVE); - mmu_continue_loading(); + mmu_continue_loading(is_usb_printing); mmu_extruder = tmp_extruder; //filament change is finished mmu_load_to_nozzle(); @@ -1363,7 +1363,7 @@ bFilamentAction=false; // NOT in "mmu_load_to_nozzle_ lcd_print(tmp_extruder + 1); mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); - mmu_continue_loading(); + mmu_continue_loading(false); mmu_extruder = tmp_extruder; //filament change is finished mmu_load_to_nozzle(); load_filament_final_feed(); @@ -1464,7 +1464,10 @@ static void load_more() st_synchronize(); } -void mmu_continue_loading() +//! @par blocking +//! * true blocking +//! * false non-blocking +void mmu_continue_loading(bool blocking) { if (ir_sensor_detected) { @@ -1510,9 +1513,28 @@ void mmu_continue_loading() setAllTargetHotends(0); lcd_setstatuspgm(_i("MMU load failed "));////MSG_RECOVERING_PRINT c=20 r=1 - mmu_fil_loaded = false; //so we can retry same T-code again - isPrintPaused = true; - mmu_command(MmuCmd::W0); + + if (blocking) + { + KEEPALIVE_STATE(PAUSED_FOR_USER); + lcd_consume_click(); + while(!lcd_clicked()){ + manage_heater(); + manage_inactivity(true); + lcd_update(0); + } + KEEPALIVE_STATE(IN_HANDLER); + restore_print_from_ram_and_continue(0); + mmu_command(MmuCmd::T0 + tmp_extruder); + manage_response(true, true, MMU_TCODE_MOVE); + load_more(); + } + else + { + mmu_fil_loaded = false; //so we can retry same T-code again + isPrintPaused = true; + mmu_command(MmuCmd::W0); + } } } } diff --git a/Firmware/mmu.h b/Firmware/mmu.h index 41e0ba1f..f0fc0deb 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -134,7 +134,7 @@ extern void mmu_eject_filament(uint8_t filament, bool recover); #ifdef MMU_HAS_CUTTER extern void mmu_cut_filament(uint8_t filament_nr); #endif //MMU_HAS_CUTTER -extern void mmu_continue_loading(); +extern void mmu_continue_loading(bool blocking); extern void mmu_filament_ramming(); extern void mmu_wait_for_heater_blocking(); extern void mmu_load_step(bool synchronize = true); From 4bfa3d7e0bb05aa54564baa242205f6c492595c3 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 4 Apr 2019 19:04:15 +0200 Subject: [PATCH 064/168] Reporty busy: paused for user in case MMU is not responding. --- Firmware/mmu.cpp | 2 ++ Firmware/tmc2130.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 1c671cfa..c7d1f2c9 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -679,6 +679,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) st_synchronize(); mmu_print_saved = true; printf_P(PSTR("MMU not responding\n")); + KEEPALIVE_STATE(PAUSED_FOR_USER); hotend_temp_bckp = degTargetHotend(active_extruder); if (move_axes) { z_position_bckp = current_position[Z_AXIS]; @@ -735,6 +736,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move) } else if (mmu_print_saved) { printf_P(PSTR("MMU starts responding\n")); + KEEPALIVE_STATE(IN_HANDLER); mmu_loading_flag = false; if (turn_off_nozzle) { diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index 8cd3422a..05ea2ab6 100644 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -715,6 +715,9 @@ uint8_t tmc2130_get_pwr(uint8_t axis) return 0; } +//! @par pwr motor power +//! * 0 disabled +//! * non-zero enabled void tmc2130_set_pwr(uint8_t axis, uint8_t pwr) { switch (axis) From bf57a59147f18e9d5485b6dfa808bac6786f6e51 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 5 Apr 2019 13:47:17 +0200 Subject: [PATCH 065/168] Extract duplicate code into function. Saves 106B flash. --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 26 +++++++++++++++++++------- Firmware/mmu.cpp | 9 +-------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 1a278013..fd6121a0 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -497,3 +497,4 @@ void M600_load_filament_movements(); void M600_wait_for_user(float HotendTempBckp); void M600_check_state(float nozzle_temp); void load_filament_final_feed(); +void marlin_wait_for_click(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f199df2a..b4aeef15 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4962,13 +4962,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) KEEPALIVE_STATE(IN_HANDLER); lcd_ignore_click(false); }else{ - KEEPALIVE_STATE(PAUSED_FOR_USER); - while(!lcd_clicked()){ - manage_heater(); - manage_inactivity(true); - lcd_update(0); - } - KEEPALIVE_STATE(IN_HANDLER); + marlin_wait_for_click(); } if (IS_SD_PRINTING) LCD_MESSAGERPGM(_T(MSG_RESUMING_PRINT)); @@ -9615,4 +9609,22 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) lcd_update_enable(false); } + +//! @brief Wait for click +//! +//! Set +void marlin_wait_for_click() +{ + int busy_state_backup = busy_state; + KEEPALIVE_STATE(PAUSED_FOR_USER); + lcd_consume_click(); + while(!lcd_clicked()) + { + manage_heater(); + manage_inactivity(true); + lcd_update(0); + } + KEEPALIVE_STATE(busy_state); +} + #define FIL_LOAD_LENGTH 60 diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index c7d1f2c9..754ad3f7 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1518,14 +1518,7 @@ void mmu_continue_loading(bool blocking) if (blocking) { - KEEPALIVE_STATE(PAUSED_FOR_USER); - lcd_consume_click(); - while(!lcd_clicked()){ - manage_heater(); - manage_inactivity(true); - lcd_update(0); - } - KEEPALIVE_STATE(IN_HANDLER); + marlin_wait_for_click(); restore_print_from_ram_and_continue(0); mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); From 84cabd38366c610e7bfded2395f87cbc3d290752 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Fri, 5 Apr 2019 15:19:53 +0200 Subject: [PATCH 066/168] Change busy_state type, save 340B of flash --- Firmware/Marlin.h | 2 +- Firmware/Marlin_main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index fd6121a0..08f7b4f2 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -469,7 +469,7 @@ extern uint8_t calc_percent_done(); #define KEEPALIVE_STATE(n) do { busy_state = n;} while (0) extern void host_keepalive(); //extern MarlinBusyState busy_state; -extern int busy_state; +extern int8_t busy_state; #ifdef TMC2130 diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b4aeef15..4ca05d18 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -303,7 +303,7 @@ int fanSpeed=0; bool cancel_heatup = false ; -int busy_state = NOT_BUSY; +int8_t busy_state = NOT_BUSY; static long prev_busy_signal_ms = -1; uint8_t host_keepalive_interval = HOST_KEEPALIVE_INTERVAL; @@ -9615,7 +9615,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) //! Set void marlin_wait_for_click() { - int busy_state_backup = busy_state; + int8_t busy_state_backup = busy_state; KEEPALIVE_STATE(PAUSED_FOR_USER); lcd_consume_click(); while(!lcd_clicked()) From 99d6c74999cacd4952aafc3b0390e4dfd20537fc Mon Sep 17 00:00:00 2001 From: Andrew Luebke Date: Fri, 5 Apr 2019 14:53:33 -0700 Subject: [PATCH 067/168] Fixed spelling errors in PF-build.sh --- PF-build.sh | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 7c1e26d4..faa5d916 100644 --- a/PF-build.sh +++ b/PF-build.sh @@ -1,12 +1,12 @@ #!/bin/bash -# This bash script is used to compile automatically the Prusa firmware with a dedecated build enviroment and settings +# This bash script is used to compile automatically the Prusa firmware with a dedicated build environment and settings # # Supported OS: Windows 10, Linux64 bit # # Linux: # # Windows: -# To excecute this sciprt you gonna need few things on your Windows machine +# To execute this script you gonna need few things on your Windows machine # # Linux Subsystem Ubuntu # 1. Follow these instructions @@ -28,15 +28,15 @@ # 4. Run git Bash under Administrator privilege and navigate to the directory /c/Program Files/Git/mingw64/bin, # you can run the command ln -s /c/Program Files/7-Zip/7z.exe zip.exe # -# Usefull things to edit and compare your custom Firmware +# Useful things to edit and compare your custom Firmware # 1. Download and install current and correct (64bit or 32bit) Notepad++ version https://notepad-plus-plus.org/download # 2. Another great tool to compare your custom mod and stock firmware is WinMerge http://winmerge.org/downloads/?lang=en # -# Example for MK3: open git bash and chage to your Firmware directory +# Example for MK3: open git bash and change to your Firmware directory # @ MINGW64 //path # bash build.sh 1_75mm_MK3-EINSy10a-E3Dv6full # -# Example for MK25: open git bash and chage to your directory +# Example for MK25: open git bash and change to your directory # gussner@WIN01 MINGW64 /d/Data/Prusa-Firmware/MK3 # bash build.sh 1_75mm_MK25-RAMBo13a-E3Dv6full # @@ -47,7 +47,7 @@ # Version: 1.0.1-Build_8 # Change log: # 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt' -# 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is uknown +# 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown # 17 Jan 2019, 3d-gussner, Build_3, Check for OS Windows or Linux and use the right build enviroment # 10 Feb 2019, ropaha, Pull Request, Select variant from list while using build.sh # 10 Feb 2019, ropaha, change FW_DEV_VERSION automatically depending on FW_VERSION RC/BETA/ALPHA @@ -96,7 +96,7 @@ else exit fi sleep 2 -###Prepare bash enviroment and check if wget and zip are availible +###Prepare bash enviroment and check if wget and zip are available if ! type wget > /dev/null; then echo "$(tput setaf 1)Missing 'wget' which is important to run this script" echo "Please follow these instructions https://gist.github.com/evanwill/0207876c3243bbb6863e65ec5dc3f058 to install wget$(tput sgr0)" @@ -139,7 +139,7 @@ fi cd ../build-env || exit 3 # Check if PF-build-env- exists and downloads + creates it if not -# The build enviroment is based on the Arduino IDE 1.8.5 portal vesion with some changes +# The build enviroment is based on the Arduino IDE 1.8.5 portal version with some changes if [ ! -d "../PF-build-env-$BUILD_ENV" ]; then echo "$(tput setaf 6)PF-build-env-$BUILD_ENV is missing ... creating it now for you$(tput sgr 0)" mkdir ../PF-build-env-$BUILD_ENV @@ -148,14 +148,14 @@ fi if [ $OSTYPE == "msys" ]; then if [ ! -f "PF-build-env-Win-$BUILD_ENV.zip" ]; then - echo "$(tput setaf 6)Downloding Windows build enviroment...$(tput setaf 2)" + echo "$(tput setaf 6)Downlaoding Windows build environment...$(tput setaf 2)" sleep 2 wget https://github.com/3d-gussner/PF-build-env/releases/download/Win-$BUILD_ENV/PF-build-env-Win-$BUILD_ENV.zip || exit 4 #cp -f ../../PF-build-env/PF-build-env-Win-$BUILD_ENV.zip PF-build-env-Win-$BUILD_ENV.zip || exit4 echo "$(tput sgr 0)" fi if [ ! -d "../PF-build-env-$BUILD_ENV/$OSTYPE" ]; then - echo "$(tput setaf 6)Unzipping Windows build enviroment...$(tput setaf 2)" + echo "$(tput setaf 6)Unzipping Windows build environment...$(tput setaf 2)" sleep 2 unzip PF-build-env-Win-$BUILD_ENV.zip -d ../PF-build-env-$BUILD_ENV/$OSTYPE || exit 4 echo "$(tput sgr0)" @@ -165,7 +165,7 @@ fi if [ $OSTYPE == "linux-gnu" ]; then if [ ! -f "PF-build-env-Linux64-$BUILD_ENV.zip" ]; then - echo "$(tput setaf 6)Downloading Linux 64 build enviroment...$(tput setaf 2)" + echo "$(tput setaf 6)Downloading Linux 64 build environment...$(tput setaf 2)" sleep 2 wget https://github.com/mkbel/PF-build-env/releases/download/$BUILD_ENV/PF-build-env-Linux64-$BUILD_ENV.zip || exit 3 echo "$(tput sgr0)" @@ -180,9 +180,9 @@ if [ $OSTYPE == "linux-gnu" ]; then fi cd $SCRIPT_PATH -# First argument defines which varaint of the Prusa Firmware will be compiled +# First argument defines which variant of the Prusa Firmware will be compiled if [ -z "$1" ] ; then - # Select which varaint of the Prusa Firmware will be compiled, like + # Select which variant of the Prusa Firmware will be compiled, like PS3="Select a variant: " while IFS= read -r -d $'\0' f; do options[i++]="$f" @@ -248,7 +248,7 @@ else if [[ "$2" == "ALL" || "$2" == "EN_ONLY" ]] ; then LANGUAGES=$2 else - echo "$(tput setaf 1)Language agrument is wrong!$(tput sgr0)" + echo "$(tput setaf 1)Language argument is wrong!$(tput sgr0)" echo "Only $(tput setaf 2)'ALL'$(tput sgr0) or $(tput setaf 2)'EN_ONLY'$(tput sgr0) are allowed as 2nd argument!" exit fi @@ -270,7 +270,7 @@ BUILD_ENV_PATH="$( pwd -P )" cd ../.. -#Checkif BUILD_PATH exisits and if not creates it +#Checkif BUILD_PATH exists and if not creates it if [ ! -d "Prusa-Firmware-build" ]; then mkdir Prusa-Firmware-build || exit 6 fi @@ -286,7 +286,7 @@ do FW=$(grep --max-count=1 "\bFW_VERSION\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d '"' -f2|sed 's/\.//g') # Find build version in Configuration.h file and use it to generate the hex filename BUILD=$(grep --max-count=1 "\bFW_COMMIT_NR\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d ' ' -f3) - # Check if the motherboard is an EINSY and if so the only one hex file will generated + # Check if the motherboard is an EINSY and if so only one hex file will generated MOTHERBOARD=$(grep --max-count=1 "\bMOTHERBOARD\b" $SCRIPT_PATH/Firmware/variants/$VARIANT.h | sed -e's/ */ /g' |cut -d ' ' -f3) # Check development status DEV_CHECK=$(grep --max-count=1 "\bFW_VERSION\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d '"' -f2|sed 's/\.//g'|cut -d '-' -f2) @@ -333,22 +333,22 @@ do fi OUTPUT_FOLDER="Hex-files/FW$FW-Build$BUILD/$MOTHERBOARD" - #Check if exacly the same hexfile already exsits + #Check if exactly the same hexfile already exists if [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.hex" && "$LANGUAGES" == "ALL" ]]; then echo "" ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.hex | xargs -n1 basename - echo "$(tput setaf 6)This hex file to be comiled already exsits! To cancle this process press CRTL+C and rename existing hex file.$(tput sgr 0)" + echo "$(tput setaf 6)This hex file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" read -t 10 -p "Press Enter to continue..." elif [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT-EN_ONLY.hex" && "$LANGUAGES" == "EN_ONLY" ]]; then echo "" ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT-EN_ONLY.hex | xargs -n1 basename - echo "$(tput setaf 6)This hex file to be comiled already exsits! To cancle this process press CRTL+C and rename existing hex file.$(tput sgr 0)" + echo "$(tput setaf 6)This hex file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" read -t 10 -p "Press Enter to continue..." fi if [[ -f "$SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.zip" && "$LANGUAGES" == "ALL" ]]; then echo "" ls -1 $SCRIPT_PATH/../$OUTPUT_FOLDER/FW$FW-Build$BUILD-$VARIANT.zip | xargs -n1 basename - echo "$(tput setaf 6)This zip file to be comiled already exsits! To cancle this process press CRTL+C and rename existing hex file.$(tput sgr 0)" + echo "$(tput setaf 6)This zip file to be compiled already exists! To cancel this process press CRTL+C and rename existing hex file.$(tput sgr 0)" read -t 10 -p "Press Enter to continue..." fi @@ -382,11 +382,11 @@ do #Prepare english only or multilanguage version to be build if [ $LANGUAGES == "ALL" ]; then echo " " - echo "Multi-language firmware will be build" + echo "Multi-language firmware will be built" echo " " else echo " " - echo "English only language firmware will be build" + echo "English only language firmware will be built" echo " " fi @@ -439,14 +439,14 @@ do if [ $LANGUAGES == "ALL" ]; then echo "$(tput setaf 2)" - echo "Building mutli language firmware" $MULTI_LANGUAGE_CHECK + echo "Building multi language firmware" $MULTI_LANGUAGE_CHECK echo "$(tput sgr 0)" sleep 2 cd $SCRIPT_PATH/lang echo "$(tput setaf 3)" ./config.sh || exit 15 echo "$(tput sgr 0)" - # Check if privious languages and firmware build exist and if so clean them up + # Check if previous languages and firmware build exist and if so clean them up if [ -f "lang_en.tmp" ]; then echo "" echo "$(tput setaf 6)Previous lang build files already exist these will be cleaned up in 10 seconds.$(tput sgr 0)" @@ -469,7 +469,7 @@ do # Combine compiled firmware with languages ./fw-build.sh || exit 17 echo "$(tput sgr 0)" - # Check if the motherboard is an EINSY and if so the only one hex file will generated + # Check if the motherboard is an EINSY and if so only one hex file will generated MOTHERBOARD=$(grep --max-count=1 "\bMOTHERBOARD\b" $SCRIPT_PATH/Firmware/variants/$VARIANT.h | sed -e's/ */ /g' |cut -d ' ' -f3) # If the motherboard is an EINSY just copy one hexfile if [ "$MOTHERBOARD" = "BOARD_EINSY_1_0a" ]; then From a6f10625c570dcabb01530a414c5f10e9bfd4ca7 Mon Sep 17 00:00:00 2001 From: Andrew Luebke Date: Fri, 5 Apr 2019 15:44:52 -0700 Subject: [PATCH 068/168] Found another mistake --- PF-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 PF-build.sh diff --git a/PF-build.sh b/PF-build.sh old mode 100644 new mode 100755 index faa5d916..a7cc25a9 --- a/PF-build.sh +++ b/PF-build.sh @@ -148,7 +148,7 @@ fi if [ $OSTYPE == "msys" ]; then if [ ! -f "PF-build-env-Win-$BUILD_ENV.zip" ]; then - echo "$(tput setaf 6)Downlaoding Windows build environment...$(tput setaf 2)" + echo "$(tput setaf 6)Downloading Windows build environment...$(tput setaf 2)" sleep 2 wget https://github.com/3d-gussner/PF-build-env/releases/download/Win-$BUILD_ENV/PF-build-env-Win-$BUILD_ENV.zip || exit 4 #cp -f ../../PF-build-env/PF-build-env-Win-$BUILD_ENV.zip PF-build-env-Win-$BUILD_ENV.zip || exit4 From c7d403733a726ada83343e2dda23eb14b38a633b Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 9 Apr 2019 20:50:29 +0200 Subject: [PATCH 069/168] Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode. --- Firmware/mmu.cpp | 147 +++++++++++++++++++++++++++++------------------ Firmware/mmu.h | 2 +- 2 files changed, 92 insertions(+), 57 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 754ad3f7..ef5b021c 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1466,74 +1466,109 @@ static void load_more() st_synchronize(); } +static void increment_load_fail() +{ + uint8_t mmu_load_fail = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); + uint16_t mmu_load_fail_tot = eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT); + if(mmu_load_fail < 255) eeprom_update_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL, mmu_load_fail + 1); + if(mmu_load_fail_tot < 65535) eeprom_update_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT, mmu_load_fail_tot + 1); +} + +//! @brief continue loading filament //! @par blocking -//! * true blocking -//! * false non-blocking +//! * true blocking - do not return until successful load +//! * false non-blocking - pause print and return on load failure +//! +//! @startuml +//! [*] --> [*] : !ir_sensor_detected /\n send MmuCmd::C0 +//! [*] --> LoadMore +//! LoadMore --> [*] : filament \ndetected +//! LoadMore --> Retry : !filament detected /\n increment load fail +//! Retry --> [*] : filament \ndetected +//! Retry --> Unload : !filament \ndetected +//! Unload --> [*] : non-blocking +//! Unload --> Retry : button \nclicked +//! +//! Retry : Cut filament if enabled +//! Retry : repeat last T-code +//! Unload : unload filament +//! Unload : pause print +//! Unload : show error message +//! +//! @enduml void mmu_continue_loading(bool blocking) { - if (ir_sensor_detected) + if (!ir_sensor_detected) { - load_more(); + mmu_command(MmuCmd::C0); + return; + } - if (PIN_GET(IR_SENSOR_PIN) != 0) { - uint8_t mmu_load_fail = eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL); - uint16_t mmu_load_fail_tot = eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT); - if(mmu_load_fail < 255) eeprom_update_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL, mmu_load_fail + 1); - if(mmu_load_fail_tot < 65535) eeprom_update_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT, mmu_load_fail_tot + 1); + load_more(); + enum class Ls : uint_least8_t + { + enter, + retry, + unload, + }; + Ls state = Ls::enter; + + while (PIN_GET(IR_SENSOR_PIN) != 0) + { + switch (state) + { + case Ls::enter: + increment_load_fail(); + // no break + case Ls::retry: #ifdef MMU_HAS_CUTTER - if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) - { - mmu_command(MmuCmd::K0 + tmp_extruder); - manage_response(true, true, MMU_UNLOAD_MOVE); - } + if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + { + mmu_command(MmuCmd::K0 + tmp_extruder); + manage_response(true, true, MMU_UNLOAD_MOVE); + } #endif //MMU_HAS_CUTTER - mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); load_more(); + state = Ls::unload; + break; + case Ls::unload: + stop_and_save_print_to_ram(0, 0); - if (PIN_GET(IR_SENSOR_PIN) != 0) + //lift z + current_position[Z_AXIS] += Z_PAUSE_LIFT; + if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); + st_synchronize(); + + //Move XY to side + current_position[X_AXIS] = X_PAUSE_POS; + current_position[Y_AXIS] = Y_PAUSE_POS; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); + st_synchronize(); + + mmu_command(MmuCmd::U0); + manage_response(false, true, MMU_UNLOAD_MOVE); + + setAllTargetHotends(0); + lcd_setstatuspgm(_i("MMU load failed "));////c=20 r=1 + + if (blocking) { - //pause print, show error message and then repeat last T-code - stop_and_save_print_to_ram(0, 0); - - //lift z - current_position[Z_AXIS] += Z_PAUSE_LIFT; - if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 15, active_extruder); - st_synchronize(); - - //Move XY to side - current_position[X_AXIS] = X_PAUSE_POS; - current_position[Y_AXIS] = Y_PAUSE_POS; - plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); - st_synchronize(); - - mmu_command(MmuCmd::U0); - manage_response(false, true, MMU_UNLOAD_MOVE); - - setAllTargetHotends(0); - lcd_setstatuspgm(_i("MMU load failed "));////MSG_RECOVERING_PRINT c=20 r=1 - - if (blocking) - { - marlin_wait_for_click(); - restore_print_from_ram_and_continue(0); - mmu_command(MmuCmd::T0 + tmp_extruder); - manage_response(true, true, MMU_TCODE_MOVE); - load_more(); - } - else - { - mmu_fil_loaded = false; //so we can retry same T-code again - isPrintPaused = true; - mmu_command(MmuCmd::W0); - } + marlin_wait_for_click(); + restore_print_from_ram_and_continue(0); + state = Ls::retry; } - } - } - else { //mmu_ir_sensor_detected == false - mmu_command(MmuCmd::C0); - } + else + { + mmu_fil_loaded = false; //so we can retry same T-code again + isPrintPaused = true; + mmu_command(MmuCmd::W0); + return; + } + break; + } + } } diff --git a/Firmware/mmu.h b/Firmware/mmu.h index f0fc0deb..a7da0c2d 100644 --- a/Firmware/mmu.h +++ b/Firmware/mmu.h @@ -58,7 +58,7 @@ enum class MmuCmd : uint_least8_t K4, R0, S3, - W0, + W0, //!< Wait and signal load error }; inline MmuCmd operator+ (MmuCmd cmd, uint8_t filament) From b5f196406e344c8ef2148a105a5f3171abb4dc69 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Wed, 10 Apr 2019 00:29:58 +0200 Subject: [PATCH 070/168] (preliminary) fix @ preHeatError II --- Firmware/temperature.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 197237f4..e432d028 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1240,6 +1240,7 @@ void setWatch() #if (defined (TEMP_RUNAWAY_BED_HYSTERESIS) && TEMP_RUNAWAY_BED_TIMEOUT > 0) || (defined (TEMP_RUNAWAY_EXTRUDER_HYSTERESIS) && TEMP_RUNAWAY_EXTRUDER_TIMEOUT > 0) void temp_runaway_check(int _heater_id, float _target_temperature, float _current_temperature, float _output, bool _isbed) { + float __delta; float __hysteresis = 0; int __timeout = 0; bool temp_runaway_check_active = false; @@ -1299,9 +1300,20 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren SERIAL_ECHOPGM(" T:"); MYSERIAL.print(_current_temperature); SERIAL_ECHOPGM(" Tstart:"); - MYSERIAL.print(__preheat_start[_heater_id]);*/ + MYSERIAL.print(__preheat_start[_heater_id]); + SERIAL_ECHOPGM(" delta:"); + MYSERIAL.print(_current_temperature-__preheat_start[_heater_id]);*/ - if (_current_temperature - __preheat_start[_heater_id] < ((_isbed &&(_current_temperature>105.0))?0.6:2.0)) { +//-// if (_current_temperature - __preheat_start[_heater_id] < 2) { +//-// if (_current_temperature - __preheat_start[_heater_id] < ((_isbed && (_current_temperature>105.0))?0.6:2.0)) { + __delta=2.0; + if(_isbed) + { + __delta=3.0; + if(_current_temperature>90.0) __delta=2.0; + if(_current_temperature>105.0) __delta=0.6; + } + if (_current_temperature - __preheat_start[_heater_id] < __delta) { __preheat_errors[_heater_id]++; /*SERIAL_ECHOPGM(" Preheat errors:"); MYSERIAL.println(__preheat_errors[_heater_id]);*/ @@ -1322,10 +1334,15 @@ void temp_runaway_check(int _heater_id, float _target_temperature, float _curren } } - if (_current_temperature >= _target_temperature && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) +//-// if (_current_temperature >= _target_temperature && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) + if ((_current_temperature > (_target_temperature - __hysteresis)) && temp_runaway_status[_heater_id] == TempRunaway_PREHEAT) { + /*SERIAL_ECHOPGM("Heater:"); + MYSERIAL.print(_heater_id); + MYSERIAL.println(" ->tempRunaway");*/ temp_runaway_status[_heater_id] = TempRunaway_ACTIVE; temp_runaway_check_active = false; + temp_runaway_error_counter[_heater_id] = 0; } if (_output > 0) From 8a33663f64cf45b844c16a7418a3f7a126e17468 Mon Sep 17 00:00:00 2001 From: mkbel <35807926+mkbel@users.noreply.github.com> Date: Mon, 15 Apr 2019 02:47:25 +0200 Subject: [PATCH 071/168] Update README.md --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 798df4fa..f8575e3a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ * [Using Git-bash](#using-git-bash-under-windows-10-64-bit) * [Automated tests](#3-automated-tests) * [Documentation](#4-documentation) + * [FAQ](#5-faq) @@ -170,3 +171,20 @@ Example: # 4. Documentation run [doxygen](http://www.doxygen.nl/) in Firmware folder + +# 5. FAQ +Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface. + +A:Step 1.c was ommited or you updated Arduino and now platform.txt located somewhere in your user profile is used. + +Q:I built firmware using Arduino and printer now speaks Klingon (nonsense characters and symbols are displayed @^#$&*°;~ÿ) + +A:Step 2.c was omitted. + +Q:What environment does Prusa use to build the firmware in the first place? + +A:Our production builds are 99.9% equivalent to https://github.com/prusa3d/Prusa-Firmware#linux this is also easiest way to build as only one step is needed - run single script, which downloads patched Arduino from github, builds using it, then extracts translated strings and creates language variants (for MK2x) or language hex file for external SPI flash (MK3x). But you need Linux or Linux in virtual machine. This is also what happens when you open pull request to our repository - all variants are built by Travis http://travis-ci.org/ (to check for compilation errors). You can see, what is happening in .travis.yml. It would be also possible to get hex built by travis, only deploy step is missing in .travis.yml. You can get inspiration how to deploy hex by travis and how to setup travis in https://github.com/prusa3d/MM-control-01/ repository. Final hex is located in ./lang/firmware.hex Community reproduced this for Windows in https://github.com/prusa3d/Prusa-Firmware#using-linux-subsystem-under-windows-10-64-bit or https://github.com/prusa3d/Prusa-Firmware#using-git-bash-under-windows-10-64-bit . + +Q:Why are build instructions for Arduino mess. + +Y:We are too lazy to ship proper board definition for Arduino. We plan to swich to cmake + ninja to be inherently multiplatform, easily integrate build tools, suport more IDEs, get 10 times shorter build times and be able to update compiler whenewer we want. From 1f9737b4a676db6474fdcfd0cd1b0565010fc0ef Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 16 Apr 2019 16:48:01 +0200 Subject: [PATCH 072/168] Bed high frequency PWM disabled --- Firmware/system_timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/system_timer.h b/Firmware/system_timer.h index 98647660..d4fbfc39 100644 --- a/Firmware/system_timer.h +++ b/Firmware/system_timer.h @@ -4,7 +4,7 @@ #define FIRMWARE_SYSTEM_TIMER_H_ #include "Arduino.h" -#define SYSTEM_TIMER_2 +//#define SYSTEM_TIMER_2 #ifdef SYSTEM_TIMER_2 #include "timer02.h" From 75fac9dab2c365f6ac1f722c47c68381d708981d Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 16 Apr 2019 22:20:53 +0200 Subject: [PATCH 073/168] Do not kill printer if External SPI flash W25X20CL is not responding. Remove internationalization macro for this message. It has no sense to be translated as internationalization in most cases doesn't work if it is not responding. Show this message instead of splash screen if the error is encountered. There is no additional delay or wait for click, as such functions doesn't work in setup function. --- Firmware/Marlin_main.cpp | 41 +++++++++++++++++++++++----------- Firmware/lcd.h | 14 ++++-------- Firmware/optiboot_w25x20cl.cpp | 2 ++ 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4ca05d18..e23ca37e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -977,6 +977,12 @@ void list_sec_lang_from_external_flash() #endif //(LANG_MODE != 0) +static void w25x20cl_err_msg() +{ + lcd_puts_P(_n(ESC_2J ESC_H(0,0) "External SPI flash" ESC_H(0,1) "W25X20CL is not res-" + ESC_H(0,2) "ponding. Language" ESC_H(0,3) "switch unavailable.")); +} + // "Setup" function is called by the Arduino framework on startup. // Before startup, the Timers-functions (PWM)/Analog RW and HardwareSerial provided by the Arduino-code // are initialized by the main() routine provided by the Arduino framework. @@ -993,21 +999,25 @@ void setup() spi_init(); lcd_splash(); - Sound_Init(); // also guarantee "SET_OUTPUT(BEEPER)" + Sound_Init(); // also guarantee "SET_OUTPUT(BEEPER)" #ifdef W25X20CL - if (!w25x20cl_init()) - kill(_i("External SPI flash W25X20CL not responding.")); - // Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory. - optiboot_w25x20cl_enter(); -#endif - + bool w25x20cl_success = w25x20cl_init(); + if (w25x20cl_success) + { + optiboot_w25x20cl_enter(); #if (LANG_MODE != 0) //secondary language support -#ifdef W25X20CL - if (w25x20cl_init()) - update_sec_lang_from_external_flash(); -#endif //W25X20CL + update_sec_lang_from_external_flash(); #endif //(LANG_MODE != 0) + } + else + { + w25x20cl_err_msg(); + } +#else + const bool w25x20cl_success = true; +#endif //W25X20CL + setup_killpin(); setup_powerhold(); @@ -1213,12 +1223,17 @@ void setup() tp_init(); // Initialize temperature loop - lcd_splash(); // we need to do this again, because tp_init() kills lcd + if (w25x20cl_success) lcd_splash(); // we need to do this again, because tp_init() kills lcd + else + { + w25x20cl_err_msg(); + printf_P(_n("W25X20CL not responding.\n")); + } plan_init(); // Initialize planner; factory_reset(); - lcd_encoder_diff=0; + lcd_encoder_diff=0; #ifdef TMC2130 uint8_t silentMode = eeprom_read_byte((uint8_t*)EEPROM_SILENT); diff --git a/Firmware/lcd.h b/Firmware/lcd.h index 12935188..9f3eb5c1 100644 --- a/Firmware/lcd.h +++ b/Firmware/lcd.h @@ -64,23 +64,17 @@ extern void lcd_print(long, int = 10); extern void lcd_print(unsigned long, int = 10); extern void lcd_print(double, int = 2); +//! @brief Clear screen #define ESC_2J "\x1b[2J" #define ESC_25h "\x1b[?25h" #define ESC_25l "\x1b[?25l" +//! @brief Set cursor to +//! @param c column +//! @param r row #define ESC_H(c,r) "\x1b["#r";"#c"H" - - - - - - - - - - #define LCD_UPDATE_INTERVAL 100 #define LCD_TIMEOUT_TO_STATUS 30000ul //!< Generic timeout to status screen in ms, when no user action. #define LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z 90000ul //!< Specific timeout for lcd_babystep_z screen in ms. diff --git a/Firmware/optiboot_w25x20cl.cpp b/Firmware/optiboot_w25x20cl.cpp index dad697ea..e84bf639 100644 --- a/Firmware/optiboot_w25x20cl.cpp +++ b/Firmware/optiboot_w25x20cl.cpp @@ -1,3 +1,4 @@ +//! @file // Based on the OptiBoot project // https://github.com/Optiboot/optiboot // Licence GLP 2 or later. @@ -97,6 +98,7 @@ static const char entry_magic_cfm [] PROGMEM = "w25x20cl_cfm\n"; struct block_t; extern struct block_t *block_buffer; +//! @brief Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory. void optiboot_w25x20cl_enter() { if (boot_app_flags & BOOT_APP_FLG_USER0) return; From f25f8f1b71071d4e17210b7e2e25c5a6e956ffdd Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 23 Apr 2019 19:39:49 +0200 Subject: [PATCH 074/168] Do not compile timer02.c if not used. Saves 148B flash. --- Firmware/timer02.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 8309f940..792f3aef 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -2,6 +2,9 @@ // use atmega timer2 as main system timer instead of timer0 // timer0 is used for fast pwm (OC0B output) // original OVF handler is disabled + +#ifdef SYSTEM_TIMER_2 + #include #include #include "Arduino.h" @@ -166,3 +169,5 @@ void noTone2(__attribute__((unused)) uint8_t _pin) { PIN_CLR(BEEPER); } + +#endif //SYSTEM_TIMER_2 From 1d8b2b3e183a88c20ac59dea0f8bdbd87fe1a233 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Wed, 24 Apr 2019 15:22:17 +0200 Subject: [PATCH 075/168] Secondary language reserved space resized --- Firmware/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index 7c4341dc..e606e1de 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -45,7 +45,7 @@ //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2f00 // reserved space for secondary language (12032 bytes) +#define LANG_SIZE_RESERVED 0x2b00 // reserved space for secondary language (12032 bytes) #endif //_CONFIG_H From e8e7fa907fd6337f32bcc3cb6d34ec5d516f27c0 Mon Sep 17 00:00:00 2001 From: mkbel <35807926+mkbel@users.noreply.github.com> Date: Wed, 24 Apr 2019 15:52:24 +0200 Subject: [PATCH 076/168] Change comment --- Firmware/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index e606e1de..24a77dc4 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -45,7 +45,7 @@ //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #define LANG_MODE 1 // sec. language support -#define LANG_SIZE_RESERVED 0x2b00 // reserved space for secondary language (12032 bytes) +#define LANG_SIZE_RESERVED 0x2b00 // reserved space for secondary language (11008 bytes) #endif //_CONFIG_H 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 077/168] 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 078/168] 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 079/168] 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 f16bea26e5cc360086194d152af6ccf027731c07 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Thu, 25 Apr 2019 17:34:52 +0200 Subject: [PATCH 080/168] raise the Z axis before filament loading to nozzle on MMU2S --- Firmware/mmu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index ef5b021c..b7746f2d 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1367,6 +1367,7 @@ bFilamentAction=false; // NOT in "mmu_load_to_nozzle_ manage_response(true, true, MMU_TCODE_MOVE); mmu_continue_loading(false); mmu_extruder = tmp_extruder; //filament change is finished + if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30; mmu_load_to_nozzle(); load_filament_final_feed(); st_synchronize(); From 18dec75b560f78b91388d61c0fe67d94e41e5c00 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Mon, 29 Apr 2019 13:19:59 +0200 Subject: [PATCH 081/168] 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 082/168] "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 083/168] 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 084/168] 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 085/168] 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 086/168] 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 087/168] 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 088/168] 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 089/168] 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 090/168] 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 091/168] 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 092/168] 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 093/168] 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 094/168] 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 095/168] 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 096/168] 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 097/168] 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 098/168] 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 099/168] 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 100/168] 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 101/168] 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 102/168] 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 103/168] 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 104/168] 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 105/168] 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 106/168] 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 107/168] 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 108/168] 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 109/168] 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 110/168] 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 111/168] 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 112/168] 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 113/168] 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 From 464d33fa9a84dc4493e70b81a0be4ac461aa6491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Leirv=C3=A5g?= Date: Wed, 15 May 2019 16:00:16 +0200 Subject: [PATCH 114/168] Windows subsystem CRLF issues fix Add extra tip to linux sbsystem, where users get the error "$'\r': command not found" where windows uses CRLF and linux uses only LF --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index ea649fe4..f8638961 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,9 @@ Now your Ubuntu subsystem is ready to use the automatic `PF-build.sh` script and - Example: You files are under `C:\Users\\Downloads\Prusa-Firmware-MK3` - use under Ubuntu the following command `cd /mnt/c/Users//Downloads/Prusa-Firmware-MK3` to change to the right folder +- Unix and windows have different line endings (LF vs CRLF), try dos2unix to convert + - This should fix the `"$'\r': command not found"` error + - to install run `apt-get install dos2unix` #### Compile Prusa-firmware with Ubuntu Linux subsystem installed - open Ubuntu bash From 1f3877b221628c0db8383f0a28549554112630b0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 15 May 2019 16:27:24 +0200 Subject: [PATCH 115/168] Extract duplicate code into function. Saves 4B of flash. --- Firmware/Marlin.h | 1 + Firmware/Marlin_main.cpp | 11 +++++++++-- Firmware/mmu.cpp | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 08f7b4f2..b82856f8 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -498,3 +498,4 @@ void M600_wait_for_user(float HotendTempBckp); void M600_check_state(float nozzle_temp); void load_filament_final_feed(); void marlin_wait_for_click(); +void marlin_rise_z(void); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e23ca37e..44489085 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3123,7 +3123,14 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float } - +//! @brief Rise Z if too low to avoid blob/jam before filament loading +//! +//! It doesn't plan_buffer_line(), as it expects plan_buffer_line() to be called after +//! during extruding (loading) filament. +void marlin_rise_z(void) +{ + if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30; +} void gcode_M701() { @@ -3148,7 +3155,7 @@ void gcode_M701() plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); //fast sequence st_synchronize(); - if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30; + marlin_rise_z(); current_position[E_AXIS] += 30; plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 400 / 60, active_extruder); //fast sequence diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index b7746f2d..5a8ef817 100644 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1367,7 +1367,7 @@ bFilamentAction=false; // NOT in "mmu_load_to_nozzle_ manage_response(true, true, MMU_TCODE_MOVE); mmu_continue_loading(false); mmu_extruder = tmp_extruder; //filament change is finished - if (current_position[Z_AXIS] < 20) current_position[Z_AXIS] += 30; + marlin_rise_z(); mmu_load_to_nozzle(); load_filament_final_feed(); st_synchronize(); From a453c6fc9df21d613e8ba6a666c1609f6d9f74cf Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 16 May 2019 16:43:44 +0200 Subject: [PATCH 116/168] Save 236B by improving functions in menu.cpp. Beware - the label now has to come with a ':' as its last character. Changed language files along with this commit too. --- Firmware/menu.cpp | 49 ++++++++++++++++++++----------------------- Firmware/menu.h | 5 +++-- Firmware/ultralcd.cpp | 18 +++++++++------- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 4 ++-- lang/lang_en_de.txt | 4 ++-- lang/lang_en_es.txt | 4 ++-- lang/lang_en_fr.txt | 4 ++-- lang/lang_en_it.txt | 4 ++-- lang/lang_en_pl.txt | 4 ++-- 10 files changed, 50 insertions(+), 48 deletions(-) mode change 100644 => 100755 Firmware/ultralcd.cpp mode change 100644 => 100755 lang/lang_en.txt mode change 100644 => 100755 lang/lang_en_cz.txt mode change 100644 => 100755 lang/lang_en_de.txt mode change 100644 => 100755 lang/lang_en_es.txt mode change 100644 => 100755 lang/lang_en_fr.txt mode change 100644 => 100755 lang/lang_en_it.txt mode change 100644 => 100755 lang/lang_en_pl.txt diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 2534b43a..cf0c368b 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -306,9 +306,9 @@ const char menu_20x_space[] PROGMEM = " "; const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; -const char menu_fmt_float31[] PROGMEM = "%-12.12s%+8.1f"; +const char menu_fmt_float31[] PROGMEM = "%-12.12S%+8.1f"; -const char menu_fmt_float13[] PROGMEM = "%c%.12S:%s%+06.3f"; +const char menu_fmt_float13[] PROGMEM = "%-15.15S%+5.3f"; const char menu_fmt_float13off[] PROGMEM = "%c%.12S:%s%"; @@ -348,39 +348,36 @@ void menu_draw_P(char chr, const char* str, int16_t val) } } -//! Draw up to 10 chars of text, ':' and float number in format from +0.0 to +12345.0. The increased range is necessary +//! @brief Draw up to 10 chars of text and a float number in format from +0.0 to +12345.0. The increased range is necessary //! for displaying large values of extruder positions, which caused text overflow in the previous implementation. +//! //! @param chr first character to print on the line -//! @param str string label to print, will be appended with ':' automatically inside the function +//! @param str string label to print //! @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) +//! The text needs to come with a colon ":", this function does not append it anymore. +//! That resulted in a much shorter implementation (234628B -> 234476B) +//! There are similar functions around which may be shortened in a similar way +void menu_draw_float31(const char* str, float 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); + lcd_printf_P(menu_fmt_float31, str, val); } -//draw up to 12 chars of text, ':' and float number in format +1.234 -void menu_draw_float13(char chr, const char* str, float val) +//! @brief Draw up to 12 chars of text and a float number in format +1.234 +//! +//! @param chr first character to print on the line +//! @param str string label to print +//! @param val value to print aligned to the right side of the display +//! +//! Implementation comments: +//! This function uses similar optimization principles as menu_draw_float31 +//! (i.e. str must include a ':' at its end) +//! FLASH usage dropped 234476B -> 234392B +//! Moreover, this function gets inlined in the final code, so removing it doesn't really help ;) +void menu_draw_float13(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_float13, chr, str, spaces, val); + lcd_printf_P(menu_fmt_float13, str, val); } template diff --git a/Firmware/menu.h b/Firmware/menu.h index 7ddfe3f2..9800550b 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -97,11 +97,12 @@ extern uint8_t menu_item_gcode_P(const char* str, const char* str_gcode); extern const char menu_fmt_int3[]; extern const char menu_fmt_float31[]; +extern const char menu_fmt_float13[]; -extern void menu_draw_float31(char chr, const char* str, float val); +extern void menu_draw_float31(const char* str, float val); -extern void menu_draw_float13(char chr, const char* str, float val); +extern void menu_draw_float13(const char* str, float val); #define MENU_ITEM_EDIT_int3_P(str, pval, minval, maxval) do { if (menu_item_edit_P(str, pval, minval, maxval)) return; } while (0) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp old mode 100644 new mode 100755 index 205c562d..47d97d9d --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3079,7 +3079,7 @@ static void _lcd_move(const char *name, int axis, int min, int max) if (lcd_draw_update) { lcd_set_cursor(0, 1); - menu_draw_float31(' ', name, current_position[axis]); + menu_draw_float31(name, current_position[axis]); } if (menu_leaving || LCD_CLICKED) (void)enable_endstops(_md->endstopsEnabledPrevious); if (LCD_CLICKED) menu_back(); @@ -3104,7 +3104,9 @@ static void lcd_move_e() if (lcd_draw_update) { lcd_set_cursor(0, 1); - menu_draw_float31(' ', PSTR("Extruder"), current_position[E_AXIS]); + // Note: the colon behind the text is necessary to greatly shorten + // the implementation of menu_draw_float31 + menu_draw_float31(PSTR("Extruder:"), current_position[E_AXIS]); } if (LCD_CLICKED) menu_back(); } @@ -3224,14 +3226,16 @@ void EEPROM_read_B(int pos, int* value) } +// Note: the colon behind the text (X, Y, Z) is necessary to greatly shorten +// the implementation of menu_draw_float31 static void lcd_move_x() { - _lcd_move(PSTR("X"), X_AXIS, X_MIN_POS, X_MAX_POS); + _lcd_move(PSTR("X:"), X_AXIS, X_MIN_POS, X_MAX_POS); } static void lcd_move_y() { - _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); + _lcd_move(PSTR("Y:"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); } static void lcd_move_z() { - _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); + _lcd_move(PSTR("Z:"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); } @@ -3304,7 +3308,7 @@ static void _lcd_babystep(int axis, const char *msg) if (lcd_draw_update) { lcd_set_cursor(0, 1); - menu_draw_float13(' ', msg, _md->babystepMemMM[axis]); + menu_draw_float13(msg, _md->babystepMemMM[axis]); } if (LCD_CLICKED || menu_leaving) { @@ -3320,7 +3324,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 + _lcd_babystep(Z_AXIS, (_i("Adjusting Z:")));////MSG_BABYSTEPPING_Z c=20 Beware: must include the ':' as its last character } diff --git a/lang/lang_en.txt b/lang/lang_en.txt old mode 100644 new mode 100755 index 3de507cb..73a67ce7 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -17,7 +17,7 @@ ">Cancel" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" +"Adjusting Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt old mode 100644 new mode 100755 index 9db15b02..66b5e4eb --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -23,8 +23,8 @@ ">Zrusit" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" -"Dostavovani Z" +"Adjusting Z:" +"Dostavovani Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt old mode 100644 new mode 100755 index 66995f4e..9f11328f --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -23,8 +23,8 @@ ">Abbruch" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" -"Z wurde eingestellt" +"Adjusting Z:" +"Z Einstellung:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt old mode 100644 new mode 100755 index 05757313..10bdbdd3 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -23,8 +23,8 @@ ">Cancelar" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" -"Ajustar Z" +"Adjusting Z:" +"Ajustar Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt old mode 100644 new mode 100755 index 9dd3d489..5136e460 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -23,8 +23,8 @@ ">Annuler" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" -"Ajustement de Z" +"Adjusting Z:" +"Ajust. de Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt old mode 100644 new mode 100755 index 45bddac7..2adc45c2 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -23,8 +23,8 @@ ">Annulla" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" -"Compensazione Z" +"Adjusting Z:" +"Compensaz. Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt old mode 100644 new mode 100755 index d0937dd8..e4fadbc8 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -23,8 +23,8 @@ ">Anuluj" #MSG_BABYSTEPPING_Z c=20 -"Adjusting Z" -"Dostrajanie Z" +"Adjusting Z:" +"Dostrajanie Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 "All correct " From dcfc6348ed1dd72f43a7ca734d570aac71c26e17 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 16 May 2019 17:22:47 +0200 Subject: [PATCH 117/168] Fix documentation. --- Firmware/menu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index cf0c368b..6c4fd7be 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -351,7 +351,6 @@ void menu_draw_P(char chr, const char* str, int16_t val) //! @brief Draw up to 10 chars of text and a float number in format from +0.0 to +12345.0. The increased range is necessary //! for displaying large values of extruder positions, which caused text overflow in the previous implementation. //! -//! @param chr first character to print on the line //! @param str string label to print //! @param val value to print aligned to the right side of the display //! From 74d8c15b4f4082d2e830be305b4320187ab5c724 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 16 May 2019 17:23:54 +0200 Subject: [PATCH 118/168] Fix documentation. --- Firmware/menu.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 6c4fd7be..3bd9d25f 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -365,7 +365,6 @@ void menu_draw_float31(const char* str, float val) //! @brief Draw up to 12 chars of text and a float number in format +1.234 //! -//! @param chr first character to print on the line //! @param str string label to print //! @param val value to print aligned to the right side of the display //! From 15ba17f110e6787477bdb800ac7ca6683822b526 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 16 May 2019 17:30:15 +0200 Subject: [PATCH 119/168] Fix translator columns hint for Adjusting Z: --- Firmware/ultralcd.cpp | 2 +- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 47d97d9d..0345f1eb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3324,7 +3324,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 Beware: must include the ':' as its last character + _lcd_babystep(Z_AXIS, (_i("Adjusting Z:")));////MSG_BABYSTEPPING_Z c=15 Beware: must include the ':' as its last character } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 73a67ce7..68568040 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -16,7 +16,7 @@ # ">Cancel" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" #MSG_SELFTEST_CHECK_ALLCORRECT c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 66b5e4eb..3ec3dde2 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -22,7 +22,7 @@ ">Cancel" ">Zrusit" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" "Dostavovani Z:" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9f11328f..1080e050 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -22,7 +22,7 @@ ">Cancel" ">Abbruch" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" "Z Einstellung:" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 10bdbdd3..3cdf4d63 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -22,7 +22,7 @@ ">Cancel" ">Cancelar" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" "Ajustar Z:" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 5136e460..4b8ba79d 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -22,7 +22,7 @@ ">Cancel" ">Annuler" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" "Ajust. de Z:" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 2adc45c2..1fb4aebe 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -22,7 +22,7 @@ ">Cancel" ">Annulla" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" "Compensaz. Z:" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index e4fadbc8..31b700e9 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -22,7 +22,7 @@ ">Cancel" ">Anuluj" -#MSG_BABYSTEPPING_Z c=20 +#MSG_BABYSTEPPING_Z c=15 "Adjusting Z:" "Dostrajanie Z:" From a408f906593db70b8dbbc0c44e961f43176ec1f1 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Sat, 18 May 2019 21:28:59 +0200 Subject: [PATCH 120/168] recovery from "Stop()" --- Firmware/cardreader.cpp | 1 + Firmware/cardreader.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index b57d5c0c..a9cea244 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -242,6 +242,7 @@ void CardReader::startFileprint() { sdprinting = true; paused = false; + Stopped = false; #ifdef SDCARD_SORT_ALPHA //flush_presort(); #endif diff --git a/Firmware/cardreader.h b/Firmware/cardreader.h index f287a44f..26981ef0 100644 --- a/Firmware/cardreader.h +++ b/Firmware/cardreader.h @@ -161,6 +161,7 @@ private: void flush_presort(); #endif }; +extern bool Stopped; extern CardReader card; #define IS_SD_PRINTING (card.sdprinting) From da98977de3e0046e5c190cf137e74c2b14ebba00 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 23 May 2019 10:45:55 +0200 Subject: [PATCH 121/168] Fix. menu texts and formatting - issues PFW-877 and PFW-879 --- Firmware/menu.cpp | 20 +++++++------------- Firmware/ultralcd.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 3bd9d25f..847e63c8 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -308,9 +308,9 @@ const char menu_fmt_int3[] PROGMEM = "%c%.15S:%s%3d"; const char menu_fmt_float31[] PROGMEM = "%-12.12S%+8.1f"; -const char menu_fmt_float13[] PROGMEM = "%-15.15S%+5.3f"; +const char menu_fmt_float13[] PROGMEM = "%c%-13.13S%+5.3f"; -const char menu_fmt_float13off[] PROGMEM = "%c%.12S:%s%"; +const char menu_fmt_float13off[] PROGMEM = "%c%-13.13S%6.6s"; template static void menu_draw_P(char chr, const char* str, int16_t val); @@ -331,20 +331,14 @@ template<> void menu_draw_P(char chr, const char* str, int16_t val) { menu_data_edit_t* _md = (menu_data_edit_t*)&(menu_data[0]); - int text_len = strlen_P(str); - if (text_len > 15) text_len = 15; - char spaces[21]; - strcpy_P(spaces, menu_20x_space); - spaces[12 - text_len] = 0; - float factor = 1.0 + static_cast(val) / 1000.0; + float factor = 1.0f + static_cast(val) / 1000.0f; if (val <= _md->minEditValue) { - lcd_printf_P(menu_fmt_float13off, chr, str, spaces); - lcd_puts_P(_i(" [off]")); + lcd_printf_P(menu_fmt_float13off, chr, str, " [off]"); } else { - lcd_printf_P(menu_fmt_float13, chr, str, spaces, factor); + lcd_printf_P(menu_fmt_float13, chr, str, factor); } } @@ -363,7 +357,7 @@ void menu_draw_float31(const char* str, float val) lcd_printf_P(menu_fmt_float31, str, val); } -//! @brief Draw up to 12 chars of text and a float number in format +1.234 +//! @brief Draw up to 14 chars of text and a float number in format +1.234 //! //! @param str string label to print //! @param val value to print aligned to the right side of the display @@ -375,7 +369,7 @@ void menu_draw_float31(const char* str, float val) //! Moreover, this function gets inlined in the final code, so removing it doesn't really help ;) void menu_draw_float13(const char* str, float val) { - lcd_printf_P(menu_fmt_float13, str, val); + lcd_printf_P(menu_fmt_float13, ' ', str, val); } template diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 0345f1eb..5948d376 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5191,11 +5191,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 - 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 + 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 + 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 From e17f3f84054f2fd0fa39a5981c5e9a3fa151d263 Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 23 May 2019 11:14:26 +0200 Subject: [PATCH 122/168] change language files accordingly --- Firmware/ultralcd.cpp | 8 ++++---- lang/lang_en.txt | 8 ++++---- lang/lang_en_cz.txt | 14 +++++++------- lang/lang_en_de.txt | 14 +++++++------- lang/lang_en_es.txt | 14 +++++++------- lang/lang_en_fr.txt | 14 +++++++------- lang/lang_en_it.txt | 14 +++++++------- lang/lang_en_pl.txt | 14 +++++++------- 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5948d376..97304adb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5191,11 +5191,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 - 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 + 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=10 + 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=10 + 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=10 #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 + 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=10 MENU_END(); } #endif // TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 68568040..b8ea25d0 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -160,8 +160,8 @@ #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 -"E-correct" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -899,7 +899,7 @@ "XYZ calibration all right. X/Y axes are slightly skewed. Good job!" # -"X-correct" +"X-correct:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -926,7 +926,7 @@ "Y distance from min" # -"Y-correct" +"Y-correct:" #MSG_OFF " [off]" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 3ec3dde2..027d0409 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -214,9 +214,9 @@ "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 -"E-correct" -"Korekce E" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" +"Korekce E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1199,8 +1199,8 @@ "Kalibrace XYZ v poradku. X/Y osy mirne zkosene. Dobra prace!" # -"X-correct" -"Korekce X" +"X-correct:" +"Korekce X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1235,8 +1235,8 @@ "Y vzdalenost od min" # -"Y-correct" -"Korekce Y" +"Y-correct:" +"Korekce Y:" #MSG_OFF " [off]" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 1080e050..c4c80d93 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -214,9 +214,9 @@ "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 -"E-correct" -"E-Korrektur" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" +"E-Korrektur:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1199,8 +1199,8 @@ "XYZ Kalibrierung in Ordnung. X/Y Achsen sind etwas schraeg." # -"X-correct" -"X-Korrektur" +"X-correct:" +"X-Korrektur:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1236,8 +1236,8 @@ "Y Entfernung vom Min" # -"Y-correct" -"Y-Korrektur" +"Y-correct:" +"Y-Korrektur:" #MSG_OFF " [off]" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 3cdf4d63..2f4dc251 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -214,9 +214,9 @@ "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 -"E-correct" -"E-correcion" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" +"E-correcion:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1199,8 +1199,8 @@ "Calibracion XYZ correcta. Los ejes X / Y estan ligeramente inclinados. Buen trabajo!" # -"X-correct" -"X-correcion" +"X-correct:" +"X-correcion:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1235,8 +1235,8 @@ "Distancia en Y desde el min" # -"Y-correct" -"Y-correcion" +"Y-correct:" +"Y-correcion:" #MSG_OFF " [off]" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 4b8ba79d..dfb0dd85 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -214,9 +214,9 @@ "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 -"E-correct" -"Correct-E" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" +"Correct-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1199,8 +1199,8 @@ "Calibration XYZ OK. Les axes X/Y sont legerement non perpendiculaires. Bon boulot !" # -"X-correct" -"Correction-X" +"X-correct:" +"Correct-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1235,8 +1235,8 @@ "Distance Y du min" # -"Y-correct" -"Correction-Y" +"Y-correct:" +"Correct-Y:" #MSG_OFF " [off]" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 1fb4aebe..9637777f 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -214,9 +214,9 @@ "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 -"E-correct" -"Correzione-E" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" +"Correzione-E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1199,8 +1199,8 @@ "Calibrazion XYZ corretta. Assi X/Y leggermente storti. Ben fatto!" # -"X-correct" -"Correzione-X" +"X-correct:" +"Correzione-X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1235,8 +1235,8 @@ "Distanza Y dal min" # -"Y-correct" -"Correzione-Y" +"Y-correct:" +"Correzione-Y:" #MSG_OFF " [off]" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 31b700e9..fe422cc3 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -214,9 +214,9 @@ "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 -"E-correct" -"Korekcja E" +#MSG_EXTRUDER_CORRECTION c=10 +"E-correct:" +"Korekcja E:" #MSG_EJECT_FILAMENT c=17 r=1 "Eject filament" @@ -1199,8 +1199,8 @@ "Kalibracja XYZ prawidlowa. Osie X/Y lekko skosne. Dobra robota!" # -"X-correct" -"Korekcja X" +"X-correct:" +"Korekcja X:" #MSG_BED_SKEW_OFFSET_DETECTION_PERFECT c=20 r=8 "XYZ calibration ok. X/Y axes are perpendicular. Congratulations!" @@ -1235,8 +1235,8 @@ "Dystans od 0 w osi Y" # -"Y-correct" -"Korekcja Y" +"Y-correct:" +"Korekcja Y:" #MSG_OFF " [off]" From 63235625aba1e4bc7b68e6152cdb9170d6cf9d62 Mon Sep 17 00:00:00 2001 From: Ondrej Tuma Date: Mon, 20 May 2019 14:52:48 +0200 Subject: [PATCH 123/168] pause printer by flag --- Firmware/Marlin_main.cpp | 9 ++++++++- Firmware/temperature.cpp | 5 ++++- Firmware/temperature.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 2cd0abe8..a1740b24 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -156,7 +156,6 @@ //=============================imported variables============================ //=========================================================================== - //=========================================================================== //=============================public variables============================= //=========================================================================== @@ -3389,6 +3388,14 @@ extern uint8_t st_backlash_y; //!@n M999 - Restart after being stopped by error void process_commands() { + #ifdef FANCHECK + if (fan_check_error){ + fan_check_error = false; + lcd_pause_print(); + return; + } + #endif + if (!buflen) return; //empty command #ifdef FILAMENT_RUNOUT_SUPPORT SET_INPUT(FR_SENS); diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index f64c5d9d..668b857f 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -94,6 +94,9 @@ float current_temperature_bed = 0.0; unsigned char fanSpeedSoftPwm; #endif +#ifdef FANCHECK + volatile bool fan_check_error = false; +#endif unsigned char soft_pwm_bed; @@ -527,7 +530,7 @@ void fanSpeedError(unsigned char _fan) { lcd_print_stop(); } else { - lcd_pause_print(); + fan_check_error = true; } } else { diff --git a/Firmware/temperature.h b/Firmware/temperature.h index ba9632cf..31ab8d9f 100644 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -238,6 +238,8 @@ void checkExtruderAutoFans(); #if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1)) +extern volatile bool fan_check_error; + void countFanSpeed(); void checkFanSpeed(); void fanSpeedError(unsigned char _fan); From 1399d7dcc837393f5b3b19deab5c6b76d548a4a8 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Thu, 23 May 2019 15:22:31 +0200 Subject: [PATCH 124/168] support only for MK3/MK3S --- Firmware/Marlin_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a1740b24..d37fbb38 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -867,6 +867,7 @@ void show_fw_version_warnings() { //! @brief try to check if firmware is on right type of printer static void check_if_fw_is_on_right_printer(){ #ifdef FILAMENT_SENSOR + if((PRINTER_TYPE == PRINTER_MK3) || (PRINTER_TYPE == PRINTER_MK3S)){ #ifdef IR_SENSOR swi2c_init(); const uint8_t pat9125_detected = swi2c_readByte_A8(PAT9125_I2C_ADDR,0x00,NULL); @@ -880,6 +881,7 @@ static void check_if_fw_is_on_right_printer(){ if (ir_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));} #endif //PAT9125 + } #endif //FILAMENT_SENSOR } From 9cb0bc7bcf35f3408353a2b67c407293657d5792 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 24 May 2019 08:46:44 +0200 Subject: [PATCH 125/168] Fix MINTEMP errors and fsensor runout --- Firmware/Marlin.h | 7 ++++ Firmware/Marlin_main.cpp | 4 ++ Firmware/fsensor.cpp | 32 ++++++++++----- Firmware/fsensor.h | 3 ++ Firmware/menu.cpp | 2 +- Firmware/menu.h | 21 ++++++++++ Firmware/temperature.cpp | 89 +++++++++++++++++++++++++++++++++++++++- Firmware/ultralcd.cpp | 18 ++++++-- Firmware/ultralcd.h | 9 ++++ 9 files changed, 168 insertions(+), 17 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index b82856f8..2e60597d 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -390,6 +390,13 @@ extern LongTimer safetyTimer; #define PRINT_PERCENT_DONE_INIT 0xff #define PRINTER_ACTIVE (IS_SD_PRINTING || is_usb_printing || isPrintPaused || (custom_message_type == CUSTOM_MSG_TYPE_TEMCAL) || saved_printing || (lcd_commands_type == LCD_COMMAND_V2_CAL) || card.paused || mmu_print_saved) +//! Beware - mcode_in_progress is set as soon as the command gets really processed, +//! which is not the same as posting the M600 command into the command queue +//! There can be a considerable lag between posting M600 and its real processing which might result +//! in posting multiple M600's into the command queue +//! Instead, the fsensor uses another state variable :( , which is set to true, when the M600 command is enqued +//! and is reset to false when the fsensor returns into its filament runout finished handler +//! I'd normally change this macro, but who knows what would happen in the MMU :) #define CHECK_FSENSOR ((IS_SD_PRINTING || is_usb_printing) && (mcode_in_progress != 600) && !saved_printing && e_active()) extern void calculate_extruder_multipliers(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a1740b24..8e216ae0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3552,6 +3552,10 @@ void process_commands() enquecommand_P(PSTR("M24")); } #ifdef FILAMENT_SENSOR + else if (code_seen("fsensor_recover_IR")) //! PRUSA fsensor_recover_IR + { + fsensor_restore_print_and_continue_IR(); + } else if (code_seen("fsensor_recover")) //! PRUSA fsensor_recover { fsensor_restore_print_and_continue(); diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index d520ba53..f9ca8909 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -57,6 +57,11 @@ bool fsensor_not_responding = false; bool fsensor_printing_saved = false; //! enable/disable quality meassurement bool fsensor_oq_meassure_enabled = false; +//! as explained in the CHECK_FSENSOR macro: this flag is set to true when fsensor posts +//! the M600 into the command queue, which elliminates the hazard of having posted multiple M600's +//! before the first one gets read and started processing. +//! Btw., the IR fsensor could do up to 6 posts before the command queue managed to start processing the first M600 ;) +static bool fsensor_m600_enqueued = false; //! number of errors, updated in ISR uint8_t fsensor_err_cnt = 0; @@ -118,11 +123,17 @@ void fsensor_stop_and_save_print(void) stop_and_save_print_to_ram(0, 0); //XYZE - no change } +void fsensor_restore_print_and_continue_IR(void) +{ + fsensor_watch_runout = true; + fsensor_err_cnt = 0; + fsensor_m600_enqueued = false; +} + void fsensor_restore_print_and_continue(void) { printf_P(PSTR("fsensor_restore_print_and_continue\n")); - fsensor_watch_runout = true; - fsensor_err_cnt = 0; + fsensor_restore_print_and_continue_IR(); restore_print_from_ram_and_continue(0); //XYZ = orig, E - no change } @@ -575,14 +586,15 @@ void fsensor_update(void) fsensor_oq_meassure_enabled = oq_meassure_enabled_tmp; } #else //PAT9125 - if ((digitalRead(IR_SENSOR_PIN) == 1) && CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected) - { - fsensor_stop_and_save_print(); - printf_P(PSTR("fsensor_update - M600\n")); - eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("PRUSA fsensor_recover")); - enquecommand_front_P((PSTR("M600"))); + if ((digitalRead(IR_SENSOR_PIN) == 1) && CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected && ( ! fsensor_m600_enqueued) ) + { // just plan a simple M600 without any additional position save/restore, + // which caused weird heating issues standing directly over the print + printf_P(PSTR("fsensor_update - M600\n")); + eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); + enquecommand_front_P(PSTR("PRUSA fsensor_recover_IR")); + fsensor_m600_enqueued = true; + enquecommand_front_P((PSTR("M600"))); } #endif //PAT9125 } diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h index 71922fbf..421eee43 100644 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -18,6 +18,9 @@ extern bool fsensor_oq_meassure_enabled; //! @name save restore printing //! @{ extern void fsensor_stop_and_save_print(void); +//! special handling for the IR sensor (no restore position and heating, since this is already correctly handled in the M600 itself) +extern void fsensor_restore_print_and_continue_IR(void); +//! legacy restore print - restore position and heatup to original temperature - for the MMU and the optical fsensor extern void fsensor_restore_print_and_continue(void); //! @} diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 847e63c8..e0364056 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -26,7 +26,7 @@ uint8_t menu_data[MENU_DATA_SIZE]; #endif uint8_t menu_depth = 0; - +uint8_t menu_block_entering_on_serious_errors = SERIOUS_ERR_NONE; uint8_t menu_line = 0; uint8_t menu_item = 0; uint8_t menu_row = 0; diff --git a/Firmware/menu.h b/Firmware/menu.h index 9800550b..5f73e18b 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -28,6 +28,27 @@ extern uint8_t menu_data[MENU_DATA_SIZE]; extern uint8_t menu_depth; +//! definition of serious errors possibly blocking the main menu +//! Use them as bit mask, so that the code may set various errors at the same time +enum ESeriousErrors { + SERIOUS_ERR_NONE = 0, + SERIOUS_ERR_MINTEMP_HEATER = 0x01, + SERIOUS_ERR_MINTEMP_BED = 0x02 +}; // and possibly others in the future. + +//! this is a flag for disabling entering the main menu. If this is set +//! to anything != 0, the only the main status screen will be shown on the +//! LCD and the user will be prevented from entering the menu. +//! Now used only to block doing anything with the printer when there is +//! the infamous MINTEMP error (SERIOUS_ERR_MINTEMP). +extern uint8_t menu_block_entering_on_serious_errors; + +//! a pair of macros for manipulating the serious errors +//! a c++ class would have been better +#define menu_set_serious_error(x) menu_block_entering_on_serious_errors |= x; +#define menu_unset_serious_error(x) menu_block_entering_on_serious_errors &= ~x; +#define menu_is_serious_error(x) (menu_block_entering_on_serious_errors & x) != 0 + extern uint8_t menu_line; extern uint8_t menu_item; extern uint8_t menu_row; diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 668b857f..5a81c630 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -1469,6 +1469,15 @@ void disable_heater() #endif #endif } +//! codes of alert messages for the LCD - it is shorter to compare an uin8_t +//! than raw const char * of the messages themselves. +//! Could be used for MAXTEMP situations too - after reaching MAXTEMP and turning off the heater automagically +//! the heater/bed may cool down and a similar alert message like "MAXTERM fixed..." may be displayed. +enum { LCDALERT_NONE = 0, LCDALERT_HEATERMINTEMP, LCDALERT_BEDMINTEMP, LCDALERT_MINTEMPFIXED, LCDALERT_PLEASERESTART }; + +//! remember the last alert message sent to the LCD +//! to prevent flicker and improve speed +uint8_t last_alert_sent_to_lcd = LCDALERT_NONE; void max_temp_error(uint8_t e) { disable_heater(); @@ -1502,13 +1511,23 @@ void min_temp_error(uint8_t e) { #endif //if (current_temperature_ambient < MINTEMP_MINAMBIENT) return; disable_heater(); + static const char err[] PROGMEM = "Err: MINTEMP"; if(IsStopped() == false) { SERIAL_ERROR_START; SERIAL_ERRORLN((int)e); SERIAL_ERRORLNPGM(": Extruder switched off. MINTEMP triggered !"); - LCD_ALERTMESSAGEPGM("Err: MINTEMP"); + lcd_setalertstatuspgm(err); + last_alert_sent_to_lcd = LCDALERT_HEATERMINTEMP; + } else if( last_alert_sent_to_lcd != LCDALERT_HEATERMINTEMP ){ // only update, if the lcd message is to be changed (i.e. not the same as last time) + // we are already stopped due to some error, only update the status message without flickering + lcd_updatestatuspgm(err); + last_alert_sent_to_lcd = LCDALERT_HEATERMINTEMP; } #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE +// if( last_alert_sent_to_lcd != LCDALERT_HEATERMINTEMP ){ +// last_alert_sent_to_lcd = LCDALERT_HEATERMINTEMP; +// lcd_print_stop(); +// } Stop(); #endif if (farm_mode) { prusa_statistics(92); } @@ -1538,10 +1557,16 @@ void bed_min_temp_error(void) { #if HEATER_BED_PIN > -1 WRITE(HEATER_BED_PIN, 0); #endif + static const char err[] PROGMEM = "Err: MINTEMP BED"; if(IsStopped() == false) { SERIAL_ERROR_START; SERIAL_ERRORLNPGM("Temperature heated bed switched off. MINTEMP triggered !"); - LCD_ALERTMESSAGEPGM("Err: MINTEMP BED"); + lcd_setalertstatuspgm(err); + last_alert_sent_to_lcd = LCDALERT_BEDMINTEMP; + } else if( last_alert_sent_to_lcd != LCDALERT_BEDMINTEMP ){ // only update, if the lcd message is to be changed (i.e. not the same as last time) + // we are already stopped due to some error, only update the status message without flickering + lcd_updatestatuspgm(err); + last_alert_sent_to_lcd = LCDALERT_BEDMINTEMP; } #ifndef BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE Stop(); @@ -2015,6 +2040,52 @@ void check_max_temp() #endif } +//! number of repeating the same state with consecutive step() calls +//! used to slow down text switching +struct alert_automaton_mintemp { + enum { ALERT_AUTOMATON_SPEED_DIV = 5 }; + uint8_t state, repeat = ALERT_AUTOMATON_SPEED_DIV; + + void substep(uint8_t next_state){ + if( repeat == 0 ){ + state = next_state; // advance to the next state + repeat = ALERT_AUTOMATON_SPEED_DIV; // and prepare repeating for it too + } else { + --repeat; + } + } + + void step(float current_temp, float mintemp){ + static const char m2[] PROGMEM = "MINTEMP fixed"; + static const char m1[] PROGMEM = "Please restart"; + switch(state){ + case 0: // initial state - check hysteresis + if( current_temp > mintemp ){ + state = 1; + } + // otherwise keep the Err MINTEMP alert message on the display, + // i.e. do not transfer to state 1 + break; + case 1: // the temperature has risen above the hysteresis check + lcd_setalertstatuspgm(m2); + substep(3); + last_alert_sent_to_lcd = LCDALERT_MINTEMPFIXED; + break; + case 2: // displaying "Please restart" + lcd_updatestatuspgm(m1); + substep(3); + last_alert_sent_to_lcd = LCDALERT_PLEASERESTART; + break; + case 3: // displaying "MINTEMP fixed" + lcd_updatestatuspgm(m2); + substep(2); + last_alert_sent_to_lcd = LCDALERT_MINTEMPFIXED; + break; + } + } +}; + +static alert_automaton_mintemp aam[2]; void check_min_temp_heater0() { @@ -2024,7 +2095,16 @@ void check_min_temp_heater0() #else if (current_temperature_raw[0] <= minttemp_raw[0]) { #endif + menu_set_serious_error(SERIOUS_ERR_MINTEMP_HEATER); min_temp_error(0); + } else if( menu_is_serious_error(SERIOUS_ERR_MINTEMP_HEATER) ) { + // no recovery, just force the user to restart the printer + // which is a safer variant than just continuing printing + // The automaton also checks for hysteresis - the temperature must have reached a few degrees above the MINTEMP, before + // we shall signalize, that MINTEMP has been fixed + // Code notice: normally the aam instance would have been placed here as static alert_automaton_mintemp aam, but + // due to stupid compiler that takes 16 more bytes. + aam[0].step(current_temperature[0], minttemp[0] + TEMP_HYSTERESIS); } } @@ -2035,7 +2115,12 @@ void check_min_temp_bed() #else if (current_temperature_bed_raw <= bed_minttemp_raw) { #endif + menu_set_serious_error(SERIOUS_ERR_MINTEMP_BED); bed_min_temp_error(); + } else if( menu_is_serious_error(SERIOUS_ERR_MINTEMP_BED) ){ + // no recovery, just force the user to restart the printer + // which is a safer variant than just continuing printing + aam[1].step(current_temperature_bed, BED_MINTEMP + TEMP_HYSTERESIS); } } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 97304adb..23571eed 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -252,6 +252,7 @@ static void lcd_send_status(); static void lcd_connect_printer(); #endif //FARM_CONNECT_MESSAGE +//! Beware: has side effects - forces lcd_draw_update to 2, which means clear the display void lcd_finishstatus(); static void lcd_sdcard_menu(); @@ -1018,7 +1019,10 @@ static void lcd_status_screen() } } - if (current_click && (lcd_commands_type != LCD_COMMAND_STOP_PRINT)) //click is aborted unless stop print finishes + if (current_click + && (lcd_commands_type != LCD_COMMAND_STOP_PRINT) //click is aborted unless stop print finishes + && ( menu_block_entering_on_serious_errors == SERIOUS_ERR_NONE ) // or a serious error blocks entering the menu + ) { menu_depth = 0; //redundant, as already done in lcd_return_to_status(), just to be sure menu_submenu(lcd_main_menu); @@ -8276,13 +8280,19 @@ void lcd_setstatus(const char* message) strncpy(lcd_status_message, message, LCD_WIDTH); lcd_finishstatus(); } +void lcd_updatestatuspgm(const char *message){ + strncpy_P(lcd_status_message, message, LCD_WIDTH); + lcd_status_message[LCD_WIDTH] = 0; + lcd_finishstatus(); + // hack lcd_draw_update to 1, i.e. without clear + lcd_draw_update = 1; +} + void lcd_setstatuspgm(const char* message) { if (lcd_status_message_level > 0) return; - strncpy_P(lcd_status_message, message, LCD_WIDTH); - lcd_status_message[LCD_WIDTH] = 0; - lcd_finishstatus(); + lcd_updatestatuspgm(message); } void lcd_setalertstatuspgm(const char* message) { diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index 365f1797..665c1233 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -18,7 +18,16 @@ extern void menu_lcd_lcdupdate_func(void); void ultralcd_init(); void lcd_setstatus(const char* message); void lcd_setstatuspgm(const char* message); +//! return to the main status screen and display the alert message +//! Beware - it has sideeffects: +//! - always returns the display to the main status screen +//! - always makes lcd_reset (which is slow and causes flicker) +//! - does not update the message if there is already one (i.e. lcd_status_message_level > 0) void lcd_setalertstatuspgm(const char* message); +//! only update the alert message on the main status screen +//! has no sideeffects, may be called multiple times +void lcd_updatestatuspgm(const char *message); + void lcd_reset_alert_level(); uint8_t get_message_level(); void lcd_adjust_z(); From 69455bfc75c8ea074e01db21efdea506d86ba212 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Fri, 24 May 2019 18:28:16 +0200 Subject: [PATCH 126/168] PFW-828 fix printing in the air after power panic --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a1740b24..4769d59c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8823,7 +8823,6 @@ void uvlo_() // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); - printf_P(_N("UVLO - end %d\n"), _millis() - time_start); #if 0 From 55a2d588f174fd88a353c7d23f872c53cf03cdb8 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Fri, 24 May 2019 18:28:38 +0200 Subject: [PATCH 127/168] PFW-828 printing in the air after power panic --- Firmware/Marlin_main.cpp | 69 ++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4769d59c..0b9b2672 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1296,9 +1296,12 @@ void setup() #endif //TMC2130 + #ifdef UVLO_SUPPORT + setup_uvlo_interrupt(); + #endif //UVLO_SUPPORT st_init(); // Initialize stepper, this enables interrupts! - + #ifdef TMC2130 tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; update_mode_profile(); @@ -1500,10 +1503,6 @@ void setup() } check_babystep(); //checking if Z babystep is in allowed range -#ifdef UVLO_SUPPORT - setup_uvlo_interrupt(); -#endif //UVLO_SUPPORT - #if !defined(DEBUG_DISABLE_FANCHECK) && defined(FANCHECK) && defined(TACH_1) && TACH_1 >-1 setup_fan_interrupt(); #endif //DEBUG_DISABLE_FANCHECK @@ -8689,7 +8688,6 @@ void serialecho_temperatures() { } extern uint32_t sdpos_atomic; - #ifdef UVLO_SUPPORT void uvlo_() @@ -8760,26 +8758,15 @@ void uvlo_() st_synchronize(); disable_e0(); - plan_buffer_line( - current_position[X_AXIS], - current_position[Y_AXIS], - current_position[Z_AXIS] + UVLO_Z_AXIS_SHIFT + float((1024 - z_microsteps + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS], + plan_buffer_line( + current_position[X_AXIS], + current_position[Y_AXIS], + current_position[Z_AXIS] + UVLO_Z_AXIS_SHIFT + float((1024 - z_microsteps + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS], current_position[E_AXIS] - default_retraction, 40, active_extruder); - - st_synchronize(); - disable_e0(); - - plan_buffer_line( - current_position[X_AXIS], - current_position[Y_AXIS], - current_position[Z_AXIS] + UVLO_Z_AXIS_SHIFT + float((1024 - z_microsteps + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS], - current_position[E_AXIS] - default_retraction, - 40, active_extruder); st_synchronize(); disable_e0(); disable_z(); - // Move Z up to the next 0th full step. // Write the file position. eeprom_update_dword((uint32_t*)(EEPROM_FILE_POSITION), sd_position); @@ -8823,8 +8810,8 @@ void uvlo_() // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); - printf_P(_N("UVLO - end %d\n"), _millis() - time_start); - + printf_P(_N("UVLO - end %d\n"), _millis() - time_start); + #if 0 // Move the print head to the side of the print until all the power stored in the power supply capacitors is depleted. current_position[X_AXIS] = (current_position[X_AXIS] < 0.5f * (X_MIN_POS + X_MAX_POS)) ? X_MIN_POS : X_MAX_POS; @@ -8859,23 +8846,13 @@ z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); #endif //TMC2130 planner_abort_hard(); -sei(); -plan_buffer_line( - current_position[X_AXIS], - current_position[Y_AXIS], -// current_position[Z_AXIS]+float((1024-z_microsteps+7)>>4)/axis_steps_per_unit[Z_AXIS], - current_position[Z_AXIS]+UVLO_Z_AXIS_SHIFT+float((1024-z_microsteps+7)>>4)/cs.axis_steps_per_unit[Z_AXIS], - current_position[E_AXIS], - 40, active_extruder); -st_synchronize(); disable_z(); // Finaly store the "power outage" flag. //if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); -eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); -eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); +eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS),z_microsteps); // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); @@ -8946,15 +8923,13 @@ ISR(INT4_vect) { if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); } -void recover_print(uint8_t automatic) { +void recover_print(uint8_t automatic) { char cmd[30]; lcd_update_enable(true); lcd_update(2); - lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1 - + printf_P(_N("UVLO - end %d\n"), _millis() - time_start); bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers - // Lift the print head, so one may remove the excess priming material. if(!bTiny&&(current_position[Z_AXIS]<25)) enquecommand_P(PSTR("G1 Z25 F800")); @@ -8977,8 +8952,7 @@ void recover_print(uint8_t automatic) { // Restart the print. restore_print_from_eeprom(); - - printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); + printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); } void recover_machine_state_after_power_panic(bool bTiny) @@ -8990,12 +8964,14 @@ void recover_machine_state_after_power_panic(bool bTiny) current_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. - if(bTiny) - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + - UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; - else + if(bTiny){ current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + } + else{ + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + } if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); sprintf_P(cmd, PSTR("G92 E")); @@ -9038,7 +9014,7 @@ void recover_machine_state_after_power_panic(bool bTiny) axis_known_position[X_AXIS] = true; enable_x(); axis_known_position[Y_AXIS] = true; enable_y(); axis_known_position[Z_AXIS] = true; enable_z(); - + SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); print_physical_coordinates(); @@ -9103,7 +9079,8 @@ void restore_print_from_eeprom() { strcat_P(cmd, PSTR(" F2000")); enquecommand(cmd); // Move the Z axis down to the print, in logical coordinates. - strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)))); + strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32(current_position[Z_AXIS] - (UVLO_Z_AXIS_SHIFT + + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]))); enquecommand(cmd); // Unretract. enquecommand_P(PSTR("G1 E" STRINGIFY(2*default_retraction)" F480")); From f070a1090461ef4c8890fd671704d79ad5589168 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Mon, 27 May 2019 10:10:24 +0200 Subject: [PATCH 128/168] edit --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0b9b2672..982e2130 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8927,7 +8927,6 @@ void recover_print(uint8_t automatic) { char cmd[30]; lcd_update_enable(true); lcd_update(2); - printf_P(_N("UVLO - end %d\n"), _millis() - time_start); bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers // Lift the print head, so one may remove the excess priming material. From 4d020d99f6eefecba90afbc8dec867ce25868c30 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 27 May 2019 14:57:02 +0200 Subject: [PATCH 129/168] Code cleanup --- Firmware/temperature.cpp | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 5a81c630..20ba8871 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2043,10 +2043,13 @@ void check_max_temp() //! number of repeating the same state with consecutive step() calls //! used to slow down text switching struct alert_automaton_mintemp { +private: enum { ALERT_AUTOMATON_SPEED_DIV = 5 }; - uint8_t state, repeat = ALERT_AUTOMATON_SPEED_DIV; + enum class STATES : uint8_t { INIT = 0, TEMP_ABOVE_MINTEMP, SHOW_PLEASE_RESTART, SHOW_MINTEMP }; + STATES state = STATES::INIT; + uint8_t repeat = ALERT_AUTOMATON_SPEED_DIV; - void substep(uint8_t next_state){ + void substep(STATES next_state){ if( repeat == 0 ){ state = next_state; // advance to the next state repeat = ALERT_AUTOMATON_SPEED_DIV; // and prepare repeating for it too @@ -2054,38 +2057,41 @@ struct alert_automaton_mintemp { --repeat; } } - +public: + //! brief state automaton step routine + //! @param current_temp current hotend/bed temperature (for computing simple hysteresis) + //! @param mintemp minimal temperature including hysteresis to check current_temp against void step(float current_temp, float mintemp){ static const char m2[] PROGMEM = "MINTEMP fixed"; static const char m1[] PROGMEM = "Please restart"; switch(state){ - case 0: // initial state - check hysteresis + case STATES::INIT: // initial state - check hysteresis if( current_temp > mintemp ){ - state = 1; + state = STATES::TEMP_ABOVE_MINTEMP; } // otherwise keep the Err MINTEMP alert message on the display, // i.e. do not transfer to state 1 break; - case 1: // the temperature has risen above the hysteresis check + case STATES::TEMP_ABOVE_MINTEMP: // the temperature has risen above the hysteresis check lcd_setalertstatuspgm(m2); - substep(3); + substep(STATES::SHOW_MINTEMP); last_alert_sent_to_lcd = LCDALERT_MINTEMPFIXED; break; - case 2: // displaying "Please restart" + case STATES::SHOW_PLEASE_RESTART: // displaying "Please restart" lcd_updatestatuspgm(m1); - substep(3); + substep(STATES::SHOW_MINTEMP); last_alert_sent_to_lcd = LCDALERT_PLEASERESTART; break; - case 3: // displaying "MINTEMP fixed" + case STATES::SHOW_MINTEMP: // displaying "MINTEMP fixed" lcd_updatestatuspgm(m2); - substep(2); + substep(STATES::SHOW_PLEASE_RESTART); last_alert_sent_to_lcd = LCDALERT_MINTEMPFIXED; break; } } }; -static alert_automaton_mintemp aam[2]; +static alert_automaton_mintemp alert_automaton_hotend, alert_automaton_bed; void check_min_temp_heater0() { @@ -2102,9 +2108,10 @@ void check_min_temp_heater0() // which is a safer variant than just continuing printing // The automaton also checks for hysteresis - the temperature must have reached a few degrees above the MINTEMP, before // we shall signalize, that MINTEMP has been fixed - // Code notice: normally the aam instance would have been placed here as static alert_automaton_mintemp aam, but + // Code notice: normally the alert_automaton instance would have been placed here + // as static alert_automaton_mintemp alert_automaton_hotend, but // due to stupid compiler that takes 16 more bytes. - aam[0].step(current_temperature[0], minttemp[0] + TEMP_HYSTERESIS); + alert_automaton_hotend.step(current_temperature[0], minttemp[0] + TEMP_HYSTERESIS); } } @@ -2120,7 +2127,7 @@ void check_min_temp_bed() } else if( menu_is_serious_error(SERIOUS_ERR_MINTEMP_BED) ){ // no recovery, just force the user to restart the printer // which is a safer variant than just continuing printing - aam[1].step(current_temperature_bed, BED_MINTEMP + TEMP_HYSTERESIS); + alert_automaton_bed.step(current_temperature_bed, BED_MINTEMP + TEMP_HYSTERESIS); } } From 253087a4c5a2ebbfe45d2dd7fda8d53ec59be958 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 27 May 2019 16:18:21 +0200 Subject: [PATCH 130/168] Code cleanup --- Firmware/temperature.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 20ba8871..b245b23b 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2045,11 +2045,11 @@ void check_max_temp() struct alert_automaton_mintemp { private: enum { ALERT_AUTOMATON_SPEED_DIV = 5 }; - enum class STATES : uint8_t { INIT = 0, TEMP_ABOVE_MINTEMP, SHOW_PLEASE_RESTART, SHOW_MINTEMP }; - STATES state = STATES::INIT; + enum class States : uint8_t { INIT = 0, TEMP_ABOVE_MINTEMP, SHOW_PLEASE_RESTART, SHOW_MINTEMP }; + States state = States::INIT; uint8_t repeat = ALERT_AUTOMATON_SPEED_DIV; - void substep(STATES next_state){ + void substep(States next_state){ if( repeat == 0 ){ state = next_state; // advance to the next state repeat = ALERT_AUTOMATON_SPEED_DIV; // and prepare repeating for it too @@ -2065,26 +2065,26 @@ public: static const char m2[] PROGMEM = "MINTEMP fixed"; static const char m1[] PROGMEM = "Please restart"; switch(state){ - case STATES::INIT: // initial state - check hysteresis + case States::INIT: // initial state - check hysteresis if( current_temp > mintemp ){ - state = STATES::TEMP_ABOVE_MINTEMP; + state = States::TEMP_ABOVE_MINTEMP; } // otherwise keep the Err MINTEMP alert message on the display, // i.e. do not transfer to state 1 break; - case STATES::TEMP_ABOVE_MINTEMP: // the temperature has risen above the hysteresis check + case States::TEMP_ABOVE_MINTEMP: // the temperature has risen above the hysteresis check lcd_setalertstatuspgm(m2); - substep(STATES::SHOW_MINTEMP); + substep(States::SHOW_MINTEMP); last_alert_sent_to_lcd = LCDALERT_MINTEMPFIXED; break; - case STATES::SHOW_PLEASE_RESTART: // displaying "Please restart" + case States::SHOW_PLEASE_RESTART: // displaying "Please restart" lcd_updatestatuspgm(m1); - substep(STATES::SHOW_MINTEMP); + substep(States::SHOW_MINTEMP); last_alert_sent_to_lcd = LCDALERT_PLEASERESTART; break; - case STATES::SHOW_MINTEMP: // displaying "MINTEMP fixed" + case States::SHOW_MINTEMP: // displaying "MINTEMP fixed" lcd_updatestatuspgm(m2); - substep(STATES::SHOW_PLEASE_RESTART); + substep(States::SHOW_PLEASE_RESTART); last_alert_sent_to_lcd = LCDALERT_MINTEMPFIXED; break; } From 326c061d8c0018e8be5b8c434998d5ecdc887cb9 Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 27 May 2019 18:27:24 +0200 Subject: [PATCH 131/168] testing pin 5 --- Firmware/pins_Einsy_1_0.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 Firmware/pins_Einsy_1_0.h diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h old mode 100644 new mode 100755 index 33363388..2e05d326 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -99,7 +99,8 @@ //#define KILL_PIN 32 -//#define LCD_BL_PIN 5 //backlight control pin +// LCD backlight pin may interfere with something, this is yet to be found out correctly +#define LCD_BL_PIN 5 //backlight control pin #define BEEPER 84 // Beeper on AUX-4 #define LCD_PINS_RS 82 #define LCD_PINS_ENABLE 61 // !!! changed from 18 (EINY03) From 8842d168321c9cce088a4114a3c6b1b83fba6bfe Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Tue, 28 May 2019 13:50:21 +0200 Subject: [PATCH 132/168] add back uvlo tiny z positio --- Firmware/Marlin_main.cpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 982e2130..7352dae9 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1008,6 +1008,10 @@ void setup() { mmu_init(); + #ifdef UVLO_SUPPORT + setup_uvlo_interrupt(); + #endif //UVLO_SUPPORT + ultralcd_init(); #if (LCD_BL_PIN != -1) && defined (LCD_BL_PIN) @@ -1296,10 +1300,6 @@ void setup() #endif //TMC2130 - #ifdef UVLO_SUPPORT - setup_uvlo_interrupt(); - #endif //UVLO_SUPPORT - st_init(); // Initialize stepper, this enables interrupts! #ifdef TMC2130 @@ -8686,7 +8686,6 @@ void serialecho_temperatures() { SERIAL_PROTOCOL_F(degBed(), 1); SERIAL_PROTOCOLLN(""); } - extern uint32_t sdpos_atomic; #ifdef UVLO_SUPPORT @@ -8850,9 +8849,11 @@ disable_z(); // Finaly store the "power outage" flag. //if(sd_print) - eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); - -eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS),z_microsteps); +if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==1){ + eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); + eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS),z_microsteps); +} +eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); @@ -8923,10 +8924,11 @@ ISR(INT4_vect) { if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); } -void recover_print(uint8_t automatic) { +void recover_print(uint8_t automatic) { char cmd[30]; lcd_update_enable(true); lcd_update(2); + lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1 bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers // Lift the print head, so one may remove the excess priming material. @@ -8964,8 +8966,7 @@ void recover_machine_state_after_power_panic(bool bTiny) // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. if(bTiny){ - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + - UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; } else{ current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + @@ -9078,7 +9079,7 @@ void restore_print_from_eeprom() { strcat_P(cmd, PSTR(" F2000")); enquecommand(cmd); // Move the Z axis down to the print, in logical coordinates. - strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32(current_position[Z_AXIS] - (UVLO_Z_AXIS_SHIFT + + strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32( eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) - (UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]))); enquecommand(cmd); // Unretract. @@ -9570,7 +9571,7 @@ void M600_load_filament_movements() st_synchronize(); } -void M600_load_filament() { +void M600_load_filament() { //TODO: ----- //load filament for single material and SNMM lcd_wait_interact(); From bcb6129c29e89b7f1c0752ee98f4396d35f1bd33 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Tue, 28 May 2019 14:11:38 +0200 Subject: [PATCH 133/168] delete comment --- 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 7352dae9..0bbe6a4e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9571,7 +9571,7 @@ void M600_load_filament_movements() st_synchronize(); } -void M600_load_filament() { //TODO: ----- +void M600_load_filament() { //load filament for single material and SNMM lcd_wait_interact(); From e9c870e7a069ca22964d828853f64a2ea59fba08 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Wed, 29 May 2019 20:33:22 +0200 Subject: [PATCH 134/168] fix of fixof power panic --- Firmware/Marlin_main.cpp | 49 +++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0bbe6a4e..9f25fdb6 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1007,10 +1007,6 @@ static void w25x20cl_err_msg() void setup() { mmu_init(); - - #ifdef UVLO_SUPPORT - setup_uvlo_interrupt(); - #endif //UVLO_SUPPORT ultralcd_init(); @@ -1300,6 +1296,10 @@ void setup() #endif //TMC2130 + #ifdef UVLO_SUPPORT + setup_uvlo_interrupt(); + #endif //UVLO_SUPPORT + st_init(); // Initialize stepper, this enables interrupts! #ifdef TMC2130 @@ -3132,7 +3132,6 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float custom_message_type = CUSTOM_MSG_TYPE_STATUS; } - //! @brief Rise Z if too low to avoid blob/jam before filament loading //! //! It doesn't plan_buffer_line(), as it expects plan_buffer_line() to be called after @@ -8689,7 +8688,7 @@ void serialecho_temperatures() { extern uint32_t sdpos_atomic; #ifdef UVLO_SUPPORT -void uvlo_() +void uvlo_() { unsigned long time_start = _millis(); bool sd_print = card.sdprinting; @@ -8740,8 +8739,7 @@ void uvlo_() // Clean the input command queue. cmdqueue_reset(); card.sdprinting = false; -// card.closefile(); - +// card.closefile(); // Enable stepper driver interrupt to move Z axis. // This should be fine as the planner and command queues are empty and the SD card printing is disabled. //FIXME one may want to disable serial lines at this point of time to avoid interfering with the command queue, @@ -8764,6 +8762,15 @@ void uvlo_() current_position[E_AXIS] - default_retraction, 40, active_extruder); st_synchronize(); + + plan_buffer_line( + current_position[X_AXIS], + current_position[Y_AXIS], + current_position[Z_AXIS] + UVLO_Z_AXIS_SHIFT + float((1024 - z_microsteps + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS], + current_position[E_AXIS] - default_retraction, + 40, active_extruder); + st_synchronize(); + disable_e0(); disable_z(); // Move Z up to the next 0th full step. @@ -8781,9 +8788,10 @@ void uvlo_() // for reaching the zero full step before powering off. eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS), z_microsteps); // Store the current position. + eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); - eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z), current_position[Z_AXIS]); + eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z , current_position[Z_AXIS] + UVLO_Z_AXIS_SHIFT + float((1024 - z_microsteps + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]); // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &feedrate_bckp); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_HOTEND, target_temperature[active_extruder]); @@ -8817,7 +8825,6 @@ void uvlo_() plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 500, active_extruder); st_synchronize(); #endif - wdt_enable(WDTO_500MS); WRITE(BEEPER,HIGH); while(1) @@ -8851,8 +8858,13 @@ disable_z(); //if(sd_print) if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==1){ eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); - eeprom_update_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS),z_microsteps); + eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); } + +if(eeprom_read_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z) < 0.001f){ + eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), eeprom_read_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z)); +} + eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); // Increment power failure counter @@ -8920,7 +8932,7 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNPGM("INT4"); - if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); + if((IS_SD_PRINTING || (eeprom_read_byte((uint8_t*)EEPROM_UVLO)!=2)) && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); } @@ -8966,11 +8978,13 @@ void recover_machine_state_after_power_panic(bool bTiny) // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. if(bTiny){ - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)); + + float tinyDelta = 1.25*(mbl.get_z(0, 0) - mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS])); + current_position[Z_AXIS] += tinyDelta; // compensate z-level } else{ - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + - UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)); } if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); @@ -8986,7 +9000,6 @@ void recover_machine_state_after_power_panic(bool bTiny) // 2) Initialize the logical to physical coordinate system transformation. world2machine_initialize(); - // 3) Restore the mesh bed leveling offsets. This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. mbl.active = false; for (int8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) { @@ -9079,8 +9092,8 @@ void restore_print_from_eeprom() { strcat_P(cmd, PSTR(" F2000")); enquecommand(cmd); // Move the Z axis down to the print, in logical coordinates. - strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32( eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) - (UVLO_Z_AXIS_SHIFT + - float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]))); + strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32( eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + - (UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]))); enquecommand(cmd); // Unretract. enquecommand_P(PSTR("G1 E" STRINGIFY(2*default_retraction)" F480")); From 878e8664016c8541579d35fd366d631a9854873e Mon Sep 17 00:00:00 2001 From: Voinea Date: Thu, 30 May 2019 17:28:02 +0300 Subject: [PATCH 135/168] Fix Load Filament 5 for MMU2 --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 23571eed..3d2c2bd2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5957,7 +5957,7 @@ static void fil_load_menu() if (mmu_enabled) { - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 4); } MENU_END(); } From 18122049a63690db252bc3ec051cb87a01ce463d Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 30 May 2019 19:36:10 +0200 Subject: [PATCH 136/168] Fix cut filament menu item labels. --- Firmware/ultralcd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 23571eed..bfbfd1f9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6028,11 +6028,11 @@ static void mmu_cut_filament_menu() { 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_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), '1', mmu_cut_filament, 0); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), '2', mmu_cut_filament, 1); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), '3', mmu_cut_filament, 2); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), '4', mmu_cut_filament, 3); + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), '5', mmu_cut_filament, 4); MENU_END(); } else From ccb649b1f6f445bcea735a4a213f2ebd5898a195 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 30 May 2019 20:46:41 +0200 Subject: [PATCH 137/168] Add always cut experimental / for testing feature. --- Firmware/Marlin_main.cpp | 5 ++++- Firmware/eeprom.h | 6 ++++++ Firmware/ultralcd.cpp | 21 ++++++++++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 24914748..82d01e6f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7090,8 +7090,11 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } else { +#if defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT) + mmu_command(MmuCmd::K0 + tmp_extruder); + manage_response(true, true, MMU_UNLOAD_MOVE); +#endif //defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT) mmu_command(MmuCmd::T0 + tmp_extruder); - manage_response(true, true, MMU_TCODE_MOVE); mmu_continue_loading(is_usb_printing); diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h index c96e1d8d..899d5235 100644 --- a/Firmware/eeprom.h +++ b/Firmware/eeprom.h @@ -201,5 +201,11 @@ static M500_conf * const EEPROM_M500_base = reinterpret_cast(20); //offset for storing settings using M500 #endif +enum +{ + EEPROM_MMU_CUTTER_ENABLED_enabled = 1, + EEPROM_MMU_CUTTER_ENABLED_always = 2, +}; + #endif // EEPROM_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 23571eed..68b6f798 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2346,13 +2346,22 @@ void lcd_set_fan_check() { #ifdef MMU_HAS_CUTTER void lcd_cutter_enabled() { - if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + { +#ifndef MMU_ALWAYS_CUT + eeprom_update_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED, 0); + } +#else //MMU_ALWAYS_CUT + eeprom_update_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED, EEPROM_MMU_CUTTER_ENABLED_always); + } + else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { eeprom_update_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED, 0); } +#endif //MMU_ALWAYS_CUT else { - eeprom_update_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED, 1); + eeprom_update_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED, EEPROM_MMU_CUTTER_ENABLED_enabled); } } #endif //MMU_HAS_CUTTER @@ -5287,10 +5296,16 @@ static bool settingsCutter() { if (mmu_enabled) { - if (1 == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + if (EEPROM_MMU_CUTTER_ENABLED_enabled == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) { if (menu_item_function_P(_i("Cutter [on]"), lcd_cutter_enabled)) return true;//// c=17 r=1 } +#ifdef MMU_ALWAYS_CUT + else if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + { + if (menu_item_function_P(_i("Cutter [always]"), lcd_cutter_enabled)) return true;//// c=17 r=1 + } +#endif else { if (menu_item_function_P(_i("Cutter [off]"), lcd_cutter_enabled)) return true;//// c=17 r=1 From e79c203c965656a4b6fe8bdc2dbf9c0e7c7207d6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 30 May 2019 22:14:13 +0200 Subject: [PATCH 138/168] Do not always cut if it is not enabled from menu. --- Firmware/Marlin_main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 82d01e6f..557ca34a 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7091,8 +7091,11 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) else { #if defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT) - mmu_command(MmuCmd::K0 + tmp_extruder); - manage_response(true, true, MMU_UNLOAD_MOVE); + if (EEPROM_MMU_CUTTER_ENABLED_always == eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED)) + { + mmu_command(MmuCmd::K0 + tmp_extruder); + manage_response(true, true, MMU_UNLOAD_MOVE); + } #endif //defined(MMU_HAS_CUTTER) && defined(MMU_ALWAYS_CUT) mmu_command(MmuCmd::T0 + tmp_extruder); manage_response(true, true, MMU_TCODE_MOVE); From 00da4640e2c021e09831d0df61c61b63af2008bb Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 30 May 2019 23:29:33 +0200 Subject: [PATCH 139/168] Document. --- Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 7 +++++++ Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 7 +++++++ Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index a0f53fad..c6fa56e9 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -505,6 +505,13 @@ #define MMU_DEBUG //print communication between MMU2 and printer on serial //#define MMU_HAS_CUTTER +// This is experimental feature requested by our test department. +// There is no known use for ordinary user. If enabled by this macro +// and enabled from printer menu (not enabled by default). It cuts filament +// every time when switching filament from gcode. MMU_HAS_CUTTER needs to be +// defined. + +//#define MMU_ALWAYS_CUT #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 5946bc80..24f624cd 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -506,6 +506,13 @@ #define MMU_DEBUG //print communication between MMU2 and printer on serial //#define MMU_HAS_CUTTER +// This is experimental feature requested by our test department. +// There is no known use for ordinary user. If enabled by this macro +// and enabled from printer menu (not enabled by default). It cuts filament +// every time when switching filament from gcode. MMU_HAS_CUTTER needs to be +// defined. + +//#define MMU_ALWAYS_CUT #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 2cf180a1..81c8788c 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -627,6 +627,14 @@ #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU2 and printer on serial //#define MMU_HAS_CUTTER + +// This is experimental feature requested by our test department. +// There is no known use for ordinary user. If enabled by this macro +// and enabled from printer menu (not enabled by default). It cuts filament +// every time when switching filament from gcode. MMU_HAS_CUTTER needs to be +// defined. + +//#define MMU_ALWAYS_CUT #define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning #endif //__CONFIGURATION_PRUSA_H From 675579177887beb40d2084278e68a90b01f5f690 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 31 May 2019 11:29:11 +0200 Subject: [PATCH 140/168] Fix repeated fan error checking --- Firmware/Marlin_main.cpp | 6 ++- Firmware/temperature.cpp | 82 ++++++++++++++++++++++++++++++---------- Firmware/temperature.h | 3 +- 3 files changed, 67 insertions(+), 24 deletions(-) mode change 100644 => 100755 Firmware/Marlin_main.cpp diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp old mode 100644 new mode 100755 index 557ca34a..fd1d34eb --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3391,8 +3391,10 @@ void process_commands() { #ifdef FANCHECK if (fan_check_error){ - fan_check_error = false; - lcd_pause_print(); + if( fan_check_error == EFCE_DETECTED ){ + fan_check_error = EFCE_REPORTED; + lcd_pause_print(); + } // otherwise it has already been reported, so just ignore further processing return; } #endif diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index b245b23b..1b60a023 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -95,7 +95,7 @@ float current_temperature_bed = 0.0; #endif #ifdef FANCHECK - volatile bool fan_check_error = false; + volatile uint8_t fan_check_error = EFCE_OK; #endif unsigned char soft_pwm_bed; @@ -489,6 +489,38 @@ void countFanSpeed() fan_edge_counter[1] = 0; } +//#define SIMULATE_FAN_ERRORS +#ifdef SIMULATE_FAN_ERRORS +struct FanSpeedErrorSimulator { + unsigned long lastMillis = 0; + bool state = false; // zatim mam 0 - klid, 1 reportuju chybu + //! @return pocet simulovanych chyb + inline uint8_t step(){ + unsigned long ms = _millis(); + switch(state){ + case false: + if( (ms - lastMillis) > 120000UL ){ // funkcni ventilator chci 2 minuty + state = true; + lastMillis = ms; + SERIAL_ECHOLNPGM("SIM Fan error"); + } + break; + case true: + if( (ms - lastMillis) > 20000UL ){ // vypadek ventilatoru chci uz 20s, + //abych stihl udelat pokusnej resume print, kdyz jeste jsou rozbity vetraky + state = false; + lastMillis = ms; + SERIAL_ECHOLNPGM("SIM Fan ok"); + } + break; + } + return state ? 20 : 0; + } +}; + +static FanSpeedErrorSimulator fanSpeedErrorSimulator; +#endif + void checkFanSpeed() { uint8_t max_print_fan_errors = 0; @@ -512,6 +544,16 @@ void checkFanSpeed() else fan_speed_errors[1] = 0; #endif +#ifdef SIMULATE_FAN_ERRORS + fan_speed_errors[0] = fanSpeedErrorSimulator.step(); +#endif + + // drop the fan_check_error flag when both fans are ok + if( fan_speed_errors[0] == 0 && fan_speed_errors[1] == 0 && fan_check_error == EFCE_REPORTED){ + // we may even send some info to the LCD from here + fan_check_error = EFCE_OK; + } + if ((fan_speed_errors[0] > max_extruder_fan_errors) && fans_check_enabled) { fan_speed_errors[0] = 0; fanSpeedError(0); //extruder fan @@ -522,6 +564,19 @@ void checkFanSpeed() } } +void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){ + SERIAL_ECHOLNRPGM(serialMsg); + if (get_message_level() == 0) { + if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)){ + WRITE(BEEPER, HIGH); + delayMicroseconds(200); + WRITE(BEEPER, LOW); + delayMicroseconds(100); // what is this wait for? + } + LCD_ALERTMESSAGERPGM(lcdMsg); + } +} + void fanSpeedError(unsigned char _fan) { if (get_message_level() != 0 && isPrintPaused) return; //to ensure that target temp. is not set to zero in case taht we are resuming print @@ -530,7 +585,8 @@ void fanSpeedError(unsigned char _fan) { lcd_print_stop(); } else { - fan_check_error = true; + fan_check_error = EFCE_DETECTED; + } } else { @@ -538,27 +594,11 @@ void fanSpeedError(unsigned char _fan) { SERIAL_ECHOLNPGM("// action:pause"); //for octoprint } switch (_fan) { - case 0: - SERIAL_ECHOLNPGM("Extruder fan speed is lower then expected"); - if (get_message_level() == 0) { -if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)) - WRITE(BEEPER, HIGH); - delayMicroseconds(200); - WRITE(BEEPER, LOW); - delayMicroseconds(100); - LCD_ALERTMESSAGEPGM("Err: EXTR. FAN ERROR"); - } + case 0: // extracting the same code from case 0 and case 1 into a function saves 72B + fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), PSTR("Err: EXTR. FAN ERROR") ); break; case 1: - SERIAL_ECHOLNPGM("Print fan speed is lower then expected"); - if (get_message_level() == 0) { -if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)) - WRITE(BEEPER, HIGH); - delayMicroseconds(200); - WRITE(BEEPER, LOW); - delayMicroseconds(100); - LCD_ALERTMESSAGEPGM("Err: PRINT FAN ERROR"); - } + fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), PSTR("Err: PRINT FAN ERROR") ); break; } } diff --git a/Firmware/temperature.h b/Firmware/temperature.h index 31ab8d9f..5b22e3a5 100644 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -238,7 +238,8 @@ void checkExtruderAutoFans(); #if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1)) -extern volatile bool fan_check_error; +enum { EFCE_OK = 0, EFCE_DETECTED, EFCE_REPORTED }; +extern volatile uint8_t fan_check_error; void countFanSpeed(); void checkFanSpeed(); From 09fee4e64de07bcb1b785afc3e0fd4a6d8f92286 Mon Sep 17 00:00:00 2001 From: DRracer Date: Fri, 31 May 2019 11:30:30 +0200 Subject: [PATCH 141/168] remove fan error simulation automaton --- Firmware/temperature.cpp | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 1b60a023..08ff40db 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -489,38 +489,6 @@ void countFanSpeed() fan_edge_counter[1] = 0; } -//#define SIMULATE_FAN_ERRORS -#ifdef SIMULATE_FAN_ERRORS -struct FanSpeedErrorSimulator { - unsigned long lastMillis = 0; - bool state = false; // zatim mam 0 - klid, 1 reportuju chybu - //! @return pocet simulovanych chyb - inline uint8_t step(){ - unsigned long ms = _millis(); - switch(state){ - case false: - if( (ms - lastMillis) > 120000UL ){ // funkcni ventilator chci 2 minuty - state = true; - lastMillis = ms; - SERIAL_ECHOLNPGM("SIM Fan error"); - } - break; - case true: - if( (ms - lastMillis) > 20000UL ){ // vypadek ventilatoru chci uz 20s, - //abych stihl udelat pokusnej resume print, kdyz jeste jsou rozbity vetraky - state = false; - lastMillis = ms; - SERIAL_ECHOLNPGM("SIM Fan ok"); - } - break; - } - return state ? 20 : 0; - } -}; - -static FanSpeedErrorSimulator fanSpeedErrorSimulator; -#endif - void checkFanSpeed() { uint8_t max_print_fan_errors = 0; @@ -544,10 +512,6 @@ void checkFanSpeed() else fan_speed_errors[1] = 0; #endif -#ifdef SIMULATE_FAN_ERRORS - fan_speed_errors[0] = fanSpeedErrorSimulator.step(); -#endif - // drop the fan_check_error flag when both fans are ok if( fan_speed_errors[0] == 0 && fan_speed_errors[1] == 0 && fan_check_error == EFCE_REPORTED){ // we may even send some info to the LCD from here From 5985c0608ef0778be6856042a36f17807d2e0cab Mon Sep 17 00:00:00 2001 From: DRracer Date: Mon, 3 Jun 2019 09:02:27 +0200 Subject: [PATCH 142/168] Revert changes to pins_Einsy_1_0.h not related to the fan check error fix --- Firmware/pins_Einsy_1_0.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 2e05d326..33363388 100755 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -99,8 +99,7 @@ //#define KILL_PIN 32 -// LCD backlight pin may interfere with something, this is yet to be found out correctly -#define LCD_BL_PIN 5 //backlight control pin +//#define LCD_BL_PIN 5 //backlight control pin #define BEEPER 84 // Beeper on AUX-4 #define LCD_PINS_RS 82 #define LCD_PINS_ENABLE 61 // !!! changed from 18 (EINY03) From 2c4e98dc272a86f8269f7e3168653f2db461b886 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Wed, 5 Jun 2019 13:12:08 +0200 Subject: [PATCH 143/168] power panic improvement --- Firmware/Marlin_main.cpp | 76 ++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 9f25fdb6..676b6713 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1296,12 +1296,12 @@ void setup() #endif //TMC2130 - #ifdef UVLO_SUPPORT - setup_uvlo_interrupt(); - #endif //UVLO_SUPPORT - st_init(); // Initialize stepper, this enables interrupts! +#ifdef UVLO_SUPPORT + setup_uvlo_interrupt(); +#endif //UVLO_SUPPORT + #ifdef TMC2130 tmc2130_mode = silentMode?TMC2130_MODE_SILENT:TMC2130_MODE_NORMAL; update_mode_profile(); @@ -8690,6 +8690,7 @@ extern uint32_t sdpos_atomic; void uvlo_() { + printf_P(_N("******* UVLo 0 Current pos Z_AXIS:%.3f\nCurrent pos Z_AXIS:%.3f\n pos Z_AXIS:%.3f\n"), current_position[Z_AXIS], eeprom_read_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z),eeprom_read_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z)); unsigned long time_start = _millis(); bool sd_print = card.sdprinting; // Conserve power as soon as possible. @@ -8735,7 +8736,6 @@ void uvlo_() // Store the current extruder position. eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E), st_get_position_mm(E_AXIS)); eeprom_update_byte((uint8_t*)EEPROM_UVLO_E_ABS, axis_relative_modes[3]?0:1); - // Clean the input command queue. cmdqueue_reset(); card.sdprinting = false; @@ -8762,7 +8762,8 @@ void uvlo_() current_position[E_AXIS] - default_retraction, 40, active_extruder); st_synchronize(); - + disable_e0(); + plan_buffer_line( current_position[X_AXIS], current_position[Y_AXIS], @@ -8791,7 +8792,7 @@ void uvlo_() eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0), current_position[X_AXIS]); eeprom_update_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4), current_position[Y_AXIS]); - eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z , current_position[Z_AXIS] + UVLO_Z_AXIS_SHIFT + float((1024 - z_microsteps + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]); + eeprom_update_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z , current_position[Z_AXIS]); // Store the current feed rate, temperatures, fan speed and extruder multipliers (flow rates) EEPROM_save_B(EEPROM_UVLO_FEEDRATE, &feedrate_bckp); eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_HOTEND, target_temperature[active_extruder]); @@ -8850,19 +8851,19 @@ tmc2130_set_current_r(Z_AXIS, 20); #ifdef TMC2130 z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); #endif //TMC2130 - planner_abort_hard(); disable_z(); // Finaly store the "power outage" flag. //if(sd_print) -if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==1){ +if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)!=2){ eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); } if(eeprom_read_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z) < 0.001f){ eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), eeprom_read_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z)); + eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS), eeprom_read_word((uint16_t*)EEPROM_UVLO_Z_MICROSTEPS)); } eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); @@ -8870,7 +8871,6 @@ eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); // Increment power failure counter eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); - wdt_enable(WDTO_500MS); WRITE(BEEPER,HIGH); while(1) @@ -8932,7 +8932,7 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNPGM("INT4"); - if((IS_SD_PRINTING || (eeprom_read_byte((uint8_t*)EEPROM_UVLO)!=2)) && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); + if((IS_SD_PRINTING ) || (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); } @@ -8941,11 +8941,13 @@ void recover_print(uint8_t automatic) { lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1 - bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); - recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers + + bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); + recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers // Lift the print head, so one may remove the excess priming material. - if(!bTiny&&(current_position[Z_AXIS]<25)) + if(!bTiny&&(current_position[Z_AXIS]<25)) enquecommand_P(PSTR("G1 Z25 F800")); + // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine transformation status. enquecommand_P(PSTR("G28 X Y")); // Set the target bed and nozzle temperatures and wait. @@ -8975,16 +8977,32 @@ void recover_machine_state_after_power_panic(bool bTiny) // The logical XY coordinates are needed to recover the machine Z coordinate corrected by the mesh bed leveling. current_position[X_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 0)); current_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); + + // 2) Restore the mesh bed leveling offsets. This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. + mbl.active = false; + for (int8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) { + uint8_t ix = mesh_point % MESH_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 + uint8_t iy = mesh_point / MESH_NUM_X_POINTS; + // Scale the z value to 10u resolution. + int16_t v; + eeprom_read_block(&v, (void*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL+2*mesh_point), 2); + if (v != 0) + mbl.active = true; + mbl.z_values[iy][ix] = float(v) * 0.001f; + } + // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. - if(bTiny){ - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)); - - float tinyDelta = 1.25*(mbl.get_z(0, 0) - mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS])); - current_position[Z_AXIS] += tinyDelta; // compensate z-level + if(bTiny){ + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + current_position[Z_AXIS] -= 0.4*mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS]); } else{ - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)); + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; } if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); @@ -8998,20 +9016,8 @@ void recover_machine_state_after_power_panic(bool bTiny) SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); print_world_coordinates(); - // 2) Initialize the logical to physical coordinate system transformation. + // 3) Initialize the logical to physical coordinate system transformation. world2machine_initialize(); - // 3) Restore the mesh bed leveling offsets. This is 2*7*7=98 bytes, which takes 98*3.4us=333us in worst case. - mbl.active = false; - for (int8_t mesh_point = 0; mesh_point < MESH_NUM_X_POINTS * MESH_NUM_Y_POINTS; ++ mesh_point) { - uint8_t ix = mesh_point % MESH_NUM_X_POINTS; // from 0 to MESH_NUM_X_POINTS - 1 - uint8_t iy = mesh_point / MESH_NUM_X_POINTS; - // Scale the z value to 10u resolution. - int16_t v; - eeprom_read_block(&v, (void*)(EEPROM_UVLO_MESH_BED_LEVELING_FULL+2*mesh_point), 2); - if (v != 0) - mbl.active = true; - mbl.z_values[iy][ix] = float(v) * 0.001f; - } // SERIAL_ECHOPGM("recover_machine_state_after_power_panic, initial "); // print_mesh_bed_leveling_table(); @@ -9092,8 +9098,8 @@ void restore_print_from_eeprom() { strcat_P(cmd, PSTR(" F2000")); enquecommand(cmd); // Move the Z axis down to the print, in logical coordinates. - strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32( eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) - - (UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]))); + eeprom_update_byte((uint8_t*)EEPROM_UVLO,1); + strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)))); enquecommand(cmd); // Unretract. enquecommand_P(PSTR("G1 E" STRINGIFY(2*default_retraction)" F480")); From d263728c37033c577a2309397e5226f2a8aaff28 Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Wed, 5 Jun 2019 14:55:59 +0200 Subject: [PATCH 144/168] documentation --- Firmware/Marlin_main.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 676b6713..c7b87f1b 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8690,7 +8690,6 @@ extern uint32_t sdpos_atomic; void uvlo_() { - printf_P(_N("******* UVLo 0 Current pos Z_AXIS:%.3f\nCurrent pos Z_AXIS:%.3f\n pos Z_AXIS:%.3f\n"), current_position[Z_AXIS], eeprom_read_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z),eeprom_read_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z)); unsigned long time_start = _millis(); bool sd_print = card.sdprinting; // Conserve power as soon as possible. @@ -8854,18 +8853,21 @@ z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); planner_abort_hard(); disable_z(); -// Finaly store the "power outage" flag. -//if(sd_print) +//save current position only in case, where the printer is moving on Z axis, which is only when EEPROM_UVLO is 1 +//EEPROM_UVLO is 1 after normal uvlo or after recover_print(), when the extruder is moving on Z axis after rehome if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)!=2){ eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); } +//after multiples power panics current Z axis is unknow +//in this case we set EEPROM_UVLO_TINY_CURRENT_POSITION_Z to last know position which is EEPROM_UVLO_CURRENT_POSITION_Z if(eeprom_read_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z) < 0.001f){ eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), eeprom_read_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z)); eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS), eeprom_read_word((uint16_t*)EEPROM_UVLO_Z_MICROSTEPS)); } +// Finaly store the "power outage" flag. eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); // Increment power failure counter @@ -8932,6 +8934,8 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNPGM("INT4"); + //fire normal uvlo only in case where EEPROM_UVLO is 0 or if IS_SD_PRINTING is 1. + //Don't change || to && because in some case the printer can be moving although IS_SD_PRINTING is zero if((IS_SD_PRINTING ) || (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO)))) uvlo_(); if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); } @@ -8997,6 +9001,9 @@ void recover_machine_state_after_power_panic(bool bTiny) current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; + + //after multiples power panics the print is slightly in the air so get it little bit down. + //Not exactly sure why is this happening, but it has something to do with bed leveling and world2machine coordinates current_position[Z_AXIS] -= 0.4*mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS]); } else{ @@ -9097,8 +9104,9 @@ void restore_print_from_eeprom() { strcat_P(cmd, PSTR(" Y")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)))); strcat_P(cmd, PSTR(" F2000")); enquecommand(cmd); - // Move the Z axis down to the print, in logical coordinates. + //moving on Z axis ahed, set EEPROM_UVLO to 1, so normal uvlo can fire eeprom_update_byte((uint8_t*)EEPROM_UVLO,1); + // Move the Z axis down to the print, in logical coordinates. strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)))); enquecommand(cmd); // Unretract. From 14270ac1f66dc19751a1ed37870647edc4e0a8ba Mon Sep 17 00:00:00 2001 From: NotaRobotexe Date: Wed, 5 Jun 2019 15:10:51 +0200 Subject: [PATCH 145/168] power panic documentation --- Firmware/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index c7b87f1b..3d9ac383 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -8860,7 +8860,7 @@ if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)!=2){ eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); } -//after multiples power panics current Z axis is unknow +//after multiple power panics current Z axis is unknow //in this case we set EEPROM_UVLO_TINY_CURRENT_POSITION_Z to last know position which is EEPROM_UVLO_CURRENT_POSITION_Z if(eeprom_read_float((float*)EEPROM_UVLO_TINY_CURRENT_POSITION_Z) < 0.001f){ eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), eeprom_read_float((float*)EEPROM_UVLO_CURRENT_POSITION_Z)); @@ -9002,7 +9002,7 @@ void recover_machine_state_after_power_panic(bool bTiny) + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + 7) >> 4) / cs.axis_steps_per_unit[Z_AXIS]; - //after multiples power panics the print is slightly in the air so get it little bit down. + //after multiple power panics the print is slightly in the air so get it little bit down. //Not exactly sure why is this happening, but it has something to do with bed leveling and world2machine coordinates current_position[Z_AXIS] -= 0.4*mbl.get_z(current_position[X_AXIS], current_position[Y_AXIS]); } @@ -9104,7 +9104,7 @@ void restore_print_from_eeprom() { strcat_P(cmd, PSTR(" Y")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)))); strcat_P(cmd, PSTR(" F2000")); enquecommand(cmd); - //moving on Z axis ahed, set EEPROM_UVLO to 1, so normal uvlo can fire + //moving on Z axis ahead, set EEPROM_UVLO to 1, so normal uvlo can fire eeprom_update_byte((uint8_t*)EEPROM_UVLO,1); // Move the Z axis down to the print, in logical coordinates. strcpy_P(cmd, PSTR("G1 Z")); strcat(cmd, ftostr32(eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)))); From aeed49a80e4b409be8406f5c0472a12ebd54b8f9 Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 5 Jun 2019 12:19:18 +0200 Subject: [PATCH 146/168] Fix filament runout on optical filament sensors Reworked the IR variant accordingly Some code-size optimization in related functions --- Firmware/Marlin_main.cpp | 33 +++++++++---------- Firmware/fsensor.cpp | 71 +++++++++++++++++++++++++++------------- 2 files changed, 65 insertions(+), 39 deletions(-) mode change 100644 => 100755 Firmware/Marlin_main.cpp mode change 100644 => 100755 Firmware/fsensor.cpp diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp old mode 100644 new mode 100755 index b431d6bb..02a420be --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3553,10 +3553,6 @@ void process_commands() enquecommand_P(PSTR("M24")); } #ifdef FILAMENT_SENSOR - else if (code_seen("fsensor_recover_IR")) //! PRUSA fsensor_recover_IR - { - fsensor_restore_print_and_continue_IR(); - } else if (code_seen("fsensor_recover")) //! PRUSA fsensor_recover { fsensor_restore_print_and_continue(); @@ -6591,7 +6587,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) float x_position = current_position[X_AXIS]; float y_position = current_position[Y_AXIS]; - float z_shift = 0; + float z_shift = 0; // is it necessary to be a float? float e_shift_init = 0; float e_shift_late = 0; bool automatic = false; @@ -6628,8 +6624,13 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) else { #ifdef FILAMENTCHANGE_ZADD - z_shift= FILAMENTCHANGE_ZADD ; - if(current_position[Z_AXIS] < 25) z_shift+= 25 ; + static_assert(Z_MAX_POS < (255 - FILAMENTCHANGE_ZADD), "Z-range too high, change the following code from uint8_t to uint16_t"); + // avoid floating point arithmetics when not necessary - results in shorter code + uint8_t ztmp = uint8_t( current_position[Z_AXIS] ); + if(ztmp < uint8_t(25)){ + z_shift = uint8_t(25) - ztmp; // make sure to be at least 25mm above the heat bed + } + z_shift += FILAMENTCHANGE_ZADD ; // always move above printout #endif } //Move XY to side @@ -9273,22 +9274,20 @@ void stop_and_save_print_to_ram(float z_move, float e_move) // First unretract (relative extrusion) if(!saved_extruder_relative_mode){ - strcpy_P(buf, PSTR("M83")); - enquecommand(buf, false); + enquecommand(PSTR("M83"), true); } //retract 45mm/s - strcpy_P(buf, PSTR("G1 E")); - dtostrf(e_move, 6, 3, buf + strlen(buf)); - strcat_P(buf, PSTR(" F")); - dtostrf(2700, 8, 3, buf + strlen(buf)); + // A single sprintf may not be faster, but is definitely 20B shorter + // than a sequence of commands building the string piece by piece + // A snprintf would have been a safer call, but since it is not used + // in the whole program, its implementation would bring more bytes to the total size + // The behavior of dtostrf 8,3 should be roughly the same as %-0.3 + sprintf_P(buf, PSTR("G1 E%-0.3f F2700"), e_move); enquecommand(buf, false); // Then lift Z axis - strcpy_P(buf, PSTR("G1 Z")); - dtostrf(saved_pos[Z_AXIS] + z_move, 8, 3, buf + strlen(buf)); - strcat_P(buf, PSTR(" F")); - dtostrf(homing_feedrate[Z_AXIS], 8, 3, buf + strlen(buf)); + sprintf_P(buf, PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]); // At this point the command queue is empty. enquecommand(buf, false); // If this call is invoked from the main Arduino loop() function, let the caller know that the command diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp old mode 100644 new mode 100755 index f9ca8909..fd7936ee --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -123,17 +123,12 @@ void fsensor_stop_and_save_print(void) stop_and_save_print_to_ram(0, 0); //XYZE - no change } -void fsensor_restore_print_and_continue_IR(void) -{ - fsensor_watch_runout = true; - fsensor_err_cnt = 0; - fsensor_m600_enqueued = false; -} - void fsensor_restore_print_and_continue(void) { printf_P(PSTR("fsensor_restore_print_and_continue\n")); - fsensor_restore_print_and_continue_IR(); + fsensor_watch_runout = true; + fsensor_err_cnt = 0; + fsensor_m600_enqueued = false; restore_print_from_ram_and_continue(0); //XYZ = orig, E - no change } @@ -527,6 +522,47 @@ void fsensor_st_block_chunk(block_t* bl, int cnt) } } +//! This ensures generating z-position at least 25mm above the heat bed. +//! Making this a template enables changing the computation data type easily at all spots where necessary. +//! @param current_z current z-position +//! @return z-position at least 25mm above the heat bed plus FILAMENTCHANGE_ZADD +template +inline T fsensor_clamp_z(float current_z){ + T z( current_z ); + if(z < T(25)){ // make sure the compiler understands, that the constant 25 is of correct type + // - necessary for uint8_t -> results in shorter code + z = T(25); // move to at least 25mm above heat bed + } + return z + T(FILAMENTCHANGE_ZADD); // always move above the printout by FILAMENTCHANGE_ZADD (default 2mm) +} + +//! Common code for enqueing M600 and supplemental codes into the command queue. +//! Used both for the IR sensor and the PAT9125 +void fsensor_enque_M600(){ + printf_P(PSTR("fsensor_update - M600\n")); + eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); + eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); + enquecommand_front_P(PSTR("PRUSA fsensor_recover")); + fsensor_m600_enqueued = true; + enquecommand_front_P((PSTR("M600"))); +#define xstr(a) str(a) +#define str(a) #a + static const char gcodeMove[] PROGMEM = + "G1 X" xstr(FILAMENTCHANGE_XPOS) + " Y" xstr(FILAMENTCHANGE_YPOS) + " Z%u"; +#undef str +#undef xstr + char buf[32]; + // integer arithmetics is far shorter, I don't need a precise float position here, just move a bit above + // 8bit arithmetics in fsensor_clamp_z is 10B shorter than 16bit (not talking about float ;) ) + // The compile-time static_assert here ensures, that the computation gets enough bits in case of Z-range too high, + // i.e. makes the user change the data type, which also results in larger code + static_assert(Z_MAX_POS < (255 - FILAMENTCHANGE_ZADD), "Z-range too high, change fsensor_clamp_z to "); + sprintf_P(buf, gcodeMove, fsensor_clamp_z(current_position[Z_AXIS]) ); + enquecommand_front(buf, false); +} + //! @brief filament sensor update (perform M600 on filament runout) //! //! Works only if filament sensor is enabled. @@ -535,7 +571,7 @@ void fsensor_st_block_chunk(block_t* bl, int cnt) void fsensor_update(void) { #ifdef PAT9125 - if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX)) + if (fsensor_enabled && fsensor_watch_runout && (fsensor_err_cnt > FSENSOR_ERR_MAX) && ( ! fsensor_m600_enqueued) ) { bool autoload_enabled_tmp = fsensor_autoload_enabled; fsensor_autoload_enabled = false; @@ -575,11 +611,7 @@ void fsensor_update(void) } else { - printf_P(PSTR("fsensor_update - M600\n")); - eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("PRUSA fsensor_recover")); - enquecommand_front_P((PSTR("M600"))); + fsensor_enque_M600(); fsensor_watch_runout = false; } fsensor_autoload_enabled = autoload_enabled_tmp; @@ -587,14 +619,9 @@ void fsensor_update(void) } #else //PAT9125 if ((digitalRead(IR_SENSOR_PIN) == 1) && CHECK_FSENSOR && fsensor_enabled && ir_sensor_detected && ( ! fsensor_m600_enqueued) ) - { // just plan a simple M600 without any additional position save/restore, - // which caused weird heating issues standing directly over the print - printf_P(PSTR("fsensor_update - M600\n")); - eeprom_update_byte((uint8_t*)EEPROM_FERROR_COUNT, eeprom_read_byte((uint8_t*)EEPROM_FERROR_COUNT) + 1); - eeprom_update_word((uint16_t*)EEPROM_FERROR_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) + 1); - enquecommand_front_P(PSTR("PRUSA fsensor_recover_IR")); - fsensor_m600_enqueued = true; - enquecommand_front_P((PSTR("M600"))); + { + fsensor_stop_and_save_print(); + fsensor_enque_M600(); } #endif //PAT9125 } From 9c3bb14baeb87eb4adac28d20aa050428726c51d Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 5 Jun 2019 18:34:10 +0200 Subject: [PATCH 147/168] remove function forward decl: fsensor_restore_print_and_continue_IR revert LCD_BL_PIN change --- Firmware/fsensor.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) mode change 100644 => 100755 Firmware/fsensor.h diff --git a/Firmware/fsensor.h b/Firmware/fsensor.h old mode 100644 new mode 100755 index 421eee43..fa7ab585 --- a/Firmware/fsensor.h +++ b/Firmware/fsensor.h @@ -18,9 +18,7 @@ extern bool fsensor_oq_meassure_enabled; //! @name save restore printing //! @{ extern void fsensor_stop_and_save_print(void); -//! special handling for the IR sensor (no restore position and heating, since this is already correctly handled in the M600 itself) -extern void fsensor_restore_print_and_continue_IR(void); -//! legacy restore print - restore position and heatup to original temperature - for the MMU and the optical fsensor +//! restore print - restore position and heatup to original temperature extern void fsensor_restore_print_and_continue(void); //! @} From 19351df8a72c9344ae984e42e432689a69c287d3 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 5 Jun 2019 18:34:26 +0200 Subject: [PATCH 148/168] Extracted computation of z_shift for M600 into a separate function to improve readability. Surprisingly, also the code got shorter. --- Firmware/Marlin_main.cpp | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 02a420be..c4683da2 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3001,6 +3001,32 @@ void gcode_M114() SERIAL_PROTOCOLLN(""); } +//! extracted code to compute z_shift for M600 in case of filament change operation +//! requested from fsensors. +//! The function ensures, that the printhead lifts to at least 25mm above the heat bed +//! unlike the previous implementation, which was adding 25mm even when the head was +//! printing at e.g. 24mm height. +//! A safety margin of FILAMENTCHANGE_ZADD is added in all cases to avoid touching +//! the printout. +//! This function is templated to enable fast change of computation data type. +//! @return new z_shift value +template +static T gcode_M600_filament_change_z_shift() +{ +#ifdef FILAMENTCHANGE_ZADD + static_assert(Z_MAX_POS < (255 - FILAMENTCHANGE_ZADD), "Z-range too high, change the T type from uint8_t to uint16_t"); + // avoid floating point arithmetics when not necessary - results in shorter code + T ztmp = T( current_position[Z_AXIS] ); + T z_shift = 0; + if(ztmp < T(25)){ + z_shift = T(25) - ztmp; // make sure to be at least 25mm above the heat bed + } + return z_shift + T(FILAMENTCHANGE_ZADD); // always move above printout +#else + return T(0); +#endif +} + static void gcode_M600(bool automatic, float x_position, float y_position, float z_shift, float e_shift, float /*e_shift_late*/) { st_synchronize(); @@ -6623,15 +6649,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) } else { - #ifdef FILAMENTCHANGE_ZADD - static_assert(Z_MAX_POS < (255 - FILAMENTCHANGE_ZADD), "Z-range too high, change the following code from uint8_t to uint16_t"); - // avoid floating point arithmetics when not necessary - results in shorter code - uint8_t ztmp = uint8_t( current_position[Z_AXIS] ); - if(ztmp < uint8_t(25)){ - z_shift = uint8_t(25) - ztmp; // make sure to be at least 25mm above the heat bed - } - z_shift += FILAMENTCHANGE_ZADD ; // always move above printout - #endif + z_shift = gcode_M600_filament_change_z_shift(); } //Move XY to side if(code_seen('X')) From 83578c3389352a9ef7b7358b00b75be4213d257e Mon Sep 17 00:00:00 2001 From: DRracer Date: Thu, 6 Jun 2019 15:50:13 +0200 Subject: [PATCH 149/168] documentation + minor code cleanup based on code review --- Firmware/temperature.cpp | 6 +++++- Firmware/temperature.h | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) mode change 100644 => 100755 Firmware/temperature.h diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 08ff40db..9c49cf79 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -528,7 +528,11 @@ void checkFanSpeed() } } -void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){ +//! Prints serialMsg to serial port, displays lcdMsg onto the LCD and beeps. +//! Extracted from fanSpeedError to save some space. +//! @param serialMsg pointer into PROGMEM, this text will be printed to the serial port +//! @param lcdMsg pointer into PROGMEM, this text will be printed onto the LCD +static void fanSpeedErrorBeep(const char *serialMsg, const char *lcdMsg){ SERIAL_ECHOLNRPGM(serialMsg); if (get_message_level() == 0) { if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)||(eSoundMode==e_SOUND_MODE_SILENT)){ diff --git a/Firmware/temperature.h b/Firmware/temperature.h old mode 100644 new mode 100755 index 5b22e3a5..27a7e713 --- a/Firmware/temperature.h +++ b/Firmware/temperature.h @@ -238,7 +238,11 @@ void checkExtruderAutoFans(); #if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1)) -enum { EFCE_OK = 0, EFCE_DETECTED, EFCE_REPORTED }; +enum { + EFCE_OK = 0, //!< normal operation, both fans are ok + EFCE_DETECTED, //!< fan error detected, but not reported yet + EFCE_REPORTED //!< fan error detected and reported to LCD and serial +}; extern volatile uint8_t fan_check_error; void countFanSpeed(); From 4be8fa701ed60240025d2414452917a4496e44ca Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 10 Jun 2019 20:41:18 +0200 Subject: [PATCH 150/168] Use loop to enquecommand_P() in first layer calibration. --- Firmware/first_lay_cal.cpp | 30 ++++++++++++++++++++++++++++++ Firmware/first_lay_cal.h | 16 ++++++++++++++++ Firmware/ultralcd.cpp | 14 +++++--------- 3 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 Firmware/first_lay_cal.cpp create mode 100644 Firmware/first_lay_cal.h diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp new file mode 100644 index 00000000..fb0e7989 --- /dev/null +++ b/Firmware/first_lay_cal.cpp @@ -0,0 +1,30 @@ +/* + * first_lay_cal.cpp + * + * Created on: Jun 10, 2019 + * Author: marek + */ +#include "first_lay_cal.h" +#include "Configuration_prusa.h" +#include "language.h" + +static const char cmd_0[] PROGMEM = "M107"; +static const char cmd_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); +static const char cmd_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); +static const char cmd_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); +static const char cmd_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); +static const char cmd_6[] PROGMEM = "G28"; +static const char cmd_7[] PROGMEM = "G92 E0.0"; + + +const char * const layer1_cal[8] PROGMEM = +{ + cmd_0, + cmd_1, + cmd_2, + cmd_3, + cmd_4, + MSG_M117_V2_CALIBRATION, //TODO missing internationalization + cmd_6, + cmd_7, +}; diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h new file mode 100644 index 00000000..e22a742b --- /dev/null +++ b/Firmware/first_lay_cal.h @@ -0,0 +1,16 @@ +/* + * first_lay_cal.h + * + * Created on: Jun 10, 2019 + * Author: marek + */ + +#ifndef FIRMWARE_FIRST_LAY_CAL_H_ +#define FIRMWARE_FIRST_LAY_CAL_H_ +#include + + +extern const char * const layer1_cal[8] PROGMEM; + + +#endif /* FIRMWARE_FIRST_LAY_CAL_H_ */ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f69efbbc..a1be6eab 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -40,6 +40,7 @@ #include "static_assert.h" #include "io_atmega2560.h" +#include "first_lay_cal.h" int scrollstuff = 0; @@ -1386,15 +1387,10 @@ void lcd_commands() if (lcd_commands_step == 10) { - enquecommand_P(PSTR("M107")); - enquecommand_P(PSTR("M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP))); - enquecommand_P(PSTR("M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP))); - enquecommand_P(PSTR("M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP))); - enquecommand_P(PSTR("M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP))); - enquecommand_P(_T(MSG_M117_V2_CALIBRATION)); - enquecommand_P(PSTR("G28")); - enquecommand_P(PSTR("G92 E0.0")); - + for (uint8_t i = 0; i < (sizeof(layer1_cal)/sizeof(layer1_cal[0])); ++i) + { + enquecommand_P(static_cast(pgm_read_ptr(&layer1_cal[i]))); + } lcd_commands_step = 9; } if (lcd_commands_step == 9 && !blocks_queued() && cmd_buffer_empty()) From 27145204ed9c4e8c47ebaf938ac844d7b75cd128 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Mon, 10 Jun 2019 21:40:12 +0200 Subject: [PATCH 151/168] Use internationalized M117, but anyway the text is not shown. --- Firmware/first_lay_cal.cpp | 22 +++++++++++++++++----- Firmware/first_lay_cal.h | 3 +-- Firmware/ultralcd.cpp | 5 +---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index fb0e7989..8f12bb96 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -7,24 +7,36 @@ #include "first_lay_cal.h" #include "Configuration_prusa.h" #include "language.h" +#include "Marlin.h" +#include + static const char cmd_0[] PROGMEM = "M107"; static const char cmd_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); static const char cmd_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); static const char cmd_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); static const char cmd_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); -static const char cmd_6[] PROGMEM = "G28"; -static const char cmd_7[] PROGMEM = "G92 E0.0"; +static const char cmd_5[] PROGMEM = "G28"; +static const char cmd_6[] PROGMEM = "G92 E0.0"; -const char * const layer1_cal[8] PROGMEM = +static const char * const preheat_cmd[] PROGMEM = { cmd_0, cmd_1, cmd_2, cmd_3, cmd_4, - MSG_M117_V2_CALIBRATION, //TODO missing internationalization + cmd_5, //call MSG_M117_V2_CALIBRATION before cmd_6, - cmd_7, }; + +void lay1cal_preheat() +{ + for (uint8_t i = 0; i < (sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); ++i) + { + if (5 == i) enquecommand_P(_T(MSG_M117_V2_CALIBRATION)); + enquecommand_P(static_cast(pgm_read_ptr(&preheat_cmd[i]))); + } + +} diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index e22a742b..5068e337 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -7,10 +7,9 @@ #ifndef FIRMWARE_FIRST_LAY_CAL_H_ #define FIRMWARE_FIRST_LAY_CAL_H_ -#include +void lay1cal_preheat(); -extern const char * const layer1_cal[8] PROGMEM; #endif /* FIRMWARE_FIRST_LAY_CAL_H_ */ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a1be6eab..66bc453a 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1387,10 +1387,7 @@ void lcd_commands() if (lcd_commands_step == 10) { - for (uint8_t i = 0; i < (sizeof(layer1_cal)/sizeof(layer1_cal[0])); ++i) - { - enquecommand_P(static_cast(pgm_read_ptr(&layer1_cal[i]))); - } + lay1cal_preheat(); lcd_commands_step = 9; } if (lcd_commands_step == 9 && !blocks_queued() && cmd_buffer_empty()) From 3e3715055292f68b5ab538d422def6251855eb0e Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 11 Jun 2019 14:53:10 +0200 Subject: [PATCH 152/168] Do not allow resume printing if fans are still not ok --- Firmware/Marlin_main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index fd1d34eb..7adc13ab 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9323,6 +9323,10 @@ void stop_and_save_print_to_ram(float z_move, float e_move) void restore_print_from_ram_and_continue(float e_move) { if (!saved_printing) return; + + // Do not allow resume printing if fans are still not ok + if( fan_check_error != EFCE_OK )return; + // for (int axis = X_AXIS; axis <= E_AXIS; axis++) // current_position[axis] = st_get_position_mm(axis); active_extruder = saved_active_extruder; //restore active_extruder From 13c3ab14fabe18558c741bda8a62ec641b5800e1 Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 11 Jun 2019 15:05:40 +0200 Subject: [PATCH 153/168] test fan check error only when enabled by #ifdef --- Firmware/Marlin_main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 7adc13ab..54c21379 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -9324,8 +9324,10 @@ void restore_print_from_ram_and_continue(float e_move) { if (!saved_printing) return; +#ifdef FANCHECK // Do not allow resume printing if fans are still not ok if( fan_check_error != EFCE_OK )return; +#endif // for (int axis = X_AXIS; axis <= E_AXIS; axis++) // current_position[axis] = st_get_position_mm(axis); From 0c9121e99e1cc5bc94df8e585a879b6da4b67df0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 17:08:56 +0200 Subject: [PATCH 154/168] Use loop to enquecommand_P() in first layer calibration. --- Firmware/first_lay_cal.cpp | 81 +++++++++++++++++++++++++++++++------- Firmware/first_lay_cal.h | 2 + Firmware/ultralcd.cpp | 25 +----------- 3 files changed, 70 insertions(+), 38 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 8f12bb96..60bb5440 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -8,27 +8,28 @@ #include "Configuration_prusa.h" #include "language.h" #include "Marlin.h" +#include "mmu.h" #include -static const char cmd_0[] PROGMEM = "M107"; -static const char cmd_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); -static const char cmd_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); -static const char cmd_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); -static const char cmd_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); -static const char cmd_5[] PROGMEM = "G28"; -static const char cmd_6[] PROGMEM = "G92 E0.0"; +static const char cmd_preheat_0[] PROGMEM = "M107"; +static const char cmd_preheat_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); +static const char cmd_preheat_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); +static const char cmd_preheat_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); +static const char cmd_preheat_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); +static const char cmd_preheat_5[] PROGMEM = "G28"; +static const char cmd_preheat_6[] PROGMEM = "G92 E0.0"; static const char * const preheat_cmd[] PROGMEM = { - cmd_0, - cmd_1, - cmd_2, - cmd_3, - cmd_4, - cmd_5, //call MSG_M117_V2_CALIBRATION before - cmd_6, + cmd_preheat_0, + cmd_preheat_1, + cmd_preheat_2, + cmd_preheat_3, + cmd_preheat_4, + cmd_preheat_5, //call MSG_M117_V2_CALIBRATION before + cmd_preheat_6, }; void lay1cal_preheat() @@ -40,3 +41,55 @@ void lay1cal_preheat() } } + +static const char cmd_intro_mmu_0[] PROGMEM = "M83"; +static const char cmd_intro_mmu_1[] PROGMEM = "G1 Y-3.0 F1000.0"; +static const char cmd_intro_mmu_2[] PROGMEM = "G1 Z0.4 F1000.0"; +static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0"; // call T code before +static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5.0 E32.0 F1800.0"; +static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55.0 E8.0 F2000.0"; +static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000.0"; +static const char cmd_intro_mmu_7[] PROGMEM = "G92 E0.0"; +static const char cmd_intro_mmu_8[] PROGMEM = "G1 X240.0 E25.0 F2200.0"; +static const char cmd_intro_mmu_9[] PROGMEM = "G1 Y-2.0 F1000.0"; +static const char cmd_intro_mmu_10[] PROGMEM = "G1 X55.0 E25 F1400.0"; +static const char cmd_intro_mmu_11[] PROGMEM = "G1 Z0.20 F1000.0"; +static const char cmd_intro_mmu_12[] PROGMEM = "G1 X5.0 E4.0 F1000.0"; + +static const char * const intro_mmu_cmd[] PROGMEM = +{ + cmd_intro_mmu_0, + cmd_intro_mmu_1, + cmd_intro_mmu_2, + cmd_intro_mmu_3, // call T code before + cmd_intro_mmu_4, + cmd_intro_mmu_5, + cmd_intro_mmu_6, + cmd_intro_mmu_7, + cmd_intro_mmu_8, + cmd_intro_mmu_9, + cmd_intro_mmu_10, + cmd_intro_mmu_11, + cmd_intro_mmu_12, +}; + +void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) +{ + if (mmu_enabled) + { + for (uint8_t i = 0; i < (sizeof(intro_mmu_cmd)/sizeof(intro_mmu_cmd[0])); ++i) + { + if (3 == i) + { + sprintf_P(cmd_buffer, PSTR("T%d"), filament); + enquecommand(cmd_buffer); + } + enquecommand_P(static_cast(pgm_read_ptr(&intro_mmu_cmd[i]))); + } + } + else + { + enquecommand_P(PSTR("G1 X60.0 E9.0 F1000.0")); + enquecommand_P(PSTR("G1 X100.0 E12.5 F1000.0")); + } +} diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 5068e337..12f1a3d9 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -7,8 +7,10 @@ #ifndef FIRMWARE_FIRST_LAY_CAL_H_ #define FIRMWARE_FIRST_LAY_CAL_H_ +#include void lay1cal_preheat(); +void lay1cal_intro_line(char *cmd_buffer, uint8_t filament); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 66bc453a..4ce79dc3 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1396,30 +1396,7 @@ void lcd_commands() menu_depth = 0; menu_submenu(lcd_babystep_z); - if (mmu_enabled) - { - enquecommand_P(PSTR("M83")); //intro line - enquecommand_P(PSTR("G1 Y-3.0 F1000.0")); //intro line - enquecommand_P(PSTR("G1 Z0.4 F1000.0")); //intro line - strcpy(cmd1, "T"); - strcat(cmd1, itostr3left(filament)); - enquecommand(cmd1); - enquecommand_P(PSTR("G1 X55.0 E32.0 F1073.0")); //intro line - enquecommand_P(PSTR("G1 X5.0 E32.0 F1800.0")); //intro line - enquecommand_P(PSTR("G1 X55.0 E8.0 F2000.0")); //intro line - enquecommand_P(PSTR("G1 Z0.3 F1000.0")); //intro line - enquecommand_P(PSTR("G92 E0.0")); //intro line - enquecommand_P(PSTR("G1 X240.0 E25.0 F2200.0")); //intro line - enquecommand_P(PSTR("G1 Y-2.0 F1000.0")); //intro line - enquecommand_P(PSTR("G1 X55.0 E25 F1400.0")); //intro line - enquecommand_P(PSTR("G1 Z0.20 F1000.0")); //intro line - enquecommand_P(PSTR("G1 X5.0 E4.0 F1000.0")); //intro line - - } else - { - enquecommand_P(PSTR("G1 X60.0 E9.0 F1000.0")); //intro line - enquecommand_P(PSTR("G1 X100.0 E12.5 F1000.0")); //intro line - } + lay1cal_intro_line(cmd1, filament); lcd_commands_step = 8; } From 58948cffcd6d2e5ccaea6e5508f0144e34619eec Mon Sep 17 00:00:00 2001 From: DRracer Date: Tue, 11 Jun 2019 16:24:40 +0200 Subject: [PATCH 155/168] Code size reduction - saved almost 2KB --- Firmware/ultralcd.cpp | 114 ++++++++++-------------------------------- Firmware/ultralcd.h | 2 +- 2 files changed, 27 insertions(+), 89 deletions(-) mode change 100644 => 100755 Firmware/ultralcd.h diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 4ce79dc3..8a226b4b 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -74,8 +74,8 @@ extern void crashdet_disable(); bool presort_flag = false; #endif -int lcd_commands_type = LCD_COMMAND_IDLE; -int lcd_commands_step = 0; +uint8_t lcd_commands_type = LCD_COMMAND_IDLE; +uint8_t lcd_commands_step = 0; unsigned int custom_message_type = CUSTOM_MSG_TYPE_STATUS; unsigned int custom_message_state = 0; @@ -1061,6 +1061,20 @@ static void lcd_status_screen() feedmultiply = 999; } +//! extracted common code from lcd_commands into a separate function +//! along with the sprintf_P optimization this change gained more than 1.6KB +static void lcd_commands_func1(char *cmd1, uint8_t i, float width, float extr, float extr_short_segment){ + static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f"; + static const char fmt2[] PROGMEM = "G1 Y%-.2f E%-.3f"; + sprintf_P(cmd1, fmt1, 70, (35 - i*width * 2), extr); + enquecommand(cmd1); + sprintf_P(cmd1, fmt2, (35 - (2 * i + 1)*width), extr_short_segment); + enquecommand(cmd1); + sprintf_P(cmd1, fmt1, 50, (35 - (2 * i + 1)*width), extr); + enquecommand(cmd1); + sprintf_P(cmd1, fmt2, (35 - (i + 1)*width * 2), extr_short_segment); + enquecommand(cmd1); +} void lcd_commands() { @@ -1466,27 +1480,8 @@ void lcd_commands() lcd_timeoutToStatus.start(); - for (int i = 0; i < 4; i++) { - strcpy(cmd1, "G1 X70 Y"); - strcat(cmd1, ftostr32(35 - i*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); - strcpy(cmd1, "G1 X50 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); + for (uint8_t i = 0; i < 4; i++) { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); } lcd_commands_step = 5; @@ -1495,56 +1490,18 @@ void lcd_commands() if (lcd_commands_step == 5 && !blocks_queued() && cmd_buffer_empty()) { lcd_timeoutToStatus.start(); - for (int i = 4; i < 8; i++) { - strcpy(cmd1, "G1 X70 Y"); - strcat(cmd1, ftostr32(35 - i*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); - strcpy(cmd1, "G1 X50 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); + for (uint8_t i = 4; i < 8; i++) { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); } lcd_commands_step = 4; } - + if (lcd_commands_step == 4 && !blocks_queued() && cmd_buffer_empty()) { - lcd_timeoutToStatus.start(); - for (int i = 8; i < 12; i++) { - strcpy(cmd1, "G1 X70 Y"); - strcat(cmd1, ftostr32(35 - i*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); - strcpy(cmd1, "G1 X50 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); + lcd_timeoutToStatus.start(); + for (uint8_t i = 8; i < 12; i++) { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); } lcd_commands_step = 3; @@ -1553,27 +1510,8 @@ void lcd_commands() if (lcd_commands_step == 3 && !blocks_queued() && cmd_buffer_empty()) { lcd_timeoutToStatus.start(); - for (int i = 12; i < 16; i++) { - strcpy(cmd1, "G1 X70 Y"); - strcat(cmd1, ftostr32(35 - i*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); - strcpy(cmd1, "G1 X50 Y"); - strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - strcpy(cmd1, "G1 Y"); - strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, " E"); - strcat(cmd1, ftostr43(extr_short_segment)); - enquecommand(cmd1); + for (uint8_t i = 12; i < 16; i++) { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); } lcd_commands_step = 2; diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h old mode 100644 new mode 100755 index 665c1233..f8cf8365 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -97,7 +97,7 @@ extern void lcd_diag_show_end_stops(); #define LCD_COMMAND_PID_EXTRUDER 7 #define LCD_COMMAND_V2_CAL 8 -extern int lcd_commands_type; +extern uint8_t lcd_commands_type; extern int8_t FSensorStateMenu; #define CUSTOM_MSG_TYPE_STATUS 0 // status message from lcd_status_message variable From 9b1e3213ae35e2c66d41020e04c9c391f82902c1 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 17:25:52 +0200 Subject: [PATCH 156/168] Variable lcd_commands_step doesn't need to be global. --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8a226b4b..6edca9bf 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -75,7 +75,7 @@ bool presort_flag = false; #endif uint8_t lcd_commands_type = LCD_COMMAND_IDLE; -uint8_t lcd_commands_step = 0; +static uint8_t lcd_commands_step = 0; unsigned int custom_message_type = CUSTOM_MSG_TYPE_STATUS; unsigned int custom_message_state = 0; From 97a5d6b5f4037b863ffe6e31cd0160bf5760ac0a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 17:30:37 +0200 Subject: [PATCH 157/168] Make constants const. --- Firmware/ultralcd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6edca9bf..a6d31450 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1363,10 +1363,10 @@ void lcd_commands() { char cmd1[30]; static uint8_t filament = 0; - float width = 0.4; - float length = 20 - width; - float extr = count_e(0.2, width, length); - float extr_short_segment = count_e(0.2, width, width); + const float width = 0.4; + const float length = 20 - width; + const float extr = count_e(0.2, width, length); + const float extr_short_segment = count_e(0.2, width, width); if(lcd_commands_step>1) lcd_timeoutToStatus.start(); //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen if (lcd_commands_step == 0 && !blocks_queued() && cmd_buffer_empty()) From d21f256cd06699a774306ea6f94026a09ff6adec Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 18:26:59 +0200 Subject: [PATCH 158/168] Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory. --- Firmware/ultralcd.cpp | 293 ++++++++++++++++++------------------------ 1 file changed, 123 insertions(+), 170 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a6d31450..b57196ae 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1367,180 +1367,133 @@ void lcd_commands() const float length = 20 - width; const float extr = count_e(0.2, width, length); const float extr_short_segment = count_e(0.2, width, width); + if(lcd_commands_step>1) lcd_timeoutToStatus.start(); //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen - if (lcd_commands_step == 0 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_commands_step = 10; - } - if (lcd_commands_step == 20 && !blocks_queued() && cmd_buffer_empty()) - { - filament = 0; - lcd_commands_step = 10; - } - if (lcd_commands_step == 21 && !blocks_queued() && cmd_buffer_empty()) + if (!blocks_queued() && cmd_buffer_empty()) { - filament = 1; - lcd_commands_step = 10; + switch(lcd_commands_step) + { + case 0: + lcd_commands_step = 10; + break; + case 20: + filament = 0; + lcd_commands_step = 10; + break; + case 21: + filament = 1; + lcd_commands_step = 10; + break; + case 22: + filament = 2; + lcd_commands_step = 10; + break; + case 23: + filament = 3; + lcd_commands_step = 10; + break; + case 24: + filament = 4; + lcd_commands_step = 10; + break; + case 10: + lay1cal_preheat(); + lcd_commands_step = 9; + break; + case 9: + lcd_clear(); + menu_depth = 0; + menu_submenu(lcd_babystep_z); + lay1cal_intro_line(cmd1, filament); + lcd_commands_step = 8; + break; + case 8: + enquecommand_P(PSTR("G92 E0.0")); + enquecommand_P(PSTR("G21")); //set units to millimeters + enquecommand_P(PSTR("G90")); //use absolute coordinates + enquecommand_P(PSTR("M83")); //use relative distances for extrusion + enquecommand_P(PSTR("G1 E-1.50000 F2100.00000")); + enquecommand_P(PSTR("G1 Z5 F7200.000")); + enquecommand_P(PSTR("M204 S1000")); //set acceleration + enquecommand_P(PSTR("G1 F4000")); + lcd_commands_step = 7; + break; + case 7: + enquecommand_P(PSTR("G1 X50 Y155")); + enquecommand_P(PSTR("G1 Z0.150 F7200.000")); + enquecommand_P(PSTR("G1 F1080")); + enquecommand_P(PSTR("G1 X75 Y155 E2.5")); + enquecommand_P(PSTR("G1 X100 Y155 E2")); + enquecommand_P(PSTR("G1 X200 Y155 E2.62773")); + enquecommand_P(PSTR("G1 X200 Y135 E0.66174")); + enquecommand_P(PSTR("G1 X50 Y135 E3.62773")); + enquecommand_P(PSTR("G1 X50 Y115 E0.49386")); + enquecommand_P(PSTR("G1 X200 Y115 E3.62773")); + enquecommand_P(PSTR("G1 X200 Y95 E0.49386")); + enquecommand_P(PSTR("G1 X50 Y95 E3.62773")); + enquecommand_P(PSTR("G1 X50 Y75 E0.49386")); + enquecommand_P(PSTR("G1 X200 Y75 E3.62773")); + enquecommand_P(PSTR("G1 X200 Y55 E0.49386")); + enquecommand_P(PSTR("G1 X50 Y55 E3.62773")); + + strcpy(cmd1, "G1 X50 Y35 E"); + strcat(cmd1, ftostr43(extr)); + enquecommand(cmd1); + + lcd_commands_step = 6; + break; + case 6: + for (uint8_t i = 0; i < 4; i++) + { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + } + lcd_commands_step = 5; + break; + case 5: + for (uint8_t i = 4; i < 8; i++) + { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + } + lcd_commands_step = 4; + break; + case 4: + for (uint8_t i = 8; i < 12; i++) + { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + } + lcd_commands_step = 3; + break; + case 3: + for (uint8_t i = 12; i < 16; i++) + { + lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + } + lcd_commands_step = 2; + break; + case 2: + enquecommand_P(PSTR("M107")); //turn off printer fan + enquecommand_P(PSTR("G1 E-0.07500 F2100.00000")); //retract + enquecommand_P(PSTR("M104 S0")); // turn off temperature + enquecommand_P(PSTR("M140 S0")); // turn off heatbed + enquecommand_P(PSTR("G1 Z10 F1300.000")); //lift Z + enquecommand_P(PSTR("G1 X10 Y180 F4000")); //Go to parking position + if (mmu_enabled) enquecommand_P(PSTR("M702 C")); //unload from nozzle + enquecommand_P(PSTR("M84"));// disable motors + forceMenuExpire = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen + lcd_commands_step = 1; + break; + case 1: + lcd_setstatuspgm(_T(WELCOME_MSG)); + lcd_commands_step = 0; + lcd_commands_type = 0; + if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) + { + lcd_wizard(WizState::RepeatLay1Cal); + } + break; + } } - if (lcd_commands_step == 22 && !blocks_queued() && cmd_buffer_empty()) - { - filament = 2; - lcd_commands_step = 10; - } - if (lcd_commands_step == 23 && !blocks_queued() && cmd_buffer_empty()) - { - filament = 3; - lcd_commands_step = 10; - } - if (lcd_commands_step == 24 && !blocks_queued() && cmd_buffer_empty()) - { - filament = 4; - lcd_commands_step = 10; - } - - if (lcd_commands_step == 10) - { - lay1cal_preheat(); - lcd_commands_step = 9; - } - if (lcd_commands_step == 9 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_clear(); - menu_depth = 0; - menu_submenu(lcd_babystep_z); - - lay1cal_intro_line(cmd1, filament); - - lcd_commands_step = 8; - } - if (lcd_commands_step == 8 && !blocks_queued() && cmd_buffer_empty()) - { - - enquecommand_P(PSTR("G92 E0.0")); - enquecommand_P(PSTR("G21")); //set units to millimeters - enquecommand_P(PSTR("G90")); //use absolute coordinates - enquecommand_P(PSTR("M83")); //use relative distances for extrusion - enquecommand_P(PSTR("G1 E-1.50000 F2100.00000")); - enquecommand_P(PSTR("G1 Z5 F7200.000")); - enquecommand_P(PSTR("M204 S1000")); //set acceleration - enquecommand_P(PSTR("G1 F4000")); - lcd_commands_step = 7; - } - if (lcd_commands_step == 7 && !blocks_queued() && cmd_buffer_empty()) //draw meander - { - lcd_timeoutToStatus.start(); - - - //just opposite direction - /*enquecommand_P(PSTR("G1 X50 Y55")); - enquecommand_P(PSTR("G1 F1080")); - enquecommand_P(PSTR("G1 X200 Y55 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y75 E0.49386")); - enquecommand_P(PSTR("G1 X50 Y75 E3.62773")); - enquecommand_P(PSTR("G1 X50 Y95 E0.49386")); - enquecommand_P(PSTR("G1 X200 Y95 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y115 E0.49386")); - enquecommand_P(PSTR("G1 X50 Y115 E3.62773")); - enquecommand_P(PSTR("G1 X50 Y135 E0.49386")); - enquecommand_P(PSTR("G1 X200 Y135 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y155 E0.66174")); - enquecommand_P(PSTR("G1 X100 Y155 E2.62773")); - enquecommand_P(PSTR("G1 X75 Y155 E2")); - enquecommand_P(PSTR("G1 X50 Y155 E2.5")); - enquecommand_P(PSTR("G1 E - 0.07500 F2100.00000"));*/ - - - enquecommand_P(PSTR("G1 X50 Y155")); - enquecommand_P(PSTR("G1 Z0.150 F7200.000")); - enquecommand_P(PSTR("G1 F1080")); - enquecommand_P(PSTR("G1 X75 Y155 E2.5")); - enquecommand_P(PSTR("G1 X100 Y155 E2")); - enquecommand_P(PSTR("G1 X200 Y155 E2.62773")); - enquecommand_P(PSTR("G1 X200 Y135 E0.66174")); - enquecommand_P(PSTR("G1 X50 Y135 E3.62773")); - enquecommand_P(PSTR("G1 X50 Y115 E0.49386")); - enquecommand_P(PSTR("G1 X200 Y115 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y95 E0.49386")); - enquecommand_P(PSTR("G1 X50 Y95 E3.62773")); - enquecommand_P(PSTR("G1 X50 Y75 E0.49386")); - enquecommand_P(PSTR("G1 X200 Y75 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y55 E0.49386")); - enquecommand_P(PSTR("G1 X50 Y55 E3.62773")); - - strcpy(cmd1, "G1 X50 Y35 E"); - strcat(cmd1, ftostr43(extr)); - enquecommand(cmd1); - - lcd_commands_step = 6; - } - - if (lcd_commands_step == 6 && !blocks_queued() && cmd_buffer_empty()) - { - - lcd_timeoutToStatus.start(); - - for (uint8_t i = 0; i < 4; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); - } - - lcd_commands_step = 5; - } - - if (lcd_commands_step == 5 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_timeoutToStatus.start(); - for (uint8_t i = 4; i < 8; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); - } - - lcd_commands_step = 4; - } - - if (lcd_commands_step == 4 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_timeoutToStatus.start(); - for (uint8_t i = 8; i < 12; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); - } - - lcd_commands_step = 3; - } - - if (lcd_commands_step == 3 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_timeoutToStatus.start(); - for (uint8_t i = 12; i < 16; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); - } - - lcd_commands_step = 2; - } - - if (lcd_commands_step == 2 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_timeoutToStatus.start(); - enquecommand_P(PSTR("M107")); //turn off printer fan - enquecommand_P(PSTR("G1 E-0.07500 F2100.00000")); //retract - enquecommand_P(PSTR("M104 S0")); // turn off temperature - enquecommand_P(PSTR("M140 S0")); // turn off heatbed - enquecommand_P(PSTR("G1 Z10 F1300.000")); //lift Z - enquecommand_P(PSTR("G1 X10 Y180 F4000")); //Go to parking position - if (mmu_enabled) enquecommand_P(PSTR("M702 C")); //unload from nozzle - enquecommand_P(PSTR("M84"));// disable motors - forceMenuExpire = true; //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen - lcd_commands_step = 1; - } - if (lcd_commands_step == 1 && !blocks_queued() && cmd_buffer_empty()) - { - lcd_setstatuspgm(_T(WELCOME_MSG)); - lcd_commands_step = 0; - lcd_commands_type = 0; - if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) { - lcd_wizard(WizState::RepeatLay1Cal); - } - } - } #endif // not SNMM From 4effff9e9991a56a14fb246ba5d503faa231b18a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 18:56:29 +0200 Subject: [PATCH 159/168] Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory. --- Firmware/first_lay_cal.cpp | 29 +++++++++++++++++++++++++++++ Firmware/first_lay_cal.h | 1 + Firmware/ultralcd.cpp | 9 +-------- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 60bb5440..0958faaa 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -93,3 +93,32 @@ void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) enquecommand_P(PSTR("G1 X100.0 E12.5 F1000.0")); } } + +static const char cmd_pre_meander_0[] PROGMEM = "G92 E0.0"; +static const char cmd_pre_meander_1[] PROGMEM = "G21"; //set units to millimeters TODO unsupported command +static const char cmd_pre_meander_2[] PROGMEM = "G90"; //use absolute coordinates +static const char cmd_pre_meander_3[] PROGMEM = "M83"; //use relative distances for extrusion TODO: duplicate +static const char cmd_pre_meander_4[] PROGMEM = "G1 E-1.50000 F2100.00000"; +static const char cmd_pre_meander_5[] PROGMEM = "G1 Z5 F7200.000"; +static const char cmd_pre_meander_6[] PROGMEM = "M204 S1000"; //set acceleration +static const char cmd_pre_meander_7[] PROGMEM = "G1 F4000"; + +static const char * const cmd_pre_meander[] PROGMEM = +{ + cmd_pre_meander_0, + cmd_pre_meander_1, + cmd_pre_meander_2, + cmd_pre_meander_3, + cmd_pre_meander_4, + cmd_pre_meander_5, + cmd_pre_meander_6, + cmd_pre_meander_7, +}; + +void lay1cal_before_meander() +{ + for (uint8_t i = 0; i < (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0])); ++i) + { + enquecommand_P(static_cast(pgm_read_ptr(&cmd_pre_meander[i]))); + } +} diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 12f1a3d9..b99d691b 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -11,6 +11,7 @@ void lay1cal_preheat(); void lay1cal_intro_line(char *cmd_buffer, uint8_t filament); +void lay1cal_before_meander(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b57196ae..efb58b86 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1409,14 +1409,7 @@ void lcd_commands() lcd_commands_step = 8; break; case 8: - enquecommand_P(PSTR("G92 E0.0")); - enquecommand_P(PSTR("G21")); //set units to millimeters - enquecommand_P(PSTR("G90")); //use absolute coordinates - enquecommand_P(PSTR("M83")); //use relative distances for extrusion - enquecommand_P(PSTR("G1 E-1.50000 F2100.00000")); - enquecommand_P(PSTR("G1 Z5 F7200.000")); - enquecommand_P(PSTR("M204 S1000")); //set acceleration - enquecommand_P(PSTR("G1 F4000")); + lay1cal_before_meander(); lcd_commands_step = 7; break; case 7: From 21f466960043aace1f2a1ac1476f612151f4d225 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 19:22:08 +0200 Subject: [PATCH 160/168] Make count_e() constexpr. --- Firmware/ultralcd.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index efb58b86..23ab61cd 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -246,7 +246,7 @@ static char snmm_stop_print_menu(); #ifdef SDCARD_SORT_ALPHA static void lcd_sort_type_set(); #endif -static float count_e(float layer_heigth, float extrusion_width, float extrusion_length); +static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length); static void lcd_babystep_z(); static void lcd_send_status(); #ifdef FARM_CONNECT_MESSAGE @@ -1680,10 +1680,9 @@ void lcd_commands() } -static float count_e(float layer_heigth, float extrusion_width, float extrusion_length) { +static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length) { //returns filament length in mm which needs to be extrude to form line with extrusion_length * extrusion_width * layer heigth dimensions - float extr = extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4); - return extr; + return (extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4)); } void lcd_return_to_status() From 47a183e96e5bc6ecb2e049520a4fa805f52ed090 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 19:49:56 +0200 Subject: [PATCH 161/168] Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory. --- Firmware/first_lay_cal.cpp | 45 ++++++++++++++++++++++++++++++++++++++ Firmware/first_lay_cal.h | 1 + Firmware/ultralcd.cpp | 17 +------------- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 0958faaa..446b8201 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -122,3 +122,48 @@ void lay1cal_before_meander() enquecommand_P(static_cast(pgm_read_ptr(&cmd_pre_meander[i]))); } } + +static const char cmd_meander_0[] PROGMEM = "G1 X50 Y155"; +static const char cmd_meander_1[] PROGMEM = "G1 Z0.150 F7200.000"; +static const char cmd_meander_2[] PROGMEM = "G1 F1080"; +static const char cmd_meander_3[] PROGMEM = "G1 X75 Y155 E2.5"; +static const char cmd_meander_4[] PROGMEM = "G1 X100 Y155 E2"; +static const char cmd_meander_5[] PROGMEM = "G1 X200 Y155 E2.62773"; +static const char cmd_meander_6[] PROGMEM = "G1 X200 Y135 E0.66174"; +static const char cmd_meander_7[] PROGMEM = "G1 X50 Y135 E3.62773"; +static const char cmd_meander_8[] PROGMEM = "G1 X50 Y115 E0.49386"; +static const char cmd_meander_9[] PROGMEM = "G1 X200 Y115 E3.62773"; +static const char cmd_meander_10[] PROGMEM = "G1 X200 Y95 E0.49386"; +static const char cmd_meander_11[] PROGMEM = "G1 X50 Y95 E3.62773"; +static const char cmd_meander_12[] PROGMEM = "G1 X50 Y75 E0.49386"; +static const char cmd_meander_13[] PROGMEM = "G1 X200 Y75 E3.62773"; +static const char cmd_meander_14[] PROGMEM = "G1 X200 Y55 E0.49386"; +static const char cmd_meander_15[] PROGMEM = "G1 X50 Y55 E3.62773"; + +static const char * const cmd_meander[] PROGMEM = +{ + cmd_meander_0, + cmd_meander_1, + cmd_meander_2, + cmd_meander_3, + cmd_meander_4, + cmd_meander_5, + cmd_meander_6, + cmd_meander_7, + cmd_meander_8, + cmd_meander_9, + cmd_meander_10, + cmd_meander_11, + cmd_meander_12, + cmd_meander_13, + cmd_meander_14, + cmd_meander_15, +}; + +void lay1cal_meander() +{ + for (uint8_t i = 0; i < (sizeof(cmd_meander)/sizeof(cmd_meander[0])); ++i) + { + enquecommand_P(static_cast(pgm_read_ptr(&cmd_meander[i]))); + } +} diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index b99d691b..7ebed5e8 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -12,6 +12,7 @@ void lay1cal_preheat(); void lay1cal_intro_line(char *cmd_buffer, uint8_t filament); void lay1cal_before_meander(); +void lay1cal_meander(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 23ab61cd..1cac19a9 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1413,22 +1413,7 @@ void lcd_commands() lcd_commands_step = 7; break; case 7: - enquecommand_P(PSTR("G1 X50 Y155")); - enquecommand_P(PSTR("G1 Z0.150 F7200.000")); - enquecommand_P(PSTR("G1 F1080")); - enquecommand_P(PSTR("G1 X75 Y155 E2.5")); - enquecommand_P(PSTR("G1 X100 Y155 E2")); - enquecommand_P(PSTR("G1 X200 Y155 E2.62773")); - enquecommand_P(PSTR("G1 X200 Y135 E0.66174")); - enquecommand_P(PSTR("G1 X50 Y135 E3.62773")); - enquecommand_P(PSTR("G1 X50 Y115 E0.49386")); - enquecommand_P(PSTR("G1 X200 Y115 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y95 E0.49386")); - enquecommand_P(PSTR("G1 X50 Y95 E3.62773")); - enquecommand_P(PSTR("G1 X50 Y75 E0.49386")); - enquecommand_P(PSTR("G1 X200 Y75 E3.62773")); - enquecommand_P(PSTR("G1 X200 Y55 E0.49386")); - enquecommand_P(PSTR("G1 X50 Y55 E3.62773")); + lay1cal_meander(); strcpy(cmd1, "G1 X50 Y35 E"); strcat(cmd1, ftostr43(extr)); From 60cc3d58ece82fd52f886e819bde1a33146a137a Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Tue, 11 Jun 2019 20:00:49 +0200 Subject: [PATCH 162/168] Use sprintf_P in first layer calibration. Save 30B of FLASH memory. --- Firmware/ultralcd.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1cac19a9..c1295f4d 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1414,9 +1414,7 @@ void lcd_commands() break; case 7: lay1cal_meander(); - - strcpy(cmd1, "G1 X50 Y35 E"); - strcat(cmd1, ftostr43(extr)); + sprintf_P(cmd1, PSTR("G1 X50 Y35 E%-.3f"), extr); enquecommand(cmd1); lcd_commands_step = 6; From d528a53526b7d4e241d9943c295fbef035193bb8 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 12 Jun 2019 01:36:48 +0200 Subject: [PATCH 163/168] Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory. --- Firmware/first_lay_cal.cpp | 41 +++++++++++++++++++++++++++++++++++++- Firmware/first_lay_cal.h | 5 ++--- Firmware/ultralcd.cpp | 38 +++++------------------------------ 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 446b8201..c539ebda 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -160,10 +160,49 @@ static const char * const cmd_meander[] PROGMEM = cmd_meander_15, }; -void lay1cal_meander() +//! @brief Count extrude length +//! +//! @param layer_heigth layer heigth in mm +//! @param extrusion_width extrusion width in mm +//! @param extrusion_length extrusion length in mm +//! @return filament length in mm which needs to be extruded to form line +static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length) +{ + return (extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4)); +} + +static const float width = 0.4; +static const float length = 20 - width; +static const float extr = count_e(0.2, width, length); + +void lay1cal_meander(char *cmd_buffer) { for (uint8_t i = 0; i < (sizeof(cmd_meander)/sizeof(cmd_meander[0])); ++i) { enquecommand_P(static_cast(pgm_read_ptr(&cmd_meander[i]))); } + sprintf_P(cmd_buffer, PSTR("G1 X50 Y35 E%-.3f"), extr); + enquecommand(cmd_buffer); +} + +//! @brief Print square +//! +//! This function needs to be called 16 times for i from 0 to 15. +//! +//! @par cmd_buffer character buffer needed to format gcodes +//! @par i iteration +void lay1cal_square(char *cmd_buffer, uint8_t i) +{ + const float extr_short_segment = count_e(0.2, width, width); + + static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f"; + static const char fmt2[] PROGMEM = "G1 Y%-.2f E%-.3f"; + sprintf_P(cmd_buffer, fmt1, 70, (35 - i*width * 2), extr); + enquecommand(cmd_buffer); + sprintf_P(cmd_buffer, fmt2, (35 - (2 * i + 1)*width), extr_short_segment); + enquecommand(cmd_buffer); + sprintf_P(cmd_buffer, fmt1, 50, (35 - (2 * i + 1)*width), extr); + enquecommand(cmd_buffer); + sprintf_P(cmd_buffer, fmt2, (35 - (i + 1)*width * 2), extr_short_segment); + enquecommand(cmd_buffer); } diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 7ebed5e8..4da415fd 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -12,8 +12,7 @@ void lay1cal_preheat(); void lay1cal_intro_line(char *cmd_buffer, uint8_t filament); void lay1cal_before_meander(); -void lay1cal_meander(); - - +void lay1cal_meander(char *cmd_buffer); +void lay1cal_square(char *cmd_buffer, uint8_t i); #endif /* FIRMWARE_FIRST_LAY_CAL_H_ */ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c1295f4d..be4b1537 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -246,7 +246,6 @@ static char snmm_stop_print_menu(); #ifdef SDCARD_SORT_ALPHA static void lcd_sort_type_set(); #endif -static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length); static void lcd_babystep_z(); static void lcd_send_status(); #ifdef FARM_CONNECT_MESSAGE @@ -1061,21 +1060,6 @@ static void lcd_status_screen() feedmultiply = 999; } -//! extracted common code from lcd_commands into a separate function -//! along with the sprintf_P optimization this change gained more than 1.6KB -static void lcd_commands_func1(char *cmd1, uint8_t i, float width, float extr, float extr_short_segment){ - static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f"; - static const char fmt2[] PROGMEM = "G1 Y%-.2f E%-.3f"; - sprintf_P(cmd1, fmt1, 70, (35 - i*width * 2), extr); - enquecommand(cmd1); - sprintf_P(cmd1, fmt2, (35 - (2 * i + 1)*width), extr_short_segment); - enquecommand(cmd1); - sprintf_P(cmd1, fmt1, 50, (35 - (2 * i + 1)*width), extr); - enquecommand(cmd1); - sprintf_P(cmd1, fmt2, (35 - (i + 1)*width * 2), extr_short_segment); - enquecommand(cmd1); -} - void lcd_commands() { if (lcd_commands_type == LCD_COMMAND_LONG_PAUSE) @@ -1363,10 +1347,6 @@ void lcd_commands() { char cmd1[30]; static uint8_t filament = 0; - const float width = 0.4; - const float length = 20 - width; - const float extr = count_e(0.2, width, length); - const float extr_short_segment = count_e(0.2, width, width); if(lcd_commands_step>1) lcd_timeoutToStatus.start(); //if user dont confirm live adjust Z value by pressing the knob, we are saving last value by timeout to status screen @@ -1413,37 +1393,34 @@ void lcd_commands() lcd_commands_step = 7; break; case 7: - lay1cal_meander(); - sprintf_P(cmd1, PSTR("G1 X50 Y35 E%-.3f"), extr); - enquecommand(cmd1); - + lay1cal_meander(cmd1); lcd_commands_step = 6; break; case 6: for (uint8_t i = 0; i < 4; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + lay1cal_square(cmd1, i); } lcd_commands_step = 5; break; case 5: for (uint8_t i = 4; i < 8; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + lay1cal_square(cmd1, i); } lcd_commands_step = 4; break; case 4: for (uint8_t i = 8; i < 12; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + lay1cal_square(cmd1, i); } lcd_commands_step = 3; break; case 3: for (uint8_t i = 12; i < 16; i++) { - lcd_commands_func1(cmd1, i, width, extr, extr_short_segment ); + lay1cal_square(cmd1, i); } lcd_commands_step = 2; break; @@ -1663,11 +1640,6 @@ void lcd_commands() } -static constexpr float count_e(float layer_heigth, float extrusion_width, float extrusion_length) { - //returns filament length in mm which needs to be extrude to form line with extrusion_length * extrusion_width * layer heigth dimensions - return (extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4)); -} - void lcd_return_to_status() { lcd_refresh(); // to maybe revive the LCD if static electricity killed it. From 342954b88ce5f95f1a04d1b9a720ffecf71cbfb0 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 12 Jun 2019 13:31:17 +0200 Subject: [PATCH 164/168] Refactor. Make constants producing first layer calibration square more clear. Note layer height discrepancy. --- Firmware/first_lay_cal.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index c539ebda..32eb4370 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -173,7 +173,8 @@ static constexpr float count_e(float layer_heigth, float extrusion_width, float static const float width = 0.4; static const float length = 20 - width; -static const float extr = count_e(0.2, width, length); +static const float heigth = 0.2; //!< TODO This is wrong, as current Z height is 0.15 mm +static const float extr = count_e(heigth, width, length); void lay1cal_meander(char *cmd_buffer) { @@ -193,7 +194,7 @@ void lay1cal_meander(char *cmd_buffer) //! @par i iteration void lay1cal_square(char *cmd_buffer, uint8_t i) { - const float extr_short_segment = count_e(0.2, width, width); + const float extr_short_segment = count_e(heigth, width, width); static const char fmt1[] PROGMEM = "G1 X%d Y%-.2f E%-.3f"; static const char fmt2[] PROGMEM = "G1 Y%-.2f E%-.3f"; From 2755a3733d70401523ce30e9466d60586e09179c Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 12 Jun 2019 14:15:58 +0200 Subject: [PATCH 165/168] Document. --- Firmware/first_lay_cal.cpp | 30 ++++++++++++++++++------------ Firmware/first_lay_cal.h | 9 +++------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 32eb4370..5910873e 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -1,9 +1,8 @@ -/* - * first_lay_cal.cpp - * - * Created on: Jun 10, 2019 - * Author: marek - */ +//! @file +//! @date Jun 10, 2019 +//! @author Marek Bel +//! @brief First layer (Z offset) calibration + #include "first_lay_cal.h" #include "Configuration_prusa.h" #include "language.h" @@ -32,6 +31,7 @@ static const char * const preheat_cmd[] PROGMEM = cmd_preheat_6, }; +//! @brief Preheat void lay1cal_preheat() { for (uint8_t i = 0; i < (sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); ++i) @@ -73,6 +73,9 @@ static const char * const intro_mmu_cmd[] PROGMEM = cmd_intro_mmu_12, }; +//! @brief Print intro line +//! @param cmd_buffer character buffer needed to format gcodes +//! @param filament filament to use (applies for MMU only) void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) { if (mmu_enabled) @@ -115,6 +118,7 @@ static const char * const cmd_pre_meander[] PROGMEM = cmd_pre_meander_7, }; +//! @brief Setup for printing meander void lay1cal_before_meander() { for (uint8_t i = 0; i < (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0])); ++i) @@ -171,11 +175,13 @@ static constexpr float count_e(float layer_heigth, float extrusion_width, float return (extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4)); } -static const float width = 0.4; -static const float length = 20 - width; -static const float heigth = 0.2; //!< TODO This is wrong, as current Z height is 0.15 mm -static const float extr = count_e(heigth, width, length); +static const float width = 0.4; //!< line width +static const float length = 20 - width; //!< line length +static const float heigth = 0.2; //!< layer height TODO This is wrong, as current Z height is 0.15 mm +static const float extr = count_e(heigth, width, length); //!< E axis movement needed to print line +//! @brief Print meander +//! @param cmd_buffer character buffer needed to format gcodes void lay1cal_meander(char *cmd_buffer) { for (uint8_t i = 0; i < (sizeof(cmd_meander)/sizeof(cmd_meander[0])); ++i) @@ -190,8 +196,8 @@ void lay1cal_meander(char *cmd_buffer) //! //! This function needs to be called 16 times for i from 0 to 15. //! -//! @par cmd_buffer character buffer needed to format gcodes -//! @par i iteration +//! @param cmd_buffer character buffer needed to format gcodes +//! @param i iteration void lay1cal_square(char *cmd_buffer, uint8_t i) { const float extr_short_segment = count_e(heigth, width, width); diff --git a/Firmware/first_lay_cal.h b/Firmware/first_lay_cal.h index 4da415fd..1f338cc5 100644 --- a/Firmware/first_lay_cal.h +++ b/Firmware/first_lay_cal.h @@ -1,9 +1,6 @@ -/* - * first_lay_cal.h - * - * Created on: Jun 10, 2019 - * Author: marek - */ +//! @file +//! @date Jun 10, 2019 +//! @author Marek Bel #ifndef FIRMWARE_FIRST_LAY_CAL_H_ #define FIRMWARE_FIRST_LAY_CAL_H_ From 7ac098a135463334cbf4d08440ecc30e5d33c1e6 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 12 Jun 2019 14:20:20 +0200 Subject: [PATCH 166/168] Refactor. Put constants needed in functions inside fuctions to limit its scope. --- Firmware/first_lay_cal.cpp | 217 ++++++++++++++++++------------------- 1 file changed, 108 insertions(+), 109 deletions(-) diff --git a/Firmware/first_lay_cal.cpp b/Firmware/first_lay_cal.cpp index 5910873e..50f08c5e 100644 --- a/Firmware/first_lay_cal.cpp +++ b/Firmware/first_lay_cal.cpp @@ -10,30 +10,28 @@ #include "mmu.h" #include - -static const char cmd_preheat_0[] PROGMEM = "M107"; -static const char cmd_preheat_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); -static const char cmd_preheat_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); -static const char cmd_preheat_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); -static const char cmd_preheat_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); -static const char cmd_preheat_5[] PROGMEM = "G28"; -static const char cmd_preheat_6[] PROGMEM = "G92 E0.0"; - - -static const char * const preheat_cmd[] PROGMEM = -{ - cmd_preheat_0, - cmd_preheat_1, - cmd_preheat_2, - cmd_preheat_3, - cmd_preheat_4, - cmd_preheat_5, //call MSG_M117_V2_CALIBRATION before - cmd_preheat_6, -}; - //! @brief Preheat void lay1cal_preheat() { + static const char cmd_preheat_0[] PROGMEM = "M107"; + static const char cmd_preheat_1[] PROGMEM = "M104 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); + static const char cmd_preheat_2[] PROGMEM = "M140 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); + static const char cmd_preheat_3[] PROGMEM = "M190 S" STRINGIFY(PLA_PREHEAT_HPB_TEMP); + static const char cmd_preheat_4[] PROGMEM = "M109 S" STRINGIFY(PLA_PREHEAT_HOTEND_TEMP); + static const char cmd_preheat_5[] PROGMEM = "G28"; + static const char cmd_preheat_6[] PROGMEM = "G92 E0.0"; + + static const char * const preheat_cmd[] PROGMEM = + { + cmd_preheat_0, + cmd_preheat_1, + cmd_preheat_2, + cmd_preheat_3, + cmd_preheat_4, + cmd_preheat_5, //call MSG_M117_V2_CALIBRATION before + cmd_preheat_6, + }; + for (uint8_t i = 0; i < (sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); ++i) { if (5 == i) enquecommand_P(_T(MSG_M117_V2_CALIBRATION)); @@ -42,42 +40,42 @@ void lay1cal_preheat() } -static const char cmd_intro_mmu_0[] PROGMEM = "M83"; -static const char cmd_intro_mmu_1[] PROGMEM = "G1 Y-3.0 F1000.0"; -static const char cmd_intro_mmu_2[] PROGMEM = "G1 Z0.4 F1000.0"; -static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0"; // call T code before -static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5.0 E32.0 F1800.0"; -static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55.0 E8.0 F2000.0"; -static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000.0"; -static const char cmd_intro_mmu_7[] PROGMEM = "G92 E0.0"; -static const char cmd_intro_mmu_8[] PROGMEM = "G1 X240.0 E25.0 F2200.0"; -static const char cmd_intro_mmu_9[] PROGMEM = "G1 Y-2.0 F1000.0"; -static const char cmd_intro_mmu_10[] PROGMEM = "G1 X55.0 E25 F1400.0"; -static const char cmd_intro_mmu_11[] PROGMEM = "G1 Z0.20 F1000.0"; -static const char cmd_intro_mmu_12[] PROGMEM = "G1 X5.0 E4.0 F1000.0"; - -static const char * const intro_mmu_cmd[] PROGMEM = -{ - cmd_intro_mmu_0, - cmd_intro_mmu_1, - cmd_intro_mmu_2, - cmd_intro_mmu_3, // call T code before - cmd_intro_mmu_4, - cmd_intro_mmu_5, - cmd_intro_mmu_6, - cmd_intro_mmu_7, - cmd_intro_mmu_8, - cmd_intro_mmu_9, - cmd_intro_mmu_10, - cmd_intro_mmu_11, - cmd_intro_mmu_12, -}; - //! @brief Print intro line //! @param cmd_buffer character buffer needed to format gcodes //! @param filament filament to use (applies for MMU only) void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) { + static const char cmd_intro_mmu_0[] PROGMEM = "M83"; + static const char cmd_intro_mmu_1[] PROGMEM = "G1 Y-3.0 F1000.0"; + static const char cmd_intro_mmu_2[] PROGMEM = "G1 Z0.4 F1000.0"; + static const char cmd_intro_mmu_3[] PROGMEM = "G1 X55.0 E32.0 F1073.0"; // call T code before + static const char cmd_intro_mmu_4[] PROGMEM = "G1 X5.0 E32.0 F1800.0"; + static const char cmd_intro_mmu_5[] PROGMEM = "G1 X55.0 E8.0 F2000.0"; + static const char cmd_intro_mmu_6[] PROGMEM = "G1 Z0.3 F1000.0"; + static const char cmd_intro_mmu_7[] PROGMEM = "G92 E0.0"; + static const char cmd_intro_mmu_8[] PROGMEM = "G1 X240.0 E25.0 F2200.0"; + static const char cmd_intro_mmu_9[] PROGMEM = "G1 Y-2.0 F1000.0"; + static const char cmd_intro_mmu_10[] PROGMEM = "G1 X55.0 E25 F1400.0"; + static const char cmd_intro_mmu_11[] PROGMEM = "G1 Z0.20 F1000.0"; + static const char cmd_intro_mmu_12[] PROGMEM = "G1 X5.0 E4.0 F1000.0"; + + static const char * const intro_mmu_cmd[] PROGMEM = + { + cmd_intro_mmu_0, + cmd_intro_mmu_1, + cmd_intro_mmu_2, + cmd_intro_mmu_3, // call T code before + cmd_intro_mmu_4, + cmd_intro_mmu_5, + cmd_intro_mmu_6, + cmd_intro_mmu_7, + cmd_intro_mmu_8, + cmd_intro_mmu_9, + cmd_intro_mmu_10, + cmd_intro_mmu_11, + cmd_intro_mmu_12, + }; + if (mmu_enabled) { for (uint8_t i = 0; i < (sizeof(intro_mmu_cmd)/sizeof(intro_mmu_cmd[0])); ++i) @@ -97,72 +95,36 @@ void lay1cal_intro_line(char *cmd_buffer, uint8_t filament) } } -static const char cmd_pre_meander_0[] PROGMEM = "G92 E0.0"; -static const char cmd_pre_meander_1[] PROGMEM = "G21"; //set units to millimeters TODO unsupported command -static const char cmd_pre_meander_2[] PROGMEM = "G90"; //use absolute coordinates -static const char cmd_pre_meander_3[] PROGMEM = "M83"; //use relative distances for extrusion TODO: duplicate -static const char cmd_pre_meander_4[] PROGMEM = "G1 E-1.50000 F2100.00000"; -static const char cmd_pre_meander_5[] PROGMEM = "G1 Z5 F7200.000"; -static const char cmd_pre_meander_6[] PROGMEM = "M204 S1000"; //set acceleration -static const char cmd_pre_meander_7[] PROGMEM = "G1 F4000"; - -static const char * const cmd_pre_meander[] PROGMEM = -{ - cmd_pre_meander_0, - cmd_pre_meander_1, - cmd_pre_meander_2, - cmd_pre_meander_3, - cmd_pre_meander_4, - cmd_pre_meander_5, - cmd_pre_meander_6, - cmd_pre_meander_7, -}; - //! @brief Setup for printing meander void lay1cal_before_meander() { + static const char cmd_pre_meander_0[] PROGMEM = "G92 E0.0"; + static const char cmd_pre_meander_1[] PROGMEM = "G21"; //set units to millimeters TODO unsupported command + static const char cmd_pre_meander_2[] PROGMEM = "G90"; //use absolute coordinates + static const char cmd_pre_meander_3[] PROGMEM = "M83"; //use relative distances for extrusion TODO: duplicate + static const char cmd_pre_meander_4[] PROGMEM = "G1 E-1.50000 F2100.00000"; + static const char cmd_pre_meander_5[] PROGMEM = "G1 Z5 F7200.000"; + static const char cmd_pre_meander_6[] PROGMEM = "M204 S1000"; //set acceleration + static const char cmd_pre_meander_7[] PROGMEM = "G1 F4000"; + + static const char * const cmd_pre_meander[] PROGMEM = + { + cmd_pre_meander_0, + cmd_pre_meander_1, + cmd_pre_meander_2, + cmd_pre_meander_3, + cmd_pre_meander_4, + cmd_pre_meander_5, + cmd_pre_meander_6, + cmd_pre_meander_7, + }; + for (uint8_t i = 0; i < (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0])); ++i) { enquecommand_P(static_cast(pgm_read_ptr(&cmd_pre_meander[i]))); } } -static const char cmd_meander_0[] PROGMEM = "G1 X50 Y155"; -static const char cmd_meander_1[] PROGMEM = "G1 Z0.150 F7200.000"; -static const char cmd_meander_2[] PROGMEM = "G1 F1080"; -static const char cmd_meander_3[] PROGMEM = "G1 X75 Y155 E2.5"; -static const char cmd_meander_4[] PROGMEM = "G1 X100 Y155 E2"; -static const char cmd_meander_5[] PROGMEM = "G1 X200 Y155 E2.62773"; -static const char cmd_meander_6[] PROGMEM = "G1 X200 Y135 E0.66174"; -static const char cmd_meander_7[] PROGMEM = "G1 X50 Y135 E3.62773"; -static const char cmd_meander_8[] PROGMEM = "G1 X50 Y115 E0.49386"; -static const char cmd_meander_9[] PROGMEM = "G1 X200 Y115 E3.62773"; -static const char cmd_meander_10[] PROGMEM = "G1 X200 Y95 E0.49386"; -static const char cmd_meander_11[] PROGMEM = "G1 X50 Y95 E3.62773"; -static const char cmd_meander_12[] PROGMEM = "G1 X50 Y75 E0.49386"; -static const char cmd_meander_13[] PROGMEM = "G1 X200 Y75 E3.62773"; -static const char cmd_meander_14[] PROGMEM = "G1 X200 Y55 E0.49386"; -static const char cmd_meander_15[] PROGMEM = "G1 X50 Y55 E3.62773"; - -static const char * const cmd_meander[] PROGMEM = -{ - cmd_meander_0, - cmd_meander_1, - cmd_meander_2, - cmd_meander_3, - cmd_meander_4, - cmd_meander_5, - cmd_meander_6, - cmd_meander_7, - cmd_meander_8, - cmd_meander_9, - cmd_meander_10, - cmd_meander_11, - cmd_meander_12, - cmd_meander_13, - cmd_meander_14, - cmd_meander_15, -}; //! @brief Count extrude length //! @@ -184,6 +146,43 @@ static const float extr = count_e(heigth, width, length); //!< E axis movement n //! @param cmd_buffer character buffer needed to format gcodes void lay1cal_meander(char *cmd_buffer) { + static const char cmd_meander_0[] PROGMEM = "G1 X50 Y155"; + static const char cmd_meander_1[] PROGMEM = "G1 Z0.150 F7200.000"; + static const char cmd_meander_2[] PROGMEM = "G1 F1080"; + static const char cmd_meander_3[] PROGMEM = "G1 X75 Y155 E2.5"; + static const char cmd_meander_4[] PROGMEM = "G1 X100 Y155 E2"; + static const char cmd_meander_5[] PROGMEM = "G1 X200 Y155 E2.62773"; + static const char cmd_meander_6[] PROGMEM = "G1 X200 Y135 E0.66174"; + static const char cmd_meander_7[] PROGMEM = "G1 X50 Y135 E3.62773"; + static const char cmd_meander_8[] PROGMEM = "G1 X50 Y115 E0.49386"; + static const char cmd_meander_9[] PROGMEM = "G1 X200 Y115 E3.62773"; + static const char cmd_meander_10[] PROGMEM = "G1 X200 Y95 E0.49386"; + static const char cmd_meander_11[] PROGMEM = "G1 X50 Y95 E3.62773"; + static const char cmd_meander_12[] PROGMEM = "G1 X50 Y75 E0.49386"; + static const char cmd_meander_13[] PROGMEM = "G1 X200 Y75 E3.62773"; + static const char cmd_meander_14[] PROGMEM = "G1 X200 Y55 E0.49386"; + static const char cmd_meander_15[] PROGMEM = "G1 X50 Y55 E3.62773"; + + static const char * const cmd_meander[] PROGMEM = + { + cmd_meander_0, + cmd_meander_1, + cmd_meander_2, + cmd_meander_3, + cmd_meander_4, + cmd_meander_5, + cmd_meander_6, + cmd_meander_7, + cmd_meander_8, + cmd_meander_9, + cmd_meander_10, + cmd_meander_11, + cmd_meander_12, + cmd_meander_13, + cmd_meander_14, + cmd_meander_15, + }; + for (uint8_t i = 0; i < (sizeof(cmd_meander)/sizeof(cmd_meander[0])); ++i) { enquecommand_P(static_cast(pgm_read_ptr(&cmd_meander[i]))); From b15bbaf1779acdea717c34274e957f5f9b21b9bf Mon Sep 17 00:00:00 2001 From: DRracer Date: Wed, 12 Jun 2019 10:31:09 +0200 Subject: [PATCH 167/168] for cycles' variables: int -> uint8_t where appropriate, part1 --- Firmware/temperature.cpp | 2 +- Firmware/tmc2130.cpp | 10 +++++----- Firmware/ultralcd.cpp | 32 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 22 deletions(-) mode change 100644 => 100755 Firmware/tmc2130.cpp diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 9c49cf79..03845b12 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -434,7 +434,7 @@ static void temp_runaway_stop(bool isPreheat, bool isBed); void updatePID() { #ifdef PIDTEMP - for(int e = 0; e < EXTRUDERS; e++) { + for(uint8_t e = 0; e < EXTRUDERS; e++) { iState_sum_max[e] = PID_INTEGRAL_DRIVE_MAX / cs.Ki; } #endif diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp old mode 100644 new mode 100755 index 05ea2ab6..fe04e8da --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -158,7 +158,7 @@ void tmc2130_init() SET_INPUT(Y_TMC2130_DIAG); SET_INPUT(Z_TMC2130_DIAG); SET_INPUT(E0_TMC2130_DIAG); - for (int axis = 0; axis < 2; axis++) // X Y axes + for (uint8_t axis = 0; axis < 2; axis++) // X Y axes { tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -169,7 +169,7 @@ void tmc2130_init() tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); //tmc2130_wr_THIGH(axis, TMC2130_THIGH); } - for (int axis = 2; axis < 3; axis++) // Z axis + for (uint8_t axis = 2; axis < 3; axis++) // Z axis { tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -183,7 +183,7 @@ void tmc2130_init() tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); #endif //TMC2130_STEALTH_Z } - for (int axis = 3; axis < 4; axis++) // E axis + for (uint8_t axis = 3; axis < 4; axis++) // E axis { tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -383,7 +383,7 @@ void tmc2130_check_overtemp() static uint32_t checktime = 0; if (_millis() - checktime > 1000 ) { - for (int i = 0; i < 4; i++) + for (uint8_t i = 0; i < 4; i++) { uint32_t drv_status = 0; skip_debug_msg = true; @@ -392,7 +392,7 @@ void tmc2130_check_overtemp() { // BIT 26 - over temp prewarning ~120C (+-20C) SERIAL_ERRORRPGM(MSG_TMC_OVERTEMP); SERIAL_ECHOLN(i); - for (int j = 0; j < 4; j++) + for (uint8_t j = 0; j < 4; j++) tmc2130_wr(j, TMC2130_REG_CHOPCONF, 0x00010000); kill(MSG_TMC_OVERTEMP); } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index be4b1537..c19555d5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -317,7 +317,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longF char c; int enc_dif = lcd_encoder_diff; uint8_t n = LCD_WIDTH - 1; - for(int g = 0; g<4;g++){ + for(uint8_t g = 0; g<4;g++){ lcd_set_cursor(0, g); lcd_print(' '); } @@ -2578,11 +2578,11 @@ void lcd_change_success() { static void lcd_loading_progress_bar(uint16_t loading_time_ms) { - for (int i = 0; i < 20; i++) { + for (uint8_t i = 0; i < 20; i++) { lcd_set_cursor(i, 3); lcd_print("."); //loading_time_ms/20 delay - for (int j = 0; j < 5; j++) { + for (uint8_t j = 0; j < 5; j++) { delay_keep_alive(loading_time_ms / 100); } } @@ -3024,7 +3024,7 @@ static void lcd_menu_xyz_offset() float cntr[2]; world2machine_read_valid(vec_x, vec_y, cntr); - for (int i = 0; i < 2; i++) + for (uint8_t i = 0; i < 2; i++) { lcd_puts_at_P(11, i + 2, PSTR("")); lcd_print(cntr[i]); @@ -4692,7 +4692,7 @@ void lcd_v2_calibration() else { lcd_display_message_fullscreen_P(_i("Please load PLA filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 lcd_consume_click(); - for (int i = 0; i < 20; i++) { //wait max. 2s + for (uint8_t i = 0; i < 20; i++) { //wait max. 2s delay_keep_alive(100); if (lcd_clicked()) { break; @@ -5419,7 +5419,7 @@ void bowden_menu() { lcd_clear(); lcd_set_cursor(0, 0); lcd_print(">"); - for (int i = 0; i < 4; i++) { + for (uint8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print("Extruder "); lcd_print(i); @@ -5507,7 +5507,7 @@ void bowden_menu() { enc_dif = lcd_encoder_diff; lcd_set_cursor(0, cursor_pos); lcd_print(">"); - for (int i = 0; i < 4; i++) { + for (uint8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print("Extruder "); lcd_print(i); @@ -5634,14 +5634,14 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (header) lcd_puts_at_P(0,0,header); const bool last_visible = (first == items_no - 3); - const int8_t ordinary_items = (last_item&&last_visible)?2:3; + const uint8_t ordinary_items = (last_item&&last_visible)?2:3; - for (int i = 0; i < ordinary_items; i++) + for (uint8_t i = 0; i < ordinary_items; i++) { if (item) lcd_puts_at_P(1, i + 1, item); } - for (int i = 0; i < ordinary_items; i++) + for (uint8_t i = 0; i < ordinary_items; i++) { lcd_set_cursor(2 + item_len, i+1); lcd_print(first + i + 1); @@ -5695,7 +5695,7 @@ char reset_menu() { lcd_consume_click(); while (1) { - for (int i = 0; i < 4; i++) { + for (uint8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print(item[first + i]); } @@ -6021,7 +6021,7 @@ unsigned char lcd_choose_color() { item[0] = "Orange"; item[1] = "Black"; //----------------------------------------------------- - unsigned char active_rows; + uint8_t active_rows; static int first = 0; int enc_dif = 0; unsigned char cursor_pos = 1; @@ -6034,7 +6034,7 @@ unsigned char lcd_choose_color() { lcd_consume_click(); while (1) { lcd_puts_at_P(0, 0, PSTR("Choose color:")); - for (int i = 0; i < active_rows; i++) { + for (uint8_t i = 0; i < active_rows; i++) { lcd_set_cursor(1, i+1); lcd_print(item[first + i]); } @@ -7071,7 +7071,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { //end of second measurement, now check for possible errors: - for(int i = 0; i < 2; i++){ //check if measured axis length corresponds to expected length + for(uint8_t i = 0; i < 2; i++){ //check if measured axis length corresponds to expected length printf_P(_N("Measured axis length:%.3f\n"), measured_axis_length[i]); if (abs(measured_axis_length[i] - axis_length) > max_error_mm) { enable_endstops(false); @@ -7935,7 +7935,7 @@ static void menu_action_sdfile(const char* filename) const char end[5] = ".gco"; //we are storing just first 8 characters of 8.3 filename assuming that extension is always ".gco" - for (int i = 0; i < 8; i++) { + for (uint8_t i = 0; i < 8; i++) { if (strcmp((cmd + i + 4), end) == 0) { //filename is shorter then 8.3, store '\0' character on position where ".gco" string was found to terminate stored string properly eeprom_write_byte((uint8_t*)EEPROM_FILENAME + i, '\0'); @@ -7950,7 +7950,7 @@ static void menu_action_sdfile(const char* filename) eeprom_write_byte((uint8_t*)EEPROM_DIR_DEPTH, depth); for (uint8_t i = 0; i < depth; i++) { - for (int j = 0; j < 8; j++) { + for (uint8_t j = 0; j < 8; j++) { eeprom_write_byte((uint8_t*)EEPROM_DIRS + j + 8 * i, dir_names[i][j]); } } From 49f172a7b9fd2ea71425122b5acf2df4679e1ec9 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Wed, 12 Jun 2019 15:01:57 +0200 Subject: [PATCH 168/168] Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable. --- Firmware/temperature.cpp | 2 +- Firmware/tmc2130.cpp | 10 +++++----- Firmware/ultralcd.cpp | 34 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 03845b12..08d1a55b 100755 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -434,7 +434,7 @@ static void temp_runaway_stop(bool isPreheat, bool isBed); void updatePID() { #ifdef PIDTEMP - for(uint8_t e = 0; e < EXTRUDERS; e++) { + for(uint_least8_t e = 0; e < EXTRUDERS; e++) { iState_sum_max[e] = PID_INTEGRAL_DRIVE_MAX / cs.Ki; } #endif diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp index fe04e8da..7bfd9708 100755 --- a/Firmware/tmc2130.cpp +++ b/Firmware/tmc2130.cpp @@ -158,7 +158,7 @@ void tmc2130_init() SET_INPUT(Y_TMC2130_DIAG); SET_INPUT(Z_TMC2130_DIAG); SET_INPUT(E0_TMC2130_DIAG); - for (uint8_t axis = 0; axis < 2; axis++) // X Y axes + for (uint_least8_t axis = 0; axis < 2; axis++) // X Y axes { tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -169,7 +169,7 @@ void tmc2130_init() tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); //tmc2130_wr_THIGH(axis, TMC2130_THIGH); } - for (uint8_t axis = 2; axis < 3; axis++) // Z axis + for (uint_least8_t axis = 2; axis < 3; axis++) // Z axis { tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -183,7 +183,7 @@ void tmc2130_init() tmc2130_wr_TPWMTHRS(axis, TMC2130_TPWMTHRS); #endif //TMC2130_STEALTH_Z } - for (uint8_t axis = 3; axis < 4; axis++) // E axis + for (uint_least8_t axis = 3; axis < 4; axis++) // E axis { tmc2130_setup_chopper(axis, tmc2130_mres[axis], tmc2130_current_h[axis], tmc2130_current_r[axis]); tmc2130_wr(axis, TMC2130_REG_TPOWERDOWN, 0x00000000); @@ -383,7 +383,7 @@ void tmc2130_check_overtemp() static uint32_t checktime = 0; if (_millis() - checktime > 1000 ) { - for (uint8_t i = 0; i < 4; i++) + for (uint_least8_t i = 0; i < 4; i++) { uint32_t drv_status = 0; skip_debug_msg = true; @@ -392,7 +392,7 @@ void tmc2130_check_overtemp() { // BIT 26 - over temp prewarning ~120C (+-20C) SERIAL_ERRORRPGM(MSG_TMC_OVERTEMP); SERIAL_ECHOLN(i); - for (uint8_t j = 0; j < 4; j++) + for (uint_least8_t j = 0; j < 4; j++) tmc2130_wr(j, TMC2130_REG_CHOPCONF, 0x00010000); kill(MSG_TMC_OVERTEMP); } diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c19555d5..c22b9581 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -317,7 +317,7 @@ static void lcd_implementation_drawmenu_sdfile_selected(uint8_t row, char* longF char c; int enc_dif = lcd_encoder_diff; uint8_t n = LCD_WIDTH - 1; - for(uint8_t g = 0; g<4;g++){ + for(uint_least8_t g = 0; g<4;g++){ lcd_set_cursor(0, g); lcd_print(' '); } @@ -2578,11 +2578,11 @@ void lcd_change_success() { static void lcd_loading_progress_bar(uint16_t loading_time_ms) { - for (uint8_t i = 0; i < 20; i++) { + for (uint_least8_t i = 0; i < 20; i++) { lcd_set_cursor(i, 3); lcd_print("."); //loading_time_ms/20 delay - for (uint8_t j = 0; j < 5; j++) { + for (uint_least8_t j = 0; j < 5; j++) { delay_keep_alive(loading_time_ms / 100); } } @@ -3024,7 +3024,7 @@ static void lcd_menu_xyz_offset() float cntr[2]; world2machine_read_valid(vec_x, vec_y, cntr); - for (uint8_t i = 0; i < 2; i++) + for (uint_least8_t i = 0; i < 2; i++) { lcd_puts_at_P(11, i + 2, PSTR("")); lcd_print(cntr[i]); @@ -4692,7 +4692,7 @@ void lcd_v2_calibration() else { lcd_display_message_fullscreen_P(_i("Please load PLA filament first."));////MSG_PLEASE_LOAD_PLA c=20 r=4 lcd_consume_click(); - for (uint8_t i = 0; i < 20; i++) { //wait max. 2s + for (uint_least8_t i = 0; i < 20; i++) { //wait max. 2s delay_keep_alive(100); if (lcd_clicked()) { break; @@ -5419,7 +5419,7 @@ void bowden_menu() { lcd_clear(); lcd_set_cursor(0, 0); lcd_print(">"); - for (uint8_t i = 0; i < 4; i++) { + for (uint_least8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print("Extruder "); lcd_print(i); @@ -5507,7 +5507,7 @@ void bowden_menu() { enc_dif = lcd_encoder_diff; lcd_set_cursor(0, cursor_pos); lcd_print(">"); - for (uint8_t i = 0; i < 4; i++) { + for (uint_least8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print("Extruder "); lcd_print(i); @@ -5634,14 +5634,14 @@ uint8_t choose_menu_P(const char *header, const char *item, const char *last_ite if (header) lcd_puts_at_P(0,0,header); const bool last_visible = (first == items_no - 3); - const uint8_t ordinary_items = (last_item&&last_visible)?2:3; + const uint_least8_t ordinary_items = (last_item&&last_visible)?2:3; - for (uint8_t i = 0; i < ordinary_items; i++) + for (uint_least8_t i = 0; i < ordinary_items; i++) { if (item) lcd_puts_at_P(1, i + 1, item); } - for (uint8_t i = 0; i < ordinary_items; i++) + for (uint_least8_t i = 0; i < ordinary_items; i++) { lcd_set_cursor(2 + item_len, i+1); lcd_print(first + i + 1); @@ -5695,7 +5695,7 @@ char reset_menu() { lcd_consume_click(); while (1) { - for (uint8_t i = 0; i < 4; i++) { + for (uint_least8_t i = 0; i < 4; i++) { lcd_set_cursor(1, i); lcd_print(item[first + i]); } @@ -6021,7 +6021,7 @@ unsigned char lcd_choose_color() { item[0] = "Orange"; item[1] = "Black"; //----------------------------------------------------- - uint8_t active_rows; + uint_least8_t active_rows; static int first = 0; int enc_dif = 0; unsigned char cursor_pos = 1; @@ -6034,7 +6034,7 @@ unsigned char lcd_choose_color() { lcd_consume_click(); while (1) { lcd_puts_at_P(0, 0, PSTR("Choose color:")); - for (uint8_t i = 0; i < active_rows; i++) { + for (uint_least8_t i = 0; i < active_rows; i++) { lcd_set_cursor(1, i+1); lcd_print(item[first + i]); } @@ -7071,7 +7071,7 @@ static bool lcd_selfcheck_axis_sg(unsigned char axis) { //end of second measurement, now check for possible errors: - for(uint8_t i = 0; i < 2; i++){ //check if measured axis length corresponds to expected length + for(uint_least8_t i = 0; i < 2; i++){ //check if measured axis length corresponds to expected length printf_P(_N("Measured axis length:%.3f\n"), measured_axis_length[i]); if (abs(measured_axis_length[i] - axis_length) > max_error_mm) { enable_endstops(false); @@ -7935,7 +7935,7 @@ static void menu_action_sdfile(const char* filename) const char end[5] = ".gco"; //we are storing just first 8 characters of 8.3 filename assuming that extension is always ".gco" - for (uint8_t i = 0; i < 8; i++) { + for (uint_least8_t i = 0; i < 8; i++) { if (strcmp((cmd + i + 4), end) == 0) { //filename is shorter then 8.3, store '\0' character on position where ".gco" string was found to terminate stored string properly eeprom_write_byte((uint8_t*)EEPROM_FILENAME + i, '\0'); @@ -7949,8 +7949,8 @@ static void menu_action_sdfile(const char* filename) uint8_t depth = (uint8_t)card.getWorkDirDepth(); eeprom_write_byte((uint8_t*)EEPROM_DIR_DEPTH, depth); - for (uint8_t i = 0; i < depth; i++) { - for (uint8_t j = 0; j < 8; j++) { + for (uint_least8_t i = 0; i < depth; i++) { + for (uint_least8_t j = 0; j < 8; j++) { eeprom_write_byte((uint8_t*)EEPROM_DIRS + j + 8 * i, dir_names[i][j]); } }