Преглед изворни кода

updated z recovery in power panic, added test to main menu

PavelSindler пре 7 година
родитељ
комит
c9d7b65c02
2 измењених фајлова са 8 додато и 8 уклоњено
  1. 4 8
      Firmware/Marlin_main.cpp
  2. 4 0
      Firmware/ultralcd.cpp

+ 4 - 8
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"));

+ 4 - 0
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 )
     {