From c9d7b65c0229e6b28f8dd4d0ddde793621e1f90e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 6 Jul 2017 19:09:06 +0200 Subject: [PATCH] updated z recovery in power panic, added test to main menu --- Firmware/Marlin_main.cpp | 12 ++++-------- Firmware/ultralcd.cpp | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 05bcd3284..9a79c2cf0 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6917,17 +6917,12 @@ void recover_print() { float z_pos = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)); z_pos = z_pos + UVLO_Z_AXIS_SHIFT; + current_position[Z_AXIS] = z_pos; + plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); - SERIAL_ECHOPGM("Target temperature:"); - MYSERIAL.println(target_temperature[0]); - SERIAL_ECHOPGM("Target temp bed:"); - MYSERIAL.println(target_temperature_bed); enquecommand_P(PSTR("G28 X")); enquecommand_P(PSTR("G28 Y")); - strcpy(cmd, "G92 Z"); - strcat(cmd, ftostr43(z_pos)); - enquecommand(cmd); eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); while ((abs(degHotend(0)- target_temperature[0])>5) || (abs(degBed() -target_temperature_bed)>3)) { //wait for heater and bed to reach target temp @@ -6973,6 +6968,7 @@ void restore_print_from_eeprom() { uint32_t position = eeprom_read_dword((uint32_t*)(EEPROM_FILE_POSITION)); SERIAL_ECHOPGM("Position read from eeprom:"); MYSERIAL.println(position); + enquecommand_P(PSTR("M24")); //M24 - Start SD print sprintf_P(cmd, PSTR("M26 S%lu"), position); @@ -6984,7 +6980,7 @@ void restore_print_from_eeprom() { strcat(cmd, ftostr32(y_rec)); enquecommand(cmd); strcpy(cmd, "G1 Z"); - strcat(cmd, ftostr43(z_pos)); + strcat(cmd, ftostr32(z_pos)); enquecommand(cmd); enquecommand_P(PSTR("G1 E" STRINGIFY(DEFAULT_RETRACTION)" F480")); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 715fd3219..d2b0df4ab 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3694,7 +3694,11 @@ static void lcd_main_menu() MENU_ITEM(back, MSG_WATCH, lcd_status_screen); + +#ifdef TMC2130_DEBUG MENU_ITEM(function, PSTR("recover print"), recover_print); + MENU_ITEM(function, PSTR("power panic"), uvlo_); +#endif //TMC2130_DEBUG /* if (farm_mode && !IS_SD_PRINTING ) {