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

PFW-1386 Optimise default value assign z_target

This commit is contained in:
Guðni Már Gilbert 2022-08-27 16:07:24 +00:00 committed by D.R.racer
parent 20c865c2d4
commit 3192a95e78
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Firmware/Marlin_main.cpp
View File

@ -8587,6 +8587,7 @@ Sigma_Exit:
{ {
uint8_t mmuSlotIndex = 0xffU; uint8_t mmuSlotIndex = 0xffU;
float fastLoadLength = FILAMENTCHANGE_FIRSTFEED; // Only used without MMU float fastLoadLength = FILAMENTCHANGE_FIRSTFEED; // Only used without MMU
float z_target = MIN_Z_FOR_LOAD;
if( MMU2::mmu2.Enabled() ) if( MMU2::mmu2.Enabled() )
{ {
if( code_seen('P') || code_seen('T') ) { if( code_seen('P') || code_seen('T') ) {
@ -8602,11 +8603,11 @@ Sigma_Exit:
enable_z(); enable_z();
if (code_seen('Z')) if (code_seen('Z'))
{ {
float z_target = code_value(); z_target = code_value();
raise_z_above(z_target, false);
} else {
raise_z_above(MIN_Z_FOR_LOAD, false);
} }
// Raise the Z axis
raise_z_above(z_target, false);
disable_z(); disable_z();
gcode_M701(fastLoadLength, mmuSlotIndex); gcode_M701(fastLoadLength, mmuSlotIndex);
@ -8625,6 +8626,7 @@ Sigma_Exit:
*/ */
case 702: case 702:
{ {
float z_target = MIN_Z_FOR_UNLOAD;
float unloadLength = FILAMENTCHANGE_FINALRETRACT; float unloadLength = FILAMENTCHANGE_FINALRETRACT;
if (code_seen('U')) { if (code_seen('U')) {
unloadLength = code_value(); unloadLength = code_value();
@ -8632,12 +8634,12 @@ Sigma_Exit:
if (code_seen('Z')) if (code_seen('Z'))
{ {
float z_target = code_value(); z_target = code_value();
raise_z_above(z_target, false);
} else {
raise_z_above(MIN_Z_FOR_UNLOAD, false);
} }
// Raise the Z axis
raise_z_above(z_target, false);
if (MMU2::mmu2.Enabled()) { if (MMU2::mmu2.Enabled()) {
MMU2::mmu2.unload(); MMU2::mmu2.unload();
} else { } else {