Bugfix 2.0.x

Marlin/Configuration_adv.h

@@ -3279,7 +3279,7 @@
     // This is for Prusa MK3-style extruders. Customize for your hardware.
     #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0
     #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \
-      {  7.2,  562 }, \
+      {  7.2, 1145 }, \
       { 14.4,  871 }, \
       { 36.0, 1393 }, \
       { 14.4,  871 }, \
@@ -3299,7 +3299,25 @@
       { -50.0, 2000 }
   #endif
 
-  // Using a sensor like the MMU2S
+  /**
+   * MMU Extruder Sensor
+   * Add support for Prusa IR Sensor (or other) to detect that filament reach the extruder to make loading filament more reliable
+   * If your extruder is equipped with a filament sensor located less than 38mm from the gears you can use this feature
+   * During loading to the extruder, the sensor will stop the loading command when he's triggered and make a last move to load filament to the gears
+   * If no filament is detected, MMU2 will make more loading attemps, if finally no filament is detected, the printer will enter in runout state
+   */
+
+  //#define MMU_EXTRUDER_SENSOR
+  #if ENABLED(MMU_EXTRUDER_SENSOR) 
+    #define MMU_LOADING_ATTEMPTS_NR 5 //max. number of attempts to load filament if first load fail
+  #endif
+
+  /**
+   * Using a sensor like the MMU2S
+   * This mode only work if you have a MK3S extruder with sensor sensing the extruder idler mmu2s
+   * See https://help.prusa3d.com/en/guide/3b-mk3s-mk2-5s-extruder-upgrade_41560, step 11
+   */
+
   //#define PRUSA_MMU2_S_MODE
   #if ENABLED(PRUSA_MMU2_S_MODE)
     #define MMU2_C0_RETRY   5             // Number of retries (total time = timeout*retries)

Marlin/src/core/boards.h

@@ -56,55 +56,56 @@
 #define BOARD_3DRAG                   1100  // 3Drag Controller
 #define BOARD_K8200                   1101  // Velleman K8200 Controller (derived from 3Drag Controller)
 #define BOARD_K8400                   1102  // Velleman K8400 Controller (derived from 3Drag Controller)
-#define BOARD_BAM_DICE                1103  // 2PrintBeta BAM&DICE with STK drivers
-#define BOARD_BAM_DICE_DUE            1104  // 2PrintBeta BAM&DICE Due with STK drivers
-#define BOARD_MKS_BASE                1105  // MKS BASE v1.0
-#define BOARD_MKS_BASE_14             1106  // MKS BASE v1.4 with Allegro A4982 stepper drivers
-#define BOARD_MKS_BASE_15             1107  // MKS BASE v1.5 with Allegro A4982 stepper drivers
-#define BOARD_MKS_BASE_16             1108  // MKS BASE v1.6 with Allegro A4982 stepper drivers
-#define BOARD_MKS_BASE_HEROIC         1109  // MKS BASE 1.0 with Heroic HR4982 stepper drivers
-#define BOARD_MKS_GEN_13              1110  // MKS GEN v1.3 or 1.4
-#define BOARD_MKS_GEN_L               1111  // MKS GEN L
-#define BOARD_KFB_2                   1112  // BigTreeTech or BIQU KFB2.0
-#define BOARD_ZRIB_V20                1113  // zrib V2.0 control board (Chinese knock off RAMPS replica)
-#define BOARD_FELIX2                  1114  // Felix 2.0+ Electronics Board (RAMPS like)
-#define BOARD_RIGIDBOARD              1115  // Invent-A-Part RigidBoard
-#define BOARD_RIGIDBOARD_V2           1116  // Invent-A-Part RigidBoard V2
-#define BOARD_SAINSMART_2IN1          1117  // Sainsmart 2-in-1 board
-#define BOARD_ULTIMAKER               1118  // Ultimaker
-#define BOARD_ULTIMAKER_OLD           1119  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
-#define BOARD_AZTEEG_X3               1120  // Azteeg X3
-#define BOARD_AZTEEG_X3_PRO           1121  // Azteeg X3 Pro
-#define BOARD_ULTIMAIN_2              1122  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
-#define BOARD_RUMBA                   1123  // Rumba
-#define BOARD_RUMBA_RAISE3D           1124  // Raise3D N series Rumba derivative
-#define BOARD_RL200                   1125  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
-#define BOARD_FORMBOT_TREX2PLUS       1126  // Formbot T-Rex 2 Plus
-#define BOARD_FORMBOT_TREX3           1127  // Formbot T-Rex 3
-#define BOARD_FORMBOT_RAPTOR          1128  // Formbot Raptor
-#define BOARD_FORMBOT_RAPTOR2         1129  // Formbot Raptor 2
-#define BOARD_BQ_ZUM_MEGA_3D          1130  // bq ZUM Mega 3D
-#define BOARD_MAKEBOARD_MINI          1131  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
-#define BOARD_TRIGORILLA_13           1132  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
-#define BOARD_TRIGORILLA_14           1133  //   ... Ver 1.4
-#define BOARD_TRIGORILLA_14_11        1134  //   ... Rev 1.1 (new servo pin order)
-#define BOARD_RAMPS_ENDER_4           1135  // Creality: Ender-4, CR-8
-#define BOARD_RAMPS_CREALITY          1136  // Creality: CR10S, CR20, CR-X
-#define BOARD_RAMPS_DAGOMA            1137  // Dagoma F5
-#define BOARD_FYSETC_F6_13            1138  // FYSETC F6 1.3
-#define BOARD_FYSETC_F6_14            1139  // FYSETC F6 1.4
-#define BOARD_DUPLICATOR_I3_PLUS      1140  // Wanhao Duplicator i3 Plus
-#define BOARD_VORON                   1141  // VORON Design
-#define BOARD_TRONXY_V3_1_0           1142  // Tronxy TRONXY-V3-1.0
-#define BOARD_Z_BOLT_X_SERIES         1143  // Z-Bolt X Series
-#define BOARD_TT_OSCAR                1144  // TT OSCAR
-#define BOARD_OVERLORD                1145  // Overlord/Overlord Pro
-#define BOARD_HJC2560C_REV1           1146  // ADIMLab Gantry v1
-#define BOARD_HJC2560C_REV2           1147  // ADIMLab Gantry v2
-#define BOARD_TANGO                   1148  // BIQU Tango V1
-#define BOARD_MKS_GEN_L_V2            1149  // MKS GEN L V2
-#define BOARD_COPYMASTER_3D           1150  // Copymaster 3D
-#define BOARD_ORTUR_4                 1151  // Ortur 4
+#define BOARD_K8600                   1103  // Velleman K8600 Controller (Vertex Nano)
+#define BOARD_BAM_DICE                1104  // 2PrintBeta BAM&DICE with STK drivers
+#define BOARD_BAM_DICE_DUE            1105  // 2PrintBeta BAM&DICE Due with STK drivers
+#define BOARD_MKS_BASE                1106  // MKS BASE v1.0
+#define BOARD_MKS_BASE_14             1107  // MKS BASE v1.4 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_15             1108  // MKS BASE v1.5 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_16             1109  // MKS BASE v1.6 with Allegro A4982 stepper drivers
+#define BOARD_MKS_BASE_HEROIC         1110  // MKS BASE 1.0 with Heroic HR4982 stepper drivers
+#define BOARD_MKS_GEN_13              1111  // MKS GEN v1.3 or 1.4
+#define BOARD_MKS_GEN_L               1112  // MKS GEN L
+#define BOARD_KFB_2                   1113  // BigTreeTech or BIQU KFB2.0
+#define BOARD_ZRIB_V20                1114  // zrib V2.0 control board (Chinese knock off RAMPS replica)
+#define BOARD_FELIX2                  1115  // Felix 2.0+ Electronics Board (RAMPS like)
+#define BOARD_RIGIDBOARD              1116  // Invent-A-Part RigidBoard
+#define BOARD_RIGIDBOARD_V2           1117  // Invent-A-Part RigidBoard V2
+#define BOARD_SAINSMART_2IN1          1118  // Sainsmart 2-in-1 board
+#define BOARD_ULTIMAKER               1119  // Ultimaker
+#define BOARD_ULTIMAKER_OLD           1120  // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
+#define BOARD_AZTEEG_X3               1121  // Azteeg X3
+#define BOARD_AZTEEG_X3_PRO           1122  // Azteeg X3 Pro
+#define BOARD_ULTIMAIN_2              1123  // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
+#define BOARD_RUMBA                   1124  // Rumba
+#define BOARD_RUMBA_RAISE3D           1125  // Raise3D N series Rumba derivative
+#define BOARD_RL200                   1126  // Rapide Lite 200 (v1, low-cost RUMBA clone with drv)
+#define BOARD_FORMBOT_TREX2PLUS       1127  // Formbot T-Rex 2 Plus
+#define BOARD_FORMBOT_TREX3           1128  // Formbot T-Rex 3
+#define BOARD_FORMBOT_RAPTOR          1129  // Formbot Raptor
+#define BOARD_FORMBOT_RAPTOR2         1130  // Formbot Raptor 2
+#define BOARD_BQ_ZUM_MEGA_3D          1131  // bq ZUM Mega 3D
+#define BOARD_MAKEBOARD_MINI          1132  // MakeBoard Mini v2.1.2 is a control board sold by MicroMake
+#define BOARD_TRIGORILLA_13           1133  // TriGorilla Anycubic version 1.3-based on RAMPS EFB
+#define BOARD_TRIGORILLA_14           1134  //   ... Ver 1.4
+#define BOARD_TRIGORILLA_14_11        1135  //   ... Rev 1.1 (new servo pin order)
+#define BOARD_RAMPS_ENDER_4           1136  // Creality: Ender-4, CR-8
+#define BOARD_RAMPS_CREALITY          1137  // Creality: CR10S, CR20, CR-X
+#define BOARD_RAMPS_DAGOMA            1138  // Dagoma F5
+#define BOARD_FYSETC_F6_13            1139  // FYSETC F6 1.3
+#define BOARD_FYSETC_F6_14            1140  // FYSETC F6 1.4
+#define BOARD_DUPLICATOR_I3_PLUS      1141  // Wanhao Duplicator i3 Plus
+#define BOARD_VORON                   1142  // VORON Design
+#define BOARD_TRONXY_V3_1_0           1143  // Tronxy TRONXY-V3-1.0
+#define BOARD_Z_BOLT_X_SERIES         1144  // Z-Bolt X Series
+#define BOARD_TT_OSCAR                1145  // TT OSCAR
+#define BOARD_OVERLORD                1146  // Overlord/Overlord Pro
+#define BOARD_HJC2560C_REV1           1147  // ADIMLab Gantry v1
+#define BOARD_HJC2560C_REV2           1148  // ADIMLab Gantry v2
+#define BOARD_TANGO                   1149  // BIQU Tango V1
+#define BOARD_MKS_GEN_L_V2            1150  // MKS GEN L V2
+#define BOARD_COPYMASTER_3D           1151  // Copymaster 3D
+#define BOARD_ORTUR_4                 1152  // Ortur 4
 
 //
 // RAMBo and derivatives

Marlin/src/core/language.h

@@ -162,7 +162,7 @@
 #define STR_ERR_MATERIAL_INDEX              "M145 S<index> out of range (0-1)"
 #define STR_ERR_M421_PARAMETERS             "M421 incorrect parameter usage"
 #define STR_ERR_BAD_PLANE_MODE              "G5 requires XY plane mode"
-#define STR_ERR_MESH_XY                     "Mesh point cannot be resolved"
+#define STR_ERR_MESH_XY                     "Mesh point out of range"
 #define STR_ERR_ARC_ARGS                    "G2/G3 bad parameters"
 #define STR_ERR_PROTECTED_PIN               "Protected Pin"
 #define STR_ERR_M420_FAILED                 "Failed to enable Bed Leveling"