From 49f56b34c8005ce097b5d449f6b7d118a6265389 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 20 Mar 2018 19:02:26 +0100 Subject: [PATCH 1/5] auto home and mesh bed calibration points corrected --- Firmware/mesh_bed_calibration.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 8db94cd42..6fae166dc 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -63,17 +63,17 @@ const float bed_ref_points_4[] PROGMEM = { }; const float bed_ref_points[] PROGMEM = { - 13.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, + 13.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y, - 13.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 106.4f - 4.f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 106.4f - 4.f - BED_ZERO_REF_Y, + 13.f - BED_ZERO_REF_X, 106.4f - 4.f - BED_ZERO_REF_Y, - 13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y + 13.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y }; #else From b75ca49cdced4a8c771837035fbc43143113f1d7 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 20 Mar 2018 20:01:36 +0100 Subject: [PATCH 2/5] reverted --- Firmware/mesh_bed_calibration.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 6fae166dc..8db94cd42 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -63,17 +63,17 @@ const float bed_ref_points_4[] PROGMEM = { }; const float bed_ref_points[] PROGMEM = { - 13.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, + 13.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 106.4f - 4.f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 106.4f - 4.f - BED_ZERO_REF_Y, - 13.f - BED_ZERO_REF_X, 106.4f - 4.f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y, + 13.f - BED_ZERO_REF_X, 106.4f - BED_ZERO_REF_Y, - 13.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y, - 115.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y, - 216.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y + 13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y, + 115.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y, + 216.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y }; #else From c43062b661f76cccf81b1854ec0c8332a4b8ce4b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 20 Mar 2018 20:41:13 +0100 Subject: [PATCH 3/5] make space for removing steel sheet --- Firmware/Configuration.h | 2 +- Firmware/Marlin_main.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 05cf99692..238439a5a 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -7,7 +7,7 @@ #define STR(x) STR_HELPER(x) // Firmware version -#define FW_VERSION "3.1.3" +#define FW_VERSION "3.1.3-RC2" #define FW_COMMIT_NR 301 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol. diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a7240bf5c..70b77f680 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3229,7 +3229,8 @@ void process_commands() #ifdef PINDA_THERMISTOR if (true) { - if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])) { + if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])) + { // We don't know where we are! HOME! // Push the commands to the front of the message queue in the reverse order! // There shall be always enough space reserved for these commands. @@ -3239,7 +3240,14 @@ void process_commands() } lcd_show_fullscreen_message_and_wait_P(MSG_TEMP_CAL_WARNING); bool result = lcd_show_fullscreen_message_yes_no_and_wait_P(MSG_STEEL_SHEET_CHECK, false, false); - if (result) lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET); + if (result) + { + current_position[Z_AXIS] = 50; + current_position[Y_AXIS] = 190; + plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder); + st_synchronize(); + lcd_show_fullscreen_message_and_wait_P(MSG_REMOVE_STEEL_SHEET); + } lcd_update_enable(true); KEEPALIVE_STATE(NOT_BUSY); //no need to print busy messages as we print current temperatures periodicaly SERIAL_ECHOLNPGM("PINDA probe calibration start"); From b0fc0039f0c2670e191856f4486b2172e97d45fe Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 20 Mar 2018 21:18:19 +0100 Subject: [PATCH 4/5] mesh bed leveling / auto home Y coordinates updated --- Firmware/mesh_bed_calibration.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Firmware/mesh_bed_calibration.cpp b/Firmware/mesh_bed_calibration.cpp index 8db94cd42..322acbef1 100644 --- a/Firmware/mesh_bed_calibration.cpp +++ b/Firmware/mesh_bed_calibration.cpp @@ -20,7 +20,7 @@ float world2machine_shift[2]; #define WEIGHT_FIRST_ROW_Y_LOW (0.0f) #define BED_ZERO_REF_X (- 22.f + X_PROBE_OFFSET_FROM_EXTRUDER) // -22 + 23 = 1 -#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER) // -0.6 + 5 = 4.4 +#define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER + 4) // -0.6 + 5 = 4.4 // Scaling of the real machine axes against the programmed dimensions in the firmware. // The correction is tiny, here around 0.5mm on 250mm length. @@ -56,10 +56,10 @@ const float bed_skew_angle_extreme = (0.25f * M_PI / 180.f); // Positions of the bed reference points in the machine coordinates, referenced to the P.I.N.D.A sensor. // The points are the following: center front, center right, center rear, center left. const float bed_ref_points_4[] PROGMEM = { - 13.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, - 221.f - BED_ZERO_REF_X, 10.4f - 4.f - BED_ZERO_REF_Y, - 221.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y, - 13.f - BED_ZERO_REF_X, 202.4f - 4.f - BED_ZERO_REF_Y + 13.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, + 221.f - BED_ZERO_REF_X, 10.4f - BED_ZERO_REF_Y, + 221.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y, + 13.f - BED_ZERO_REF_X, 202.4f - BED_ZERO_REF_Y }; const float bed_ref_points[] PROGMEM = { From b15fec6d4c30d0547562da032c3f80bc20582752 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 20 Mar 2018 21:20:10 +0100 Subject: [PATCH 5/5] version --- Firmware/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 238439a5a..05cf99692 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -7,7 +7,7 @@ #define STR(x) STR_HELPER(x) // Firmware version -#define FW_VERSION "3.1.3-RC2" +#define FW_VERSION "3.1.3" #define FW_COMMIT_NR 301 // FW_VERSION_UNKNOWN means this is an unofficial build. // The firmware should only be checked into github with this symbol.