PFW-1363 Change MMU Error parking position
This commit is contained in:
parent
703c463a49
commit
87a4f58e66
|
|
@ -538,15 +538,15 @@ void MMU2::SaveAndPark(bool move_axes, bool turn_off_nozzle) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// lift Z
|
// lift Z
|
||||||
current_position[Z_AXIS] += Z_PAUSE_LIFT;
|
current_position[Z_AXIS] += MMU_ERR_Z_PAUSE_LIFT;
|
||||||
if (current_position[Z_AXIS] > Z_MAX_POS)
|
if (current_position[Z_AXIS] > Z_MAX_POS)
|
||||||
current_position[Z_AXIS] = Z_MAX_POS;
|
current_position[Z_AXIS] = Z_MAX_POS;
|
||||||
plan_buffer_line_curposXYZE(NOZZLE_PARK_Z_FEEDRATE);
|
plan_buffer_line_curposXYZE(NOZZLE_PARK_Z_FEEDRATE);
|
||||||
st_synchronize();
|
st_synchronize();
|
||||||
|
|
||||||
// move XY aside
|
// move XY aside
|
||||||
current_position[X_AXIS] = X_PAUSE_POS;
|
current_position[X_AXIS] = MMU_ERR_X_PAUSE_POS;
|
||||||
current_position[Y_AXIS] = Y_PAUSE_POS;
|
current_position[Y_AXIS] = MMU_ERR_Y_PAUSE_POS;
|
||||||
plan_buffer_line_curposXYZE(NOZZLE_PARK_XY_FEEDRATE);
|
plan_buffer_line_curposXYZE(NOZZLE_PARK_XY_FEEDRATE);
|
||||||
st_synchronize();
|
st_synchronize();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -508,6 +508,11 @@
|
||||||
|
|
||||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||||
|
|
||||||
|
// MMU Error pause position
|
||||||
|
#define MMU_ERR_X_PAUSE_POS 125
|
||||||
|
#define MMU_ERR_Y_PAUSE_POS 0
|
||||||
|
#define MMU_ERR_Z_PAUSE_LIFT 20
|
||||||
|
|
||||||
// Default Arc Interpolation Settings (Now configurable via M214)
|
// Default Arc Interpolation Settings (Now configurable via M214)
|
||||||
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
||||||
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
||||||
|
|
|
||||||
|
|
@ -509,6 +509,11 @@
|
||||||
|
|
||||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||||
|
|
||||||
|
// MMU Error pause position
|
||||||
|
#define MMU_ERR_X_PAUSE_POS 125
|
||||||
|
#define MMU_ERR_Y_PAUSE_POS 0
|
||||||
|
#define MMU_ERR_Z_PAUSE_LIFT 20
|
||||||
|
|
||||||
//#define HEATBED_ANALYSIS //for meash bed leveling and heatbed analysis D-codes D80 and D81
|
//#define HEATBED_ANALYSIS //for meash bed leveling and heatbed analysis D-codes D80 and D81
|
||||||
//#define MICROMETER_LOGGING //related to D-codes D80 and D81, currently works on MK2.5 only (MK3 board pin definitions missing)
|
//#define MICROMETER_LOGGING //related to D-codes D80 and D81, currently works on MK2.5 only (MK3 board pin definitions missing)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -515,6 +515,11 @@
|
||||||
//#define MMU_ALWAYS_CUT
|
//#define MMU_ALWAYS_CUT
|
||||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||||
|
|
||||||
|
// MMU Error pause position
|
||||||
|
#define MMU_ERR_X_PAUSE_POS 125
|
||||||
|
#define MMU_ERR_Y_PAUSE_POS 0
|
||||||
|
#define MMU_ERR_Z_PAUSE_LIFT 20
|
||||||
|
|
||||||
// Default Arc Interpolation Settings (Now configurable via M214)
|
// Default Arc Interpolation Settings (Now configurable via M214)
|
||||||
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
||||||
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
||||||
|
|
|
||||||
|
|
@ -516,6 +516,11 @@
|
||||||
//#define MMU_ALWAYS_CUT
|
//#define MMU_ALWAYS_CUT
|
||||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||||
|
|
||||||
|
// MMU Error pause position
|
||||||
|
#define MMU_ERR_X_PAUSE_POS 125
|
||||||
|
#define MMU_ERR_Y_PAUSE_POS 0
|
||||||
|
#define MMU_ERR_Z_PAUSE_LIFT 20
|
||||||
|
|
||||||
// Default Arc Interpolation Settings (Now configurable via M214)
|
// Default Arc Interpolation Settings (Now configurable via M214)
|
||||||
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
||||||
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
||||||
|
|
|
||||||
|
|
@ -681,6 +681,11 @@
|
||||||
#define MMU_HAS_CUTTER
|
#define MMU_HAS_CUTTER
|
||||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||||
|
|
||||||
|
// MMU Error pause position
|
||||||
|
#define MMU_ERR_X_PAUSE_POS 125
|
||||||
|
#define MMU_ERR_Y_PAUSE_POS 0
|
||||||
|
#define MMU_ERR_Z_PAUSE_LIFT 20
|
||||||
|
|
||||||
// Default Arc Interpolation Settings (Now configurable via M214)
|
// Default Arc Interpolation Settings (Now configurable via M214)
|
||||||
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
||||||
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
||||||
|
|
|
||||||
|
|
@ -693,6 +693,11 @@
|
||||||
//#define MMU_ALWAYS_CUT
|
//#define MMU_ALWAYS_CUT
|
||||||
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
#define MMU_IDLER_SENSOR_ATTEMPTS_NR 21 //max. number of attempts to load filament if first load failed; value for max bowden length and case when loading fails right at the beginning
|
||||||
|
|
||||||
|
// MMU Error pause position
|
||||||
|
#define MMU_ERR_X_PAUSE_POS 125
|
||||||
|
#define MMU_ERR_Y_PAUSE_POS 0
|
||||||
|
#define MMU_ERR_Z_PAUSE_LIFT 20
|
||||||
|
|
||||||
// Default Arc Interpolation Settings (Now configurable via M214)
|
// Default Arc Interpolation Settings (Now configurable via M214)
|
||||||
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
#define DEFAULT_N_ARC_CORRECTION 25 // Number of interpolated segments between corrections.
|
||||||
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
/* A value of 1 or less for N_ARC_CORRECTION will trigger the use of Sin and Cos for every arc, which will improve accuracy at the
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue