From 87a4f58e66ae87c9ca33e73edb516323e9be4470 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 19 Aug 2022 10:08:25 +0200 Subject: [PATCH] PFW-1363 Change MMU Error parking position --- Firmware/mmu2.cpp | 6 +++--- Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h | 5 +++++ Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 5 +++++ Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h | 5 +++++ Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 5 +++++ Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 5 +++++ Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 5 +++++ 7 files changed, 33 insertions(+), 3 deletions(-) diff --git a/Firmware/mmu2.cpp b/Firmware/mmu2.cpp index efb9d13f2..34255892b 100644 --- a/Firmware/mmu2.cpp +++ b/Firmware/mmu2.cpp @@ -538,15 +538,15 @@ void MMU2::SaveAndPark(bool move_axes, bool turn_off_nozzle) { } // 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) current_position[Z_AXIS] = Z_MAX_POS; plan_buffer_line_curposXYZE(NOZZLE_PARK_Z_FEEDRATE); st_synchronize(); // move XY aside - current_position[X_AXIS] = X_PAUSE_POS; - current_position[Y_AXIS] = Y_PAUSE_POS; + current_position[X_AXIS] = MMU_ERR_X_PAUSE_POS; + current_position[Y_AXIS] = MMU_ERR_Y_PAUSE_POS; plan_buffer_line_curposXYZE(NOZZLE_PARK_XY_FEEDRATE); st_synchronize(); } diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index ccd88c0e8..720757ec8 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -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 +// 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) #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 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 0de301984..ba72bf228 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -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 +// 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 MICROMETER_LOGGING //related to D-codes D80 and D81, currently works on MK2.5 only (MK3 board pin definitions missing) diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index a4291ca8d..9c64bdbd9 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -515,6 +515,11 @@ //#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 +// 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) #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 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 4248fce6f..d7348c73b 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -516,6 +516,11 @@ //#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 +// 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) #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 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 44ec28d82..ea498e101 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -681,6 +681,11 @@ #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 +// 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) #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 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 1ac0bebc1..942151040 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -693,6 +693,11 @@ //#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 +// 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) #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