3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dont show temp cal message, dont save uvlo flag to eeprom if printing from USB

Browse source
This commit is contained in:
PavelSindler 2017-11-27 18:30:16 +01:00
parent ddc8587bbd
commit 211725c946
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View file

@ -1121,7 +1121,7 @@ void setup()
lcd_update_enable(true); lcd_update_enable(true);
} }
else if (calibration_status() == CALIBRATION_STATUS_CALIBRATED && temp_cal_active == true && calibration_status_pinda() == false) { 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); lcd_update_enable(true);
} }
else if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION) { else if (calibration_status() == CALIBRATION_STATUS_Z_CALIBRATION) {
@ -7045,6 +7045,7 @@ extern uint32_t sdpos_atomic;
void uvlo_() void uvlo_()
{ {
unsigned long time_start = millis(); unsigned long time_start = millis();
bool sd_print = card.sdprinting;
// Conserve power as soon as possible. // Conserve power as soon as possible.
disable_x(); disable_x();
disable_y(); 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_TARGET_BED, target_temperature_bed);
eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed); eeprom_update_byte((uint8_t*)EEPROM_UVLO_FAN_SPEED, fanSpeed);
// Finaly store the "power outage" flag. // 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(); st_synchronize();
SERIAL_ECHOPGM("stps"); SERIAL_ECHOPGM("stps");