Merge remote-tracking branch 'refs/remotes/origin/master' into dev

MK/Configuration_Feature.h

@@ -405,12 +405,16 @@
  ***********************************************************************
  *                                                                     *
  * Extends G0/G1 with mixing factors ABCDHI for up to 6 steppers.      *
- * Adds a new code, M223, to set the current mix factors.              *
+ * Adds a new code, M165, to set the current mix factors.              *
+ * Optional support for Repetier Host M163, M164, and virtual tools.   *
  * Extends the stepping routines to move multiple steppers in          *
  * proportion to the mix.                                              *
  *                                                                     *
  ***********************************************************************/
 //#define COLOR_MIXING_EXTRUDER
+
+// Use the Virtual Tool method with M163 and M164
+#define MIXING_VIRTUAL_TOOLS 16
 /***********************************************************************/
 
 
@@ -1077,7 +1081,7 @@
  
 #define SHOW_BOOTSCREEN
 #define STRING_SPLASH_LINE1 "v" SHORT_BUILD_VERSION       // will be shown during bootup in line 1
-//#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE    // will be shown during bootup in line 2
+#define STRING_SPLASH_LINE2 STRING_DISTRIBUTION_DATE      // will be shown during bootup in line 2
 #define SPLASH_SCREEN_DURATION 5000                       // SPLASH SCREEN duration in millisecond
 
 //#define LCD_SCREEN_ROT_90    //Rotate screen orientation for graphics display by 90 degree clockwise

MK/MK.ino

@@ -115,6 +115,9 @@
  * M140 - Set bed target temp
  * M145 - Set the heatup state H<hotend> B<bed> F<fan speed> for S<material> (0=PLA, 1=ABS)
  * M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work.
+ * M163 - Set a single proportion for a mixing extruder. Requires COLOR_MIXING_EXTRUDER.
+ * M164 - Save the mix as a virtual extruder. Requires COLOR_MIXING_EXTRUDER and MIXING_VIRTUAL_TOOLS.
+ * M165 - Set the proportions for a mixing extruder. Use parameters ABCDHI to set the mixing factors. Requires COLOR_MIXING_EXTRUDER.
  * M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
  *        Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
  * M200 - set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).:D<millimeters>- 
@@ -131,7 +134,6 @@
  * M220 - Set speed factor override percentage: S<factor in percent>
  * M221 - Set extrude factor override percentage: S<factor in percent>
  * M222 - Set density extrusion percentage for purge: S<factor in percent>
- * M223 - Set the mix factors for a mixing extruder: <ABCDHI>
  * M226 - Wait until the specified pin reaches the state required: P<pin number> S<pin state>
  * M240 - Trigger a camera to take a photograph
  * M250 - Set LCD contrast C<contrast value> (value 0..63)

MK/module/conditionals.h

@@ -253,7 +253,7 @@
 /**
  * DRIVER_EXTRUDERS
  */
-#if DISABLED(MKR4) && DISABLED(NPR2) && DISABLED(DONDOLO)
+#if DISABLED(MKR4) && DISABLED(NPR2) && DISABLED(DONDOLO) && DISABLED(COLOR_MIXING_EXTRUDER)
   #undef DRIVER_EXTRUDERS
   #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruder
 #endif

MK/module/sanitycheck.h

@@ -271,6 +271,18 @@
     #endif
   #endif
 
+  #if ENABLED(COLOR_MIXING_EXTRUDER)
+    #if EXTRUDERS > 1
+      #error COLOR_MIXING_EXTRUDER supports plus one extruder.
+    #endif
+    #if DRIVER_EXTRUDERS < 2
+      #error You must set DRIVER_EXTRUDERS >= 2 for a mixing extruder.
+    #endif
+    #if ENABLED(FILAMENT_SENSOR)
+      #error COLOR_MIXING_EXTRUDER is incompatible with FILAMENT_SENSOR. Comment out this line to use it anyway.
+    #endif
+  #endif
+
   #if ENABLED(NPR2)
     #if DISABLED(COLOR_STEP)
       #error DEPENDENCY ERROR: Missing setting COLOR_STEP