Optimize MMU2S Load Sequence for Bear Extruder

vertigo235 · Feb 27, 2021 · 327279a · 327279a
1 parent 139d017
commit 327279a
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 0 deletions.
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
@@ -1470,6 +1470,8 @@ static bool can_load()
       current_position[E_AXIS] += 70; //Bondtech_Mosquito 70mm from drive gear to melt zone
     #elif defined(BONDTECH_MOSQUITO_MAGNUM)
       current_position[E_AXIS] += 62; //Bondtech_Mosquito_Magnum 62mm from drive gear to melt zone
+    #elif defined(BEAR_EXTRUDER)
+      current_position[E_AXIS] += 65; //Bear MK3S 65mm from drive gear to melt zone
     #else
       current_position[E_AXIS] += 60;
     #endif
@@ -1483,6 +1485,8 @@ static bool can_load()
       current_position[E_AXIS] -= 62; // Pull back 62mm, 8 mm below drive gear
     #elif defined(BONDTECH_MOSQUITO_MAGNUM)
       current_position[E_AXIS] -= 54; // Pull back 54mm, 8 mm below drive gear
+    #elif defined(BEAR_EXTRUDER)
+      current_position[E_AXIS] -= 58; // Pull back 57mm, 7 mm below drive gear
     #else
       current_position[E_AXIS] -= 52;
     #endif

diff --git a/Firmware/variants/1_75mm_MK25-BEAR-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-BEAR-RAMBo10a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK25
 #define PRINTER_NAME PRINTER_MK25_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK25_MMU2

diff --git a/Firmware/variants/1_75mm_MK25-BEAR-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-BEAR-RAMBo13a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK25
 #define PRINTER_NAME PRINTER_MK25_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK25_MMU2

diff --git a/Firmware/variants/1_75mm_MK25S-BEAR-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-BEAR-RAMBo10a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK25S
 #define PRINTER_NAME PRINTER_MK25S_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK25S_MMU2

diff --git a/Firmware/variants/1_75mm_MK25S-BEAR-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25S-BEAR-RAMBo13a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK25S
 #define PRINTER_NAME PRINTER_MK25S_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK25S_MMU2

diff --git a/Firmware/variants/1_75mm_MK3-BEAR-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-BEAR-EINSy10a-E3Dv6full.h
@@ -9,6 +9,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK3
 #define PRINTER_NAME PRINTER_MK3_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK3_MMU2

diff --git a/Firmware/variants/1_75mm_MK3S-BEAR-320Z-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-BEAR-320Z-EINSy10a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK3S
 #define PRINTER_NAME PRINTER_MK3S_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2

diff --git a/Firmware/variants/1_75mm_MK3S-BEAR-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-BEAR-EINSy10a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK3S
 #define PRINTER_NAME PRINTER_MK3S_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2

diff --git a/Firmware/variants/1_75mm_MK3S-BEAR-SilverPSU-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3S-BEAR-SilverPSU-EINSy10a-E3Dv6full.h
@@ -8,6 +8,7 @@
  *------------------------------------*/
 
 // Printer revision
+#define BEAR_EXTRUDER
 #define PRINTER_TYPE PRINTER_MK3S
 #define PRINTER_NAME PRINTER_MK3S_NAME
 #define PRINTER_MMU_TYPE PRINTER_MK3S_MMU2

diff --git a/Firmware/variants/create_variants.sh b/Firmware/variants/create_variants.sh
@@ -16,6 +16,7 @@ BASE="1_75mm_MK3-EINSy10a-E3Dv6full.h"
 VARIANT="1_75mm_MK3-BEAR-EINSy10a-E3Dv6full.h"
 cp ${BASE} ${VARIANT}
 sed -i -e 's/#define CUSTOM_MENDEL_NAME "Prusa i3 MK3"*/#define CUSTOM_MENDEL_NAME "Prusa i3 MK3 BEAR"/' ${VARIANT}
+sed -i -e 's/\/\/ Printer revision*/\/\/ Printer revision\n#define BEAR_EXTRUDER/' ${VARIANT}
 
 ## Bondtech Prusa Extruder
 VARIANT="1_75mm_MK3-Bondtech-16-EINSy10a-E3Dv6full.h"
@@ -40,6 +41,7 @@ VARIANT="1_75mm_MK3S-BEAR-EINSy10a-E3Dv6full.h"
 cp ${BASE} ${VARIANT}
 sed -i -e 's/#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S"*/#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S BEAR"/' ${VARIANT}
 sed -i -e 's/#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9.0*/#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2.0/' ${VARIANT}
+sed -i -e 's/\/\/ Printer revision*/\/\/ Printer revision\n#define BEAR_EXTRUDER/' ${VARIANT}
 
 ## Bondtech Prusa Extruder
 VARIANT="1_75mm_MK3S-Bondtech-16-EINSy10a-E3Dv6full.h"
@@ -65,6 +67,7 @@ VARIANT="1_75mm_MK25S-BEAR-RAMBo13a-E3Dv6full.h"
 cp ${BASE} ${VARIANT}
 sed -i -e 's/#define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5S"*/#define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5S BEAR"/' ${VARIANT}
 sed -i -e 's/#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 9.0*/#define Z_MAX_POS_XYZ_CALIBRATION_CORRECTION 2.0/' ${VARIANT}
+sed -i -e 's/\/\/ Printer revision*/\/\/ Printer revision\n#define BEAR_EXTRUDER/' ${VARIANT}
 
 ## Bondtech Prusa Extruder
 VARIANT="1_75mm_MK25S-Bondtech-16-RAMBo13a-E3Dv6full.h"
@@ -100,6 +103,7 @@ BASE="1_75mm_MK25-RAMBo13a-E3Dv6full.h"
 VARIANT="1_75mm_MK25-BEAR-RAMBo13a-E3Dv6full.h"
 cp ${BASE} ${VARIANT}
 sed -i -e 's/#define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5"*/#define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5 BEAR"/' ${VARIANT}
+sed -i -e 's/\/\/ Printer revision*/\/\/ Printer revision\n#define BEAR_EXTRUDER/' ${VARIANT}
 
 ## Bondtech Prusa Extruder
 VARIANT="1_75mm_MK25-Bondtech-16-RAMBo13a-E3Dv6full.h"