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

Merge pull request #845 from PavelSindler/crash_movements

Browse source 
crash detection fix for absolute E coordinates
This commit is contained in:
XPila 2018-06-19 18:46:39 +02:00 committed by GitHub
commit 2be36f626f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Firmware/Marlin_main.cpp
View file

@ -528,6 +528,7 @@ static float saved_pos[4] = { 0, 0, 0, 0 };
static float saved_feedrate2 = 0; static float saved_feedrate2 = 0;
static uint8_t saved_active_extruder = 0; static uint8_t saved_active_extruder = 0;
static bool saved_extruder_under_pressure = false; static bool saved_extruder_under_pressure = false;
static bool saved_extruder_relative_mode = false;
//=========================================================================== //===========================================================================
//=============================Routines====================================== //=============================Routines======================================
@ -663,12 +664,12 @@ void crashdet_disable()
void crashdet_stop_and_save_print() void crashdet_stop_and_save_print()
{ {
stop_and_save_print_to_ram(10, -2); //XY - no change, Z 10mm up, E -2mm retract stop_and_save_print_to_ram(10, -DEFAULT_RETRACTION); //XY - no change, Z 10mm up, E -1mm retract
} }
void crashdet_restore_print_and_continue() void crashdet_restore_print_and_continue()
{ {
restore_print_from_ram_and_continue(2); //XYZ = orig, E +2mm unretract restore_print_from_ram_and_continue(DEFAULT_RETRACTION); //XYZ = orig, E +1mm unretract
// babystep_apply(); // babystep_apply();
} }
@ -8826,7 +8827,6 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
MYSERIAL.println(cmdbuffer + _bufindr + CMDHDRSIZE); MYSERIAL.println(cmdbuffer + _bufindr + CMDHDRSIZE);
SERIAL_ECHOPGM("Buffer line (from file): "); SERIAL_ECHOPGM("Buffer line (from file): ");
MYSERIAL.print(int(iline), DEC);
MYSERIAL.println(int(iline), DEC); MYSERIAL.println(int(iline), DEC);
for (; sdlen_single.value > 0; -- sdlen_single.value) for (; sdlen_single.value > 0; -- sdlen_single.value)
MYSERIAL.print(char(card.get())); MYSERIAL.print(char(card.get()));
@ -8873,10 +8873,17 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
char buf[48]; char buf[48];
// First unretract (relative extrusion) // First unretract (relative extrusion)
saved_extruder_relative_mode = axis_relative_modes[E_AXIS];
if(!saved_extruder_relative_mode){
strcpy_P(buf, PSTR("M83"));
enquecommand(buf, false);
}
//retract 45mm/s
strcpy_P(buf, PSTR("G1 E")); strcpy_P(buf, PSTR("G1 E"));
dtostrf(e_move, 6, 3, buf + strlen(buf)); dtostrf(e_move, 6, 3, buf + strlen(buf));
strcat_P(buf, PSTR(" F")); strcat_P(buf, PSTR(" F"));
dtostrf(retract_feedrate*60, 8, 3, buf + strlen(buf)); dtostrf(2700, 8, 3, buf + strlen(buf));
enquecommand(buf, false); enquecommand(buf, false);
// Then lift Z axis // Then lift Z axis
@ -8905,10 +8912,19 @@ void restore_print_from_ram_and_continue(float e_move)
// current_position[axis] = st_get_position_mm(axis); // current_position[axis] = st_get_position_mm(axis);
active_extruder = saved_active_extruder; //restore active_extruder active_extruder = saved_active_extruder; //restore active_extruder
feedrate = saved_feedrate2; //restore feedrate feedrate = saved_feedrate2; //restore feedrate
axis_relative_modes[E_AXIS] = saved_extruder_relative_mode;
float e = saved_pos[E_AXIS] - e_move; float e = saved_pos[E_AXIS] - e_move;
plan_set_e_position(e); plan_set_e_position(e);
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS], homing_feedrate[Z_AXIS]/13, active_extruder); //first move print head in XY to the saved position:
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], current_position[Z_AXIS], saved_pos[E_AXIS] - e_move, homing_feedrate[Z_AXIS]/13, active_extruder);
st_synchronize(); st_synchronize();
//then move Z
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS] - e_move, homing_feedrate[Z_AXIS]/13, active_extruder);
st_synchronize();
//and finaly unretract (35mm/s)
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS], 35, active_extruder);
st_synchronize();
memcpy(current_position, saved_pos, sizeof(saved_pos)); memcpy(current_position, saved_pos, sizeof(saved_pos));
memcpy(destination, current_position, sizeof(destination)); memcpy(destination, current_position, sizeof(destination));
if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing
@ -8918,6 +8934,7 @@ void restore_print_from_ram_and_continue(float e_move)
} }
else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing
gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing
serial_count = 0;
FlushSerialRequestResend(); FlushSerialRequestResend();
} }
else { else {

3
Firmware/cmdqueue.cpp
View file

@ -385,7 +385,8 @@ void get_command()
rx_buffer_full = true; //sets flag that buffer was full rx_buffer_full = true; //sets flag that buffer was full
} }
while (MYSERIAL.available() > 0) { // start of serial line processing loop
while (MYSERIAL.available() > 0 && !saved_printing) { //is print is saved (crash detection or filament detection), dont process data from serial line
char serial_char = MYSERIAL.read(); char serial_char = MYSERIAL.read();
/* if (selectedSerialPort == 1) /* if (selectedSerialPort == 1)