Explorar el Código

[2.0] Fix Mixing Extruder mixing factors (#11861)

Scott Lahteine hace 6 años
padre
commit
bae8f82ba8
No account linked to committer's email address
Se han modificado 78 ficheros con 337 adiciones y 332 borrados
  1. 4
    4
      Marlin/Configuration.h
  2. 4
    4
      Marlin/src/config/default/Configuration.h
  3. 4
    4
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 4
    4
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 4
    4
      Marlin/src/config/examples/Anet/A2/Configuration.h
  6. 4
    4
      Marlin/src/config/examples/Anet/A2plus/Configuration.h
  7. 4
    4
      Marlin/src/config/examples/Anet/A6/Configuration.h
  8. 4
    4
      Marlin/src/config/examples/Anet/A8/Configuration.h
  9. 4
    4
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  10. 4
    4
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  11. 4
    4
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  12. 4
    4
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  13. 4
    4
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  14. 4
    4
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  15. 4
    4
      Marlin/src/config/examples/Cartesio/Configuration.h
  16. 4
    4
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  17. 4
    4
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  18. 4
    4
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  19. 4
    4
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  20. 4
    4
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  21. 4
    4
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  22. 4
    4
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  23. 4
    4
      Marlin/src/config/examples/Einstart-S/Configuration.h
  24. 4
    4
      Marlin/src/config/examples/Felix/Configuration.h
  25. 4
    4
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  26. 4
    4
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  27. 4
    4
      Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h
  28. 4
    4
      Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
  29. 4
    4
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  30. 4
    4
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  31. 4
    4
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  32. 4
    4
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  33. 4
    4
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  34. 4
    4
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  35. 4
    4
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  36. 4
    4
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  37. 4
    4
      Marlin/src/config/examples/MakerParts/Configuration.h
  38. 4
    4
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  39. 4
    4
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  40. 4
    4
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  41. 4
    4
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  42. 4
    4
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  43. 4
    4
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  44. 4
    4
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  45. 4
    4
      Marlin/src/config/examples/RigidBot/Configuration.h
  46. 4
    4
      Marlin/src/config/examples/SCARA/Configuration.h
  47. 4
    4
      Marlin/src/config/examples/STM32F10/Configuration.h
  48. 4
    4
      Marlin/src/config/examples/STM32F4/Configuration.h
  49. 4
    4
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  50. 4
    4
      Marlin/src/config/examples/TheBorg/Configuration.h
  51. 4
    4
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  52. 4
    4
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  53. 4
    4
      Marlin/src/config/examples/Tronxy/X3A/Configuration.h
  54. 4
    4
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  55. 4
    4
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  56. 4
    4
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  57. 4
    4
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  58. 4
    4
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  59. 4
    4
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  60. 4
    4
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  61. 4
    4
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  62. 4
    4
      Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
  63. 4
    4
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  64. 4
    4
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  65. 4
    4
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  66. 4
    4
      Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
  67. 4
    4
      Marlin/src/config/examples/delta/generic/Configuration.h
  68. 4
    4
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  69. 4
    4
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  70. 4
    4
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  71. 4
    4
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  72. 4
    4
      Marlin/src/config/examples/makibox/Configuration.h
  73. 4
    4
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  74. 4
    4
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  75. 4
    4
      Marlin/src/config/examples/wt150/Configuration.h
  76. 18
    7
      Marlin/src/feature/mixing.cpp
  77. 17
    23
      Marlin/src/gcode/feature/mixing/M163-M165.cpp
  78. 2
    2
      Marlin/src/gcode/gcode.h

+ 4
- 4
Marlin/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/default/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Anet/A2/Configuration.h Ver fichero

@@ -208,11 +208,11 @@
208 208
 
209 209
 /**
210 210
  * "Mixing Extruder"
211
- *   - Adds a new code, M165, to set the current mix factors.
211
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
212 212
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
213
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
214
- *   - This implementation supports only a single extruder.
215
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
213
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
214
+ *   - This implementation supports up to two mixing extruders.
215
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
216 216
  */
217 217
 //#define MIXING_EXTRUDER
218 218
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Anet/A2plus/Configuration.h Ver fichero

@@ -208,11 +208,11 @@
208 208
 
209 209
 /**
210 210
  * "Mixing Extruder"
211
- *   - Adds a new code, M165, to set the current mix factors.
211
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
212 212
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
213
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
214
- *   - This implementation supports only a single extruder.
215
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
213
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
214
+ *   - This implementation supports up to two mixing extruders.
215
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
216 216
  */
217 217
 //#define MIXING_EXTRUDER
218 218
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Anet/A6/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Anet/A8/Configuration.h Ver fichero

@@ -226,11 +226,11 @@
226 226
 
227 227
 /**
228 228
  * "Mixing Extruder"
229
- *   - Adds a new code, M165, to set the current mix factors.
229
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
230 230
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
231
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
232
- *   - This implementation supports only a single extruder.
233
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
231
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
232
+ *   - This implementation supports up to two mixing extruders.
233
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
234 234
  */
235 235
 //#define MIXING_EXTRUDER
236 236
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/BQ/Hephestos/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h Ver fichero

@@ -233,11 +233,11 @@
233 233
 
234 234
 /**
235 235
  * "Mixing Extruder"
236
- *   - Adds a new code, M165, to set the current mix factors.
236
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
237 237
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
238
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
239
- *   - This implementation supports only a single extruder.
240
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
238
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
239
+ *   - This implementation supports up to two mixing extruders.
240
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
241 241
  */
242 242
 //#define MIXING_EXTRUDER
243 243
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/BQ/WITBOX/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Cartesio/Configuration.h Ver fichero

@@ -226,11 +226,11 @@
226 226
 
227 227
 /**
228 228
  * "Mixing Extruder"
229
- *   - Adds a new code, M165, to set the current mix factors.
229
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
230 230
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
231
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
232
- *   - This implementation supports only a single extruder.
233
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
231
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
232
+ *   - This implementation supports up to two mixing extruders.
233
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
234 234
  */
235 235
 //#define MIXING_EXTRUDER
236 236
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/CR-10/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/CR-10S/Configuration.h Ver fichero

@@ -229,11 +229,11 @@
229 229
 
230 230
 /**
231 231
  * "Mixing Extruder"
232
- *   - Adds a new code, M165, to set the current mix factors.
232
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
233 233
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
234
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
235
- *   - This implementation supports only a single extruder.
236
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
234
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
235
+ *   - This implementation supports up to two mixing extruders.
236
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
237 237
  */
238 238
 //#define MIXING_EXTRUDER
239 239
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h Ver fichero

@@ -234,11 +234,11 @@
234 234
 
235 235
 /**
236 236
  * "Mixing Extruder"
237
- *   - Adds a new code, M165, to set the current mix factors.
237
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
238 238
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
239
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
240
- *   - This implementation supports only a single extruder.
241
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
239
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
240
+ *   - This implementation supports up to two mixing extruders.
241
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
242 242
  */
243 243
 //#define MIXING_EXTRUDER
244 244
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/CR-8/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/Ender-2/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/Ender-3/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Creality/Ender-4/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Einstart-S/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Felix/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Felix/DUAL/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Formbot/T-Rex_2+/Configuration.h Ver fichero

@@ -215,11 +215,11 @@
215 215
 
216 216
 /**
217 217
  * "Mixing Extruder"
218
- *   - Adds a new code, M165, to set the current mix factors.
218
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
219 219
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
220
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
221
- *   - This implementation supports only a single extruder.
222
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
220
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
221
+ *   - This implementation supports up to two mixing extruders.
222
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
223 223
  */
224 224
 //#define MIXING_EXTRUDER
225 225
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h Ver fichero

@@ -220,11 +220,11 @@
220 220
 
221 221
 /**
222 222
  * "Mixing Extruder"
223
- *   - Adds a new code, M165, to set the current mix factors.
223
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
224 224
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
225
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
226
- *   - This implementation supports only a single extruder.
227
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
225
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
226
+ *   - This implementation supports up to two mixing extruders.
227
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
228 228
  */
229 229
 //#define MIXING_EXTRUDER
230 230
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/JGAurora/A5/Configuration.h Ver fichero

@@ -230,11 +230,11 @@
230 230
 
231 231
 /**
232 232
  * "Mixing Extruder"
233
- *   - Adds a new code, M165, to set the current mix factors.
233
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
234 234
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
235
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
236
- *   - This implementation supports only a single extruder.
237
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
235
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
236
+ *   - This implementation supports up to two mixing extruders.
237
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
238 238
  */
239 239
 //#define MIXING_EXTRUDER
240 240
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/MakerParts/Configuration.h Ver fichero

@@ -245,11 +245,11 @@
245 245
 
246 246
 /**
247 247
  * "Mixing Extruder"
248
- *   - Adds a new code, M165, to set the current mix factors.
248
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
249 249
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
250
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
251
- *   - This implementation supports only a single extruder.
252
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
250
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
251
+ *   - This implementation supports up to two mixing extruders.
252
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
253 253
  */
254 254
 //#define MIXING_EXTRUDER
255 255
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Malyan/M150/Configuration.h Ver fichero

@@ -230,11 +230,11 @@
230 230
 
231 231
 /**
232 232
  * "Mixing Extruder"
233
- *   - Adds a new code, M165, to set the current mix factors.
233
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
234 234
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
235
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
236
- *   - This implementation supports only a single extruder.
237
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
235
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
236
+ *   - This implementation supports up to two mixing extruders.
237
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
238 238
  */
239 239
 //#define MIXING_EXTRUDER
240 240
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Malyan/M200/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Mks/Sbase/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/RigidBot/Configuration.h Ver fichero

@@ -228,11 +228,11 @@
228 228
 
229 229
 /**
230 230
  * "Mixing Extruder"
231
- *   - Adds a new code, M165, to set the current mix factors.
231
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
232 232
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
233
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
234
- *   - This implementation supports only a single extruder.
235
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
233
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
234
+ *   - This implementation supports up to two mixing extruders.
235
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
236 236
  */
237 237
 //#define MIXING_EXTRUDER
238 238
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/SCARA/Configuration.h Ver fichero

@@ -256,11 +256,11 @@
256 256
 
257 257
 /**
258 258
  * "Mixing Extruder"
259
- *   - Adds a new code, M165, to set the current mix factors.
259
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
260 260
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
261
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
262
- *   - This implementation supports only a single extruder.
263
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
261
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
262
+ *   - This implementation supports up to two mixing extruders.
263
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
264 264
  */
265 265
 //#define MIXING_EXTRUDER
266 266
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/STM32F10/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/STM32F4/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Sanguinololu/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/TheBorg/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/TinyBoy2/Configuration.h Ver fichero

@@ -247,11 +247,11 @@
247 247
 
248 248
 /**
249 249
  * "Mixing Extruder"
250
- *   - Adds a new code, M165, to set the current mix factors.
250
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
251 251
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
252
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
253
- *   - This implementation supports only a single extruder.
254
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
252
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
253
+ *   - This implementation supports up to two mixing extruders.
254
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
255 255
  */
256 256
 //#define MIXING_EXTRUDER
257 257
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Tronxy/X1/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Tronxy/X3A/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Tronxy/X5S/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Tronxy/XY100/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Velleman/K8200/Configuration.h Ver fichero

@@ -245,11 +245,11 @@
245 245
 
246 246
 /**
247 247
  * "Mixing Extruder"
248
- *   - Adds a new code, M165, to set the current mix factors.
248
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
249 249
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
250
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
251
- *   - This implementation supports only a single extruder.
252
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
250
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
251
+ *   - This implementation supports up to two mixing extruders.
252
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
253 253
  */
254 254
 //#define MIXING_EXTRUDER
255 255
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Velleman/K8400/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/adafruit/ST7565/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h Ver fichero

@@ -221,11 +221,11 @@
221 221
 
222 222
 /**
223 223
  * "Mixing Extruder"
224
- *   - Adds a new code, M165, to set the current mix factors.
224
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
225 225
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
226
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
227
- *   - This implementation supports only a single extruder.
228
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
226
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
227
+ *   - This implementation supports up to two mixing extruders.
228
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
229 229
  */
230 230
 //#define MIXING_EXTRUDER
231 231
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h Ver fichero

@@ -230,11 +230,11 @@
230 230
 
231 231
 /**
232 232
  * "Mixing Extruder"
233
- *   - Adds a new code, M165, to set the current mix factors.
233
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
234 234
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
235
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
236
- *   - This implementation supports only a single extruder.
237
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
235
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
236
+ *   - This implementation supports up to two mixing extruders.
237
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
238 238
  */
239 239
 //#define MIXING_EXTRUDER
240 240
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/generic/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/kossel_mini/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/kossel_pro/Configuration.h Ver fichero

@@ -229,11 +229,11 @@
229 229
 
230 230
 /**
231 231
  * "Mixing Extruder"
232
- *   - Adds a new code, M165, to set the current mix factors.
232
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
233 233
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
234
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
235
- *   - This implementation supports only a single extruder.
236
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
234
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
235
+ *   - This implementation supports up to two mixing extruders.
236
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
237 237
  */
238 238
 //#define MIXING_EXTRUDER
239 239
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/delta/kossel_xl/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h Ver fichero

@@ -230,11 +230,11 @@
230 230
 
231 231
 /**
232 232
  * "Mixing Extruder"
233
- *   - Adds a new code, M165, to set the current mix factors.
233
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
234 234
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
235
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
236
- *   - This implementation supports only a single extruder.
237
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
235
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
236
+ *   - This implementation supports up to two mixing extruders.
237
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
238 238
  */
239 239
 //#define MIXING_EXTRUDER
240 240
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/makibox/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/stm32f103ret6/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/tvrrug/Round2/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 4
- 4
Marlin/src/config/examples/wt150/Configuration.h Ver fichero

@@ -225,11 +225,11 @@
225 225
 
226 226
 /**
227 227
  * "Mixing Extruder"
228
- *   - Adds a new code, M165, to set the current mix factors.
228
+ *   - Adds G-codes M163 and M164 to set and "commit" the current mix factors.
229 229
  *   - Extends the stepping routines to move multiple steppers in proportion to the mix.
230
- *   - Optional support for Repetier Firmware M163, M164, and virtual extruder.
231
- *   - This implementation supports only a single extruder.
232
- *   - Enable DIRECT_MIXING_IN_G1 for Pia Taubert's reference implementation
230
+ *   - Optional support for Repetier Firmware's 'M164 S<index>' supporting virtual tools.
231
+ *   - This implementation supports up to two mixing extruders.
232
+ *   - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation).
233 233
  */
234 234
 //#define MIXING_EXTRUDER
235 235
 #if ENABLED(MIXING_EXTRUDER)

+ 18
- 7
Marlin/src/feature/mixing.cpp Ver fichero

@@ -56,12 +56,12 @@ float mixing_factor[MIXING_STEPPERS]; // Reciprocal of mix proportion. 0.0 = off
56 56
 
57 57
 void normalize_mix() {
58 58
   float mix_total = 0.0;
59
-  for (uint8_t i = 0; i < MIXING_STEPPERS; i++) mix_total += mixing_factor[i]; // Ex: 1/4 + 1/8 + 1/8 = 1/2
59
+  for (uint8_t i = 0; i < MIXING_STEPPERS; i++) mix_total += mixing_factor[i];
60 60
   // Scale all values if they don't add up to ~1.0
61 61
   if (!NEAR(mix_total, 1.0)) {
62 62
     SERIAL_PROTOCOLLNPGM("Warning: Mix factors must add up to 1.0. Scaling.");
63
-    mix_total = RECIPROCAL(mix_total);
64
-    for (uint8_t i = 0; i < MIXING_STEPPERS; i++) mixing_factor[i] *= mix_total; // Ex: 1/4*2 + 1/8*2 + 1/8*2 = 1/2 + 1/4 + 1/4 = 1
63
+    const float inverse_sum = RECIPROCAL(mix_total);
64
+    for (uint8_t i = 0; i < MIXING_STEPPERS; i++) mixing_factor[i] *= inverse_sum;
65 65
   }
66 66
 }
67 67
 
@@ -70,14 +70,25 @@ void normalize_mix() {
70 70
   // The total "must" be 1.0 (but it will be normalized)
71 71
   // If no mix factors are given, the old mix is preserved
72 72
   void gcode_get_mix() {
73
-    const char mixing_codes[] = { 'A', 'B', 'C', 'D', 'H', 'I' };
73
+    const char mixing_codes[] = { 'A', 'B'
74
+      #if MIXING_STEPPERS > 2
75
+        , 'C'
76
+        #if MIXING_STEPPERS > 3
77
+          , 'D'
78
+          #if MIXING_STEPPERS > 4
79
+            , 'H'
80
+            #if MIXING_STEPPERS > 5
81
+              , 'I'
82
+            #endif // MIXING_STEPPERS > 5
83
+          #endif // MIXING_STEPPERS > 4
84
+        #endif // MIXING_STEPPERS > 3
85
+      #endif // MIXING_STEPPERS > 2
86
+    };
74 87
     byte mix_bits = 0;
75 88
     for (uint8_t i = 0; i < MIXING_STEPPERS; i++) {
76 89
       if (parser.seenval(mixing_codes[i])) {
77 90
         SBI(mix_bits, i);
78
-        float v = parser.value_float();
79
-        NOLESS(v, 0.0);
80
-        mixing_factor[i] = RECIPROCAL(v);
91
+        mixing_factor[i] = MAX(parser.value_float(), 0.0);
81 92
       }
82 93
     }
83 94
     // If any mixing factors were included, clear the rest

+ 17
- 23
Marlin/src/gcode/feature/mixing/M163-M165.cpp Ver fichero

@@ -30,45 +30,40 @@
30 30
 /**
31 31
  * M163: Set a single mix factor for a mixing extruder
32 32
  *       This is called "weight" by some systems.
33
+ *       The 'P' values must sum to 1.0 or must be followed by M164 to normalize them.
33 34
  *
34 35
  *   S[index]   The channel index to set
35 36
  *   P[float]   The mix value
36
- *
37 37
  */
38 38
 void GcodeSuite::M163() {
39 39
   const int mix_index = parser.intval('S');
40
-  if (mix_index < MIXING_STEPPERS) {
41
-    float mix_value = parser.floatval('P');
42
-    NOLESS(mix_value, 0.0);
43
-    mixing_factor[mix_index] = RECIPROCAL(mix_value);
44
-  }
40
+  if (mix_index < MIXING_STEPPERS)
41
+    mixing_factor[mix_index] = MAX(parser.floatval('P'), 0.0);
45 42
 }
46 43
 
47
-#if MIXING_VIRTUAL_TOOLS > 1
48
-
49
-  /**
50
-   * M164: Store the current mix factors as a virtual tool.
51
-   *
52
-   *   S[index]   The virtual tool to store
53
-   *
54
-   */
55
-  void GcodeSuite::M164() {
56
-    const int tool_index = parser.intval('S');
57
-    if (tool_index < MIXING_VIRTUAL_TOOLS) {
58
-      normalize_mix();
44
+/**
45
+ * M164: Normalize and commit the mix.
46
+ *       If 'S' is given store as a virtual tool. (Requires MIXING_VIRTUAL_TOOLS > 1)
47
+ *
48
+ *   S[index]   The virtual tool to store
49
+ */
50
+void GcodeSuite::M164() {
51
+  normalize_mix();
52
+  #if MIXING_VIRTUAL_TOOLS > 1
53
+    const int tool_index = parser.intval('S', -1);
54
+    if (WITHIN(tool_index, 0, MIXING_VIRTUAL_TOOLS - 1)) {
59 55
       for (uint8_t i = 0; i < MIXING_STEPPERS; i++)
60 56
         mixing_virtual_tool_mix[tool_index][i] = mixing_factor[i];
61 57
     }
62
-  }
63
-
64
-#endif // MIXING_VIRTUAL_TOOLS > 1
58
+  #endif
59
+}
65 60
 
66 61
 #if ENABLED(DIRECT_MIXING_IN_G1)
67 62
 
68 63
   /**
69 64
    * M165: Set multiple mix factors for a mixing extruder.
70 65
    *       Factors that are left out will be set to 0.
71
-   *       All factors together must add up to 1.0.
66
+   *       All factors should sum to 1.0, but they will be normalized regardless.
72 67
    *
73 68
    *   A[factor] Mix factor for extruder stepper 1
74 69
    *   B[factor] Mix factor for extruder stepper 2
@@ -76,7 +71,6 @@ void GcodeSuite::M163() {
76 71
    *   D[factor] Mix factor for extruder stepper 4
77 72
    *   H[factor] Mix factor for extruder stepper 5
78 73
    *   I[factor] Mix factor for extruder stepper 6
79
-   *
80 74
    */
81 75
   void GcodeSuite::M165() { gcode_get_mix(); }
82 76
 

+ 2
- 2
Marlin/src/gcode/gcode.h Ver fichero

@@ -145,8 +145,8 @@
145 145
  * M150 - Set Status LED Color as R<red> U<green> B<blue> P<bright>. Values 0-255. (Requires BLINKM, RGB_LED, RGBW_LED, NEOPIXEL_LED, or PCA9632).
146 146
  * M155 - Auto-report temperatures with interval of S<seconds>. (Requires AUTO_REPORT_TEMPERATURES)
147 147
  * M163 - Set a single proportion for a mixing extruder. (Requires MIXING_EXTRUDER)
148
- * M164 - Save the mix as a virtual extruder. (Requires MIXING_EXTRUDER and MIXING_VIRTUAL_TOOLS)
149
- * M165 - Set the proportions for a mixing extruder. Use parameters ABCDHI to set the mixing factors. (Requires MIXING_EXTRUDER)
148
+ * M164 - Commit the mix (Req. MIXING_EXTRUDER) and optionally save as a virtual tool (Req. MIXING_VIRTUAL_TOOLS > 1)
149
+ * M165 - Set the mix for a mixing extruder wuth parameters ABCDHI. (Requires MIXING_EXTRUDER and DIRECT_MIXING_IN_G1)
150 150
  * M190 - Sxxx Wait for bed current temp to reach target temp. ** Waits only when heating! **
151 151
  *        Rxxx Wait for bed current temp to reach target temp. ** Waits for heating or cooling. **
152 152
  * M200 - Set filament diameter, D<diameter>, setting E axis units to cubic. (Use S0 to revert to linear units.)

Loading…
Cancelar
Guardar