Browse Source

Merge pull request #113 from PavelSindler/wizard

dont show temp cal message, dont save uvlo flag to eeprom if printing…
PavelSindler 7 years ago
parent
commit
016fa409eb
2 changed files with 4 additions and 3 deletions
  1. 3 2
      Firmware/Marlin_main.cpp
  2. 1 1
      Firmware/fsensor.cpp

+ 3 - 2
Firmware/Marlin_main.cpp

@@ -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");

+ 1 - 1
Firmware/fsensor.cpp

@@ -22,7 +22,7 @@ extern int8_t FSensorStateMenu;
 
 
 void fsensor_stop_and_save_print()
 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()
 void fsensor_restore_print_and_continue()