From bd554df02e2ea7db2539742a3f528b0f0358400a Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Thu, 8 Nov 2018 03:54:05 +0100 Subject: [PATCH 1/2] MeshBed Levelling Fail IV --- Firmware/Marlin_main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4be98cb2..8a012745 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -332,7 +332,6 @@ bool wizard_active = false; //autoload temporarily disabled during wizard //=========================================================================== //=============================Private Variables============================= //=========================================================================== -#define MSG_BED_LEVELING_FAILED "Some problem encountered, Z-leveling enforced ..." #define MSG_BED_LEVELING_FAILED_TIMEOUT 30 const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'}; @@ -4500,7 +4499,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeSound(e_SOUND_TYPE_StandardAlert); bool bState; do { // repeat until Z-leveling o.k. - lcd_display_message_fullscreen_P(_i(MSG_BED_LEVELING_FAILED)); + lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ...")); #ifdef TMC2130 lcd_wait_for_click_delay(MSG_BED_LEVELING_FAILED_TIMEOUT); calibrate_z_auto(); // Z-leveling (X-assembly stay up!!!) @@ -4515,6 +4514,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) st_synchronize(); enable_z_endstop(bState); } while (st_get_position_mm(Z_AXIS) > MESH_HOME_Z_SEARCH); // i.e. Z-leveling not o.k. +// plan_set_z_position(MESH_HOME_Z_SEARCH); // is not necessary ('do-while' loop always ends at the expected Z-position) custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery gcode_G28(true, true, false); // X & Y-homing (must be after Z-homing (problem with spool-holder)!) From ccb58ae7c9a40e1c26078750f271918d8a9baff1 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Thu, 8 Nov 2018 04:02:32 +0100 Subject: [PATCH 2/2] Revert "MeshBed Levelling Fail IV" This reverts commit bd554df02e2ea7db2539742a3f528b0f0358400a. --- 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 8a012745..0c188bf1 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4499,7 +4499,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE)) Sound_MakeSound(e_SOUND_TYPE_StandardAlert); bool bState; do { // repeat until Z-leveling o.k. - lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ...")); + lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-levelling enforced ...")); #ifdef TMC2130 lcd_wait_for_click_delay(MSG_BED_LEVELING_FAILED_TIMEOUT); calibrate_z_auto(); // Z-leveling (X-assembly stay up!!!)