From 211725c9469636c9012dfc260b464682431b9dbb Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 18:30:16 +0100 Subject: [PATCH] dont show temp cal message, dont save uvlo flag to eeprom if printing from USB --- Firmware/Marlin_main.cpp | 5 +++-- Firmware/fsensor.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 08cca873..b8c6083c 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1121,7 +1121,7 @@ void setup() lcd_update_enable(true); } else if (calibration_status() == CALIBRATION_STATUS_CALIBRATED && temp_cal_active == true && calibration_status_pinda() == false) { - lcd_show_fullscreen_message_and_wait_P(MSG_PINDA_NOT_CALIBRATED); + //lcd_show_fullscreen_message_and_wait_P(MSG_PINDA_NOT_CALIBRATED); lcd_update_enable(true); } else if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION) { @@ -7045,6 +7045,7 @@ extern uint32_t sdpos_atomic; void uvlo_() { unsigned long time_start = millis(); + bool sd_print = card.sdprinting; // Conserve power as soon as possible. disable_x(); disable_y(); @@ -7127,7 +7128,7 @@ void uvlo_() eeprom_update_byte((uint8_t*)EEPROM_UVLO_TARGET_BED, target_temperature_bed); eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); // Finaly store the "power outage" flag. - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); + if(sd_print) eeprom_update_byte((uint8_t*)EEPROM_UVLO, 1); st_synchronize(); SERIAL_ECHOPGM("stps"); diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 0938bb4b..5d304a58 100644 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -22,7 +22,7 @@ extern int8_t FSensorStateMenu; void fsensor_stop_and_save_print() { - stop_and_save_print_to_ram(0, 0); //XYZE - no change + stop_and_save_print_to_ram(0, 0); //XYZE - no change } void fsensor_restore_print_and_continue()