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

Documentation/Features.md

@@ -40,6 +40,7 @@ NEED UPGRADE
 *   Setting step for unit and feedrate for extruders
 *   Setting PID for any extruder
 *   Real-time filament diameter measurement and control
+*   COLOR MIXING EXTRUDE
 *   MKR4 suppport for 4 extruder but width only one driver
 *   Singlenozzle support
 *   NPr2 support, multiextruder by NicolaP http://www.3dmakerlab.it/extruder-npr2.html
@@ -175,6 +176,13 @@ If have one hotend and more extruder define SINGLENOZZLE for unique temperature.
 * \#define SINGLENOZZLE //This is used for singlenozzled multiple extrusion configuration
 
 
+### COLOR MIXING EXTRUDER
+Support is added for the [Repetier Host compatible](http://reprap.org/wiki/Repetier_Color_Mixing) GCode M163 Sn Pn which sets a single mix factor at a time. For example M163 S0 P0.5 and M163 S1 P0.5 would be used to set a mix of half color 1 plus half color 2.
+A shorthand gcode M165 is proposed to set the mixing parameters globally using parameters ABCDHI as a shortcut over multiple M163. For example, M165 A0.5 B0.5 would be used to set a mix of half color 1 plus half color 2.
+If MIXING_VIRTUAL_TOOLS is set to 2 or greater the Repetier Host compatible M164 Sn command is also made available to save the current mix factors as a virtual tool that can be recalled later. This option changes the behavior of the gcode_T() function so it restores a saved mixture rather than setting a new extruder.
+Following Pia Taubert's proposal, the G1 command is extended to accept up to 6 mixing parameters (ABCDHI). For example G1 A0.25 B0.6 C0.15 X10.0 Y99.2 E12.34 F9000 will set a mixture for 3 channels starting with the current move. The mix parameters must add up to 1.0. If they don't they will be normalized – scaled up or down to add up to 1.0. The mix is persistent, so further moves will continue to use the same mix.
+
+
 ### MKR4 System
 
 The system MKR4 allows two extruders for each driver on the motherboard. So with two drivers available you get to have 4 extruders. This is due to the relays controlled by the same motherboard with the pins. Look at the bottom of the file pins.h to set the right pin. This system allows the use of flux channeler to print in color. See http://www.immaginaecrea.it/index.php/blog-wordpress/post/150-flusso-canalizzatore-a-4-vie-la-stampa-3d-a-4-colori-e-gia-realta-per-lambiente-reprap-prima-parte

Documentation/changelog.md

+### Version 4.2.6
+* Bug Fix
+
 ### Version 4.2.5
 * Big Update
 * Add HAL for 8 bit version
 * Rewrite Communication
 * Rewrite Servo
-* and more
+* Add Color Mixing Extruder
 
 ### Version 4.2.4
 * Added Abort on endstop hit feature

MK/Configuration_Version.h

 #ifndef CONFIGURATION_VERSION_H
   #define CONFIGURATION_VERSION_H
 
-  #define SHORT_BUILD_VERSION "4.2.5_dev"
+  #define SHORT_BUILD_VERSION "4.2.6_dev"
   #define BUILD_VERSION "MK_" SHORT_BUILD_VERSION
   #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
   // It might also be appropriate to define a location where additional information can be found

README.md

 <img align="right" src="Documentation/Logo/MarlinKimbra%20Logo%20GitHub.png" />
 # MK 3D Printer Firmware for Arduino
-## Version 4.2.5 dev
+## Version 4.2.6 dev
 
 ### Special thanks
 * all Marlin8bit-developers.
@@ -32,8 +32,9 @@ This version of Marlin was made to accommodate some requests made by the communi
 The new features are:
 A single Firmware for all types of printers; Cartesian, Delta, SCARA, CoreXY & CoreXZ.
 The possibility of having only one hotend independently from the extruders that you have.
-The addition of the 4th extruder.
-System Management MKr4 for 4 extruders with just two drivers or only driver.
+The addition of the 6th extruder.
+Management Color Mixing Extruder
+System Management MKr4 for 6 extruders with just two drivers or only driver.
 Management Multyextruder NPr2, 4/6 extruders with only two engines.
 Management Dual Extruder DONDOLO.
 Adding commands to facilitate purging of hotend.