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

Do not enqueue a E/Z moves unless requested

Browse Source 
Do not unconditionally enqueue a Z move if no move has been requested.
Since Z is calculated using the absolute current (saved) position and
scheduled for later execution, the queue order becomes relevant.
This commit is contained in:
Yuri D'Elia 2019-12-30 14:49:07 +01:00
parent 0cc68228f8
commit 5660fcffb0
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Firmware/Marlin_main.cpp
View File

@ -10238,23 +10238,29 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
// move away from the print. // move away from the print.
char buf[48]; char buf[48];
// First unretract (relative extrusion) if(e_move)
if(!saved_extruder_relative_mode){ {
enquecommand(PSTR("M83"), true); // First unretract (relative extrusion)
} if(!saved_extruder_relative_mode){
//retract 45mm/s enquecommand(PSTR("M83"), true);
// A single sprintf may not be faster, but is definitely 20B shorter }
// than a sequence of commands building the string piece by piece //retract 45mm/s
// A snprintf would have been a safer call, but since it is not used // A single sprintf may not be faster, but is definitely 20B shorter
// in the whole program, its implementation would bring more bytes to the total size // than a sequence of commands building the string piece by piece
// The behavior of dtostrf 8,3 should be roughly the same as %-0.3 // A snprintf would have been a safer call, but since it is not used
sprintf_P(buf, PSTR("G1 E%-0.3f F2700"), e_move); // in the whole program, its implementation would bring more bytes to the total size
enquecommand(buf, false); // The behavior of dtostrf 8,3 should be roughly the same as %-0.3
sprintf_P(buf, PSTR("G1 E%-0.3f F2700"), e_move);
enquecommand(buf, false);
}
if(z_move)
{
// Then lift Z axis
sprintf_P(buf, PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]);
enquecommand(buf, false);
}
// Then lift Z axis
sprintf_P(buf, PSTR("G1 Z%-0.3f F%-0.3f"), saved_pos[Z_AXIS] + z_move, homing_feedrate[Z_AXIS]);
// At this point the command queue is empty.
enquecommand(buf, false);
// If this call is invoked from the main Arduino loop() function, let the caller know that the command // If this call is invoked from the main Arduino loop() function, let the caller know that the command
// in the command queue is not the original command, but a new one, so it should not be removed from the queue. // in the command queue is not the original command, but a new one, so it should not be removed from the queue.
repeatcommand_front(); repeatcommand_front();