From 559e1bb21a1e68147098e5876f54bb6da9ffa7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 15 Apr 2023 12:43:11 +0000 Subject: [PATCH] Remove unused MMU configs - MMU_IDLER_SENSOR_ATTEMPTS_NR - MMU_REQUIRED_FW_BUILDNR These are no longer used --- 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 | 4 ---- Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h | 4 ---- Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 5 +---- Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h | 5 +---- Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 5 ----- Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 5 ----- 8 files changed, 2 insertions(+), 36 deletions(-) diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h index 9fcc29d25..555d1b405 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h @@ -503,16 +503,11 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #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 diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index 2f1f1108e..6769893df 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -504,16 +504,11 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #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 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h index d64af4ab7..3ba4ad5eb 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h @@ -503,10 +503,7 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER @@ -518,7 +515,6 @@ // defined. //#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 diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h index 8357d20c4..999ff6fb8 100644 --- a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h @@ -504,10 +504,7 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 #define MMU_FORCE_STEALTH_MODE #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER @@ -519,7 +516,6 @@ // defined. //#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 diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index 1182a70e6..a9757ba0f 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -672,14 +672,11 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 83 +//#define MMU_FORCE_STEALTH_MODE #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU and printer on serial #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 diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h index 28e4842af..1e0dc6480 100644 --- a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h @@ -676,10 +676,8 @@ //#define SUPPORT_VERBOSITY #define MMU_CONFIG_FILE "mmu2/variants/config_MMU2S.h" - #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 83 +//#define MMU_FORCE_STEALTH_MODE #define MMU_HWRESET #define MMU_DEBUG //print communication between MMU and printer on serial #define MMU_HAS_CUTTER @@ -691,7 +689,6 @@ // defined. //#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 diff --git a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 6d8f205b5..bef50bee0 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -415,13 +415,8 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 - //#define SUPPORT_VERBOSITY -#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 - // 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/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h index f43b22ccc..a1a6a6c68 100644 --- a/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -414,13 +414,8 @@ THERMISTORS SETTINGS #define M600_TIMEOUT 600 //seconds #define MMU_FILAMENT_COUNT 5 - -#define MMU_REQUIRED_FW_BUILDNR 132 - //#define SUPPORT_VERBOSITY -#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 - // 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