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

Cleanup M600 init 

Instead of removing FILAMENTCHANGE_FINALRETRACT
just set it to 0

No change in memory
This commit is contained in:
Guðni Már Gilbert 2023-05-06 14:53:36 +00:00
parent 8556336185
commit 71180ac284
9 changed files with 33 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Firmware/Marlin_main.cpp
View File

@ -3456,7 +3456,7 @@ static void mmu_M600_load_filament(bool automatic, float nozzle_temp) {
st_synchronize(); st_synchronize();
} }
static void gcode_M600(bool automatic, float x_position, float y_position, float z_shift, float e_shift, float e_shift_late) { static void gcode_M600(const bool automatic, const float x_position, const float y_position, const float z_shift, const float e_shift, const float e_shift_late) {
st_synchronize(); st_synchronize();
float lastpos[4]; float lastpos[4];
@ -7582,69 +7582,40 @@ Sigma_Exit:
M600 [ X | Y | Z | E | L | AUTO ] M600 [ X | Y | Z | E | L | AUTO ]
- `X` - X position, default 211 - `X` - X position, default FILAMENTCHANGE_XPOS
- `Y` - Y position, default 0 - `Y` - Y position, default FILAMENTCHANGE_YPOS
- `Z` - relative lift Z, default MIN_Z_FOR_SWAP. - `Z` - relative lift Z, default MIN_Z_FOR_SWAP.
- `E` - initial retract, default -2 - `E` - initial retract, default FILAMENTCHANGE_FIRSTRETRACT
- `L` - later retract distance for removal, default 0 - `L` - later retract distance for removal, default FILAMENTCHANGE_FINALRETRACT
- `AUTO` - Automatically (only with MMU) - `AUTO` - Automatically (only with MMU)
*/ */
case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] case 600: //Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
{ {
st_synchronize(); st_synchronize();
float x_position = current_position[X_AXIS]; float x_position = FILAMENTCHANGE_XPOS;
float y_position = current_position[Y_AXIS]; float y_position = FILAMENTCHANGE_YPOS;
float z_shift = MIN_Z_FOR_SWAP; float z_shift = MIN_Z_FOR_SWAP;
float e_shift_init = 0; float e_shift_init = FILAMENTCHANGE_FIRSTRETRACT;
float e_shift_late = 0; float e_shift_late = FILAMENTCHANGE_FINALRETRACT;
bool automatic = false; bool automatic = false;
//Retract extruder
if(code_seen('E'))
{
e_shift_init = code_value();
}
else
{
#ifdef FILAMENTCHANGE_FIRSTRETRACT
e_shift_init = FILAMENTCHANGE_FIRSTRETRACT ;
#endif
}
if (code_seen('L')) e_shift_late = code_value(); //Retract extruder
if (code_seen('E')) e_shift_init = code_value();
if (code_seen('L')) e_shift_late = code_value();
// Z lift. For safety only allow positive values // Z lift. For safety only allow positive values
if (code_seen('Z')) z_shift = fabs(code_value()); if (code_seen('Z')) z_shift = fabs(code_value());
//Move XY to side //Move XY to side
if(code_seen('X')) if (code_seen('X')) x_position = code_value();
{ if (code_seen('Y')) y_position = code_value();
x_position = code_value();
}
else
{
#ifdef FILAMENTCHANGE_XPOS
x_position = FILAMENTCHANGE_XPOS;
#endif
}
if(code_seen('Y'))
{
y_position = code_value();
}
else
{
#ifdef FILAMENTCHANGE_YPOS
y_position = FILAMENTCHANGE_YPOS ;
#endif
}
if (MMU2::mmu2.Enabled() && code_seen_P(PSTR("AUTO"))) if (MMU2::mmu2.Enabled() && code_seen_P(PSTR("AUTO")))
automatic = true; automatic = true;
gcode_M600(automatic, x_position, y_position, z_shift, e_shift_init, e_shift_late); gcode_M600(automatic, x_position, y_position, z_shift, e_shift_init, e_shift_late);
}
}
break; break;
#endif //FILAMENTCHANGEENABLE #endif //FILAMENTCHANGEENABLE

1
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View File

@ -219,6 +219,7 @@
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View File

@ -220,6 +220,7 @@
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h
View File

@ -219,6 +219,7 @@
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h
View File

@ -220,6 +220,7 @@
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View File

@ -358,6 +358,7 @@
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
View File

@ -362,6 +362,7 @@
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

@ -149,6 +149,7 @@ CHANGE FILAMENT SETTINGS
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)

1
Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

@ -148,6 +148,7 @@ CHANGE FILAMENT SETTINGS
#define FILAMENTCHANGE_YPOS 0 #define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 2 #define FILAMENTCHANGE_ZADD 2
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT 0
#define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600) #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701) #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)