Просмотр исходного кода

[2.0.x] Add simultaneous retraction for mixing extruder (#11941)

Thomas Moore 6 лет назад
Родитель
Сommit
ab4549d2bc
58 измененных файлов: 213 добавлений и 4 удалений
  1. 3
    0
      Marlin/Configuration_adv.h
  2. 3
    0
      Marlin/src/config/default/Configuration_adv.h
  3. 3
    0
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  4. 3
    0
      Marlin/src/config/examples/Anet/A2/Configuration_adv.h
  5. 3
    0
      Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
  6. 3
    0
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  7. 3
    0
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  8. 3
    0
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  9. 3
    0
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
  10. 3
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  11. 3
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  12. 3
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  13. 3
    0
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  14. 3
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
  15. 3
    0
      Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
  16. 3
    0
      Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
  17. 3
    0
      Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
  18. 3
    0
      Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
  19. 3
    0
      Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
  20. 3
    0
      Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
  21. 3
    0
      Marlin/src/config/examples/Einstart-S/Configuration_adv.h
  22. 3
    0
      Marlin/src/config/examples/Felix/Configuration_adv.h
  23. 3
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
  24. 3
    0
      Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
  25. 3
    0
      Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
  26. 3
    0
      Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
  27. 3
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  28. 3
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  29. 3
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  30. 3
    0
      Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
  31. 3
    0
      Marlin/src/config/examples/MakerParts/Configuration_adv.h
  32. 3
    0
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  33. 3
    0
      Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
  34. 3
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
  35. 3
    0
      Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
  36. 3
    0
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  37. 3
    0
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  38. 3
    0
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  39. 3
    0
      Marlin/src/config/examples/TheBorg/Configuration_adv.h
  40. 3
    0
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  41. 3
    0
      Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
  42. 3
    0
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  43. 3
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  44. 3
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  45. 3
    0
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
  46. 3
    0
      Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
  47. 3
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  48. 3
    0
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
  49. 3
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  50. 3
    0
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  51. 3
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  52. 3
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  53. 3
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  54. 3
    0
      Marlin/src/config/examples/makibox/Configuration_adv.h
  55. 3
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  56. 3
    0
      Marlin/src/config/examples/wt150/Configuration_adv.h
  57. 34
    3
      Marlin/src/feature/fwretract.cpp
  58. 11
    1
      Marlin/src/module/planner.cpp

+ 3
- 0
Marlin/Configuration_adv.h Просмотреть файл

@@ -1017,6 +1017,9 @@
1017 1017
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1020
+  #if ENABLED(MIXING_EXTRUDER)
1021
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1022
+  #endif
1020 1023
 #endif
1021 1024
 
1022 1025
 /**

+ 3
- 0
Marlin/src/config/default/Configuration_adv.h Просмотреть файл

@@ -1017,6 +1017,9 @@
1017 1017
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1020
+  #if ENABLED(MIXING_EXTRUDER)
1021
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1022
+  #endif
1020 1023
 #endif
1021 1024
 
1022 1025
 /**

+ 3
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Anet/A2/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Anet/A6/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Anet/A8/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h Просмотреть файл

@@ -1024,6 +1024,9 @@
1024 1024
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1025 1025
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1026 1026
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1027
+  #if ENABLED(MIXING_EXTRUDER)
1028
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1029
+  #endif
1027 1030
 #endif
1028 1031
 
1029 1032
 /**

+ 3
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Cartesio/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Einstart-S/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Felix/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h Просмотреть файл

@@ -1020,6 +1020,9 @@
1020 1020
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1021 1021
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1022 1022
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1023
+  #if ENABLED(MIXING_EXTRUDER)
1024
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1025
+  #endif
1023 1026
 #endif
1024 1027
 
1025 1028
 /**

+ 3
- 0
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h Просмотреть файл

@@ -1021,6 +1021,9 @@
1021 1021
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1022 1022
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1023 1023
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1024
+  #if ENABLED(MIXING_EXTRUDER)
1025
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1026
+  #endif
1024 1027
 #endif
1025 1028
 
1026 1029
 /**

+ 3
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/MakerParts/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h Просмотреть файл

@@ -1024,6 +1024,9 @@
1024 1024
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1025 1025
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1026 1026
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1027
+  #if ENABLED(MIXING_EXTRUDER)
1028
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1029
+  #endif
1027 1030
 #endif
1028 1031
 
1029 1032
 /**

+ 3
- 0
Marlin/src/config/examples/RigidBot/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/SCARA/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/TheBorg/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h Просмотреть файл

@@ -1029,6 +1029,9 @@
1029 1029
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1030 1030
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1031 1031
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1032
+  #if ENABLED(MIXING_EXTRUDER)
1033
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1034
+  #endif
1032 1035
 #endif
1033 1036
 
1034 1037
 /**

+ 3
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/generic/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h Просмотреть файл

@@ -1018,6 +1018,9 @@
1018 1018
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1020 1020
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1021
+  #if ENABLED(MIXING_EXTRUDER)
1022
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1023
+  #endif
1021 1024
 #endif
1022 1025
 
1023 1026
 /**

+ 3
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/makibox/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h Просмотреть файл

@@ -1016,6 +1016,9 @@
1016 1016
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1017 1017
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1019
+  #if ENABLED(MIXING_EXTRUDER)
1020
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1021
+  #endif
1019 1022
 #endif
1020 1023
 
1021 1024
 /**

+ 3
- 0
Marlin/src/config/examples/wt150/Configuration_adv.h Просмотреть файл

@@ -1017,6 +1017,9 @@
1017 1017
   #define RETRACT_RECOVER_LENGTH_SWAP 0   // Default additional swap recover length (mm, added to retract length when recovering from extruder change)
1018 1018
   #define RETRACT_RECOVER_FEEDRATE 8      // Default feedrate for recovering from retraction (mm/s)
1019 1019
   #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
1020
+  #if ENABLED(MIXING_EXTRUDER)
1021
+    //#define RETRACT_SYNC_MIXING         // Retract and restore all mixing steppers simultaneously
1022
+  #endif
1020 1023
 #endif
1021 1024
 
1022 1025
 /**

+ 34
- 3
Marlin/src/feature/fwretract.cpp Просмотреть файл

@@ -36,6 +36,10 @@ FWRetract fwretract; // Single instance - this calls the constructor
36 36
 #include "../module/planner.h"
37 37
 #include "../module/stepper.h"
38 38
 
39
+#if ENABLED(RETRACT_SYNC_MIXING)
40
+  #include "../feature/mixing.h"
41
+#endif
42
+
39 43
 // private:
40 44
 
41 45
 #if EXTRUDERS > 1
@@ -127,14 +131,32 @@ void FWRetract::retract(const bool retracting
127 131
   const float old_feedrate_mm_s = feedrate_mm_s,
128 132
               unscale_e = RECIPROCAL(planner.e_factor[active_extruder]),
129 133
               unscale_fr = 100.0 / feedrate_percentage, // Disable feedrate scaling for retract moves
130
-              base_retract = swapping ? swap_retract_length : retract_length;
134
+              base_retract = (
135
+                (swapping ? swap_retract_length : retract_length)
136
+                #if ENABLED(RETRACT_SYNC_MIXING)
137
+                  * (MIXING_STEPPERS)
138
+                #endif
139
+              );
131 140
 
132 141
   // The current position will be the destination for E and Z moves
133 142
   set_destination_from_current();
134 143
 
144
+  #if ENABLED(RETRACT_SYNC_MIXING)
145
+    float old_mixing_factor[MIXING_STEPPERS];
146
+    for (uint8_t i = 0; i < MIXING_STEPPERS; i++) {
147
+      old_mixing_factor[i] = mixing_factor[i];
148
+      mixing_factor[i] = RECIPROCAL(MIXING_STEPPERS);
149
+    }
150
+  #endif
151
+
135 152
   if (retracting) {
136 153
     // Retract by moving from a faux E position back to the current E position
137
-    feedrate_mm_s = retract_feedrate_mm_s * unscale_fr;
154
+    feedrate_mm_s = (
155
+      retract_feedrate_mm_s * unscale_fr
156
+      #if ENABLED(RETRACT_SYNC_MIXING)
157
+        * (MIXING_STEPPERS)
158
+      #endif
159
+    );
138 160
     current_retract[active_extruder] = base_retract * unscale_e;
139 161
     prepare_move_to_destination();                        // set_current_to_destination
140 162
     planner.synchronize();                                // Wait for move to complete
@@ -163,11 +185,20 @@ void FWRetract::retract(const bool retracting
163 185
     }
164 186
 
165 187
     current_retract[active_extruder] = 0.0;
166
-    feedrate_mm_s = (swapping ? swap_retract_recover_feedrate_mm_s : retract_recover_feedrate_mm_s) * unscale_fr;
188
+    feedrate_mm_s = (
189
+      (swapping ? swap_retract_recover_feedrate_mm_s : retract_recover_feedrate_mm_s) * unscale_fr
190
+      #if ENABLED(RETRACT_SYNC_MIXING)
191
+        * (MIXING_STEPPERS)
192
+      #endif
193
+    );
167 194
     prepare_move_to_destination();                        // Recover E, set_current_to_destination
168 195
     planner.synchronize();                                // Wait for move to complete
169 196
   }
170 197
 
198
+  #if ENABLED(RETRACT_SYNC_MIXING)
199
+    COPY(mixing_factor, old_mixing_factor);               // Restore original mixing factor
200
+  #endif
201
+
171 202
   feedrate_mm_s = old_feedrate_mm_s;                      // Restore original feedrate
172 203
   retracted[active_extruder] = retracting;                // Active extruder now retracted / recovered
173 204
 

+ 11
- 1
Marlin/src/module/planner.cpp Просмотреть файл

@@ -2084,7 +2084,17 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
2084 2084
   // Calculate and limit speed in mm/sec for each axis
2085 2085
   float current_speed[NUM_AXIS], speed_factor = 1.0f; // factor <1 decreases speed
2086 2086
   LOOP_XYZE(i) {
2087
-    const float cs = ABS((current_speed[i] = delta_mm[i] * inverse_secs));
2087
+    #if ENABLED(MIXING_EXTRUDER)
2088
+      float delta_mm_i = 0;
2089
+      if (i == E_AXIS) {
2090
+        for (uint8_t s = 0; s < MIXING_STEPPERS; s++)
2091
+          delta_mm_i = MAX(mixing_factor[s] * ABS(delta_mm[i]), delta_mm_i);
2092
+      }
2093
+      else delta_mm_i = ABS(delta_mm[i]);
2094
+    #else
2095
+      const float delta_mm_i = ABS(delta_mm[i]);
2096
+    #endif
2097
+    const float cs = current_speed[i] = delta_mm_i * inverse_secs;
2088 2098
     #if ENABLED(DISTINCT_E_FACTORS)
2089 2099
       if (i == E_AXIS) i += extruder;
2090 2100
     #endif

Загрузка…
Отмена
Сохранить