Browse Source

Add option to control Solenoids under PARKING_EXTRUDER (#12028)

Sam Lane 6 years ago
parent
commit
f2ecf8d510
82 changed files with 95 additions and 8 deletions
  1. 1
    0
      Marlin/Configuration.h
  2. 1
    0
      Marlin/src/config/default/Configuration.h
  3. 1
    0
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
  4. 1
    0
      Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
  5. 1
    0
      Marlin/src/config/examples/Anet/A2/Configuration.h
  6. 1
    0
      Marlin/src/config/examples/Anet/A2plus/Configuration.h
  7. 1
    0
      Marlin/src/config/examples/Anet/A6/Configuration.h
  8. 1
    0
      Marlin/src/config/examples/Anet/A8/Configuration.h
  9. 1
    0
      Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
  10. 1
    0
      Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
  11. 1
    0
      Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
  12. 1
    0
      Marlin/src/config/examples/BQ/Hephestos/Configuration.h
  13. 1
    0
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
  14. 1
    0
      Marlin/src/config/examples/BQ/WITBOX/Configuration.h
  15. 1
    0
      Marlin/src/config/examples/Cartesio/Configuration.h
  16. 1
    0
      Marlin/src/config/examples/Creality/CR-10/Configuration.h
  17. 1
    0
      Marlin/src/config/examples/Creality/CR-10S/Configuration.h
  18. 1
    0
      Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
  19. 1
    0
      Marlin/src/config/examples/Creality/CR-8/Configuration.h
  20. 1
    0
      Marlin/src/config/examples/Creality/Ender-2/Configuration.h
  21. 1
    0
      Marlin/src/config/examples/Creality/Ender-3/Configuration.h
  22. 1
    0
      Marlin/src/config/examples/Creality/Ender-4/Configuration.h
  23. 1
    0
      Marlin/src/config/examples/Einstart-S/Configuration.h
  24. 1
    0
      Marlin/src/config/examples/Felix/Configuration.h
  25. 1
    0
      Marlin/src/config/examples/Felix/DUAL/Configuration.h
  26. 1
    0
      Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
  27. 1
    0
      Marlin/src/config/examples/Formbot/Raptor/Configuration.h
  28. 1
    0
      Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h
  29. 1
    0
      Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
  30. 1
    0
      Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
  31. 1
    0
      Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
  32. 1
    0
      Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h
  33. 1
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
  34. 1
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
  35. 1
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
  36. 1
    0
      Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
  37. 1
    0
      Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
  38. 1
    0
      Marlin/src/config/examples/JGAurora/A5/Configuration.h
  39. 1
    0
      Marlin/src/config/examples/MakerParts/Configuration.h
  40. 1
    0
      Marlin/src/config/examples/Malyan/M150/Configuration.h
  41. 1
    0
      Marlin/src/config/examples/Malyan/M200/Configuration.h
  42. 1
    0
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  43. 1
    0
      Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
  44. 1
    0
      Marlin/src/config/examples/Mks/Sbase/Configuration.h
  45. 1
    0
      Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
  46. 1
    0
      Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
  47. 1
    0
      Marlin/src/config/examples/RigidBot/Configuration.h
  48. 1
    0
      Marlin/src/config/examples/SCARA/Configuration.h
  49. 1
    0
      Marlin/src/config/examples/STM32F10/Configuration.h
  50. 1
    0
      Marlin/src/config/examples/STM32F4/Configuration.h
  51. 1
    0
      Marlin/src/config/examples/Sanguinololu/Configuration.h
  52. 1
    0
      Marlin/src/config/examples/TheBorg/Configuration.h
  53. 1
    0
      Marlin/src/config/examples/TinyBoy2/Configuration.h
  54. 1
    0
      Marlin/src/config/examples/Tronxy/X1/Configuration.h
  55. 1
    0
      Marlin/src/config/examples/Tronxy/X3A/Configuration.h
  56. 1
    0
      Marlin/src/config/examples/Tronxy/X5S/Configuration.h
  57. 1
    0
      Marlin/src/config/examples/Tronxy/XY100/Configuration.h
  58. 1
    0
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  59. 1
    0
      Marlin/src/config/examples/Velleman/K8200/Configuration.h
  60. 1
    0
      Marlin/src/config/examples/Velleman/K8400/Configuration.h
  61. 1
    0
      Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
  62. 1
    0
      Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
  63. 1
    0
      Marlin/src/config/examples/adafruit/ST7565/Configuration.h
  64. 1
    0
      Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h
  65. 1
    0
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
  66. 1
    0
      Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
  67. 1
    0
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
  68. 1
    0
      Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
  69. 1
    0
      Marlin/src/config/examples/delta/generic/Configuration.h
  70. 1
    0
      Marlin/src/config/examples/delta/kossel_mini/Configuration.h
  71. 1
    0
      Marlin/src/config/examples/delta/kossel_pro/Configuration.h
  72. 1
    0
      Marlin/src/config/examples/delta/kossel_xl/Configuration.h
  73. 1
    0
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
  74. 1
    0
      Marlin/src/config/examples/makibox/Configuration.h
  75. 1
    0
      Marlin/src/config/examples/stm32f103ret6/Configuration.h
  76. 1
    0
      Marlin/src/config/examples/tvrrug/Round2/Configuration.h
  77. 1
    0
      Marlin/src/config/examples/wt150/Configuration.h
  78. 2
    2
      Marlin/src/feature/solenoid.cpp
  79. 1
    0
      Marlin/src/feature/solenoid.h
  80. 12
    3
      Marlin/src/gcode/control/M380_M381.cpp
  81. 2
    2
      Marlin/src/gcode/gcode.cpp
  82. 1
    1
      Marlin/src/gcode/gcode.h

+ 1
- 0
Marlin/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/default/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Anet/A2/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Anet/A2plus/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Anet/A6/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Anet/A8/Configuration.h View File

@@ -217,6 +217,7 @@
217 217
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
218 218
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
219 219
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
220
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
220 221
 #endif
221 222
 
222 223
 /**

+ 1
- 0
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/BQ/Hephestos/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h View File

@@ -224,6 +224,7 @@
224 224
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
225 225
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
226 226
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
227
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
227 228
 #endif
228 229
 
229 230
 /**

+ 1
- 0
Marlin/src/config/examples/BQ/WITBOX/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Cartesio/Configuration.h View File

@@ -217,6 +217,7 @@
217 217
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
218 218
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
219 219
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
220
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
220 221
 #endif
221 222
 
222 223
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/CR-10/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/CR-10S/Configuration.h View File

@@ -220,6 +220,7 @@
220 220
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
221 221
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
222 222
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
223
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
223 224
 #endif
224 225
 
225 226
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/CR-10mini/Configuration.h View File

@@ -225,6 +225,7 @@
225 225
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
226 226
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
227 227
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
228
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
228 229
 #endif
229 230
 
230 231
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/CR-8/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/Ender-2/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/Ender-3/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Creality/Ender-4/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Einstart-S/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Felix/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Felix/DUAL/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Formbot/Raptor/Configuration.h View File

@@ -257,6 +257,7 @@
257 257
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
258 258
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
259 259
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
260
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
260 261
 #endif
261 262
 
262 263
 /**

+ 1
- 0
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h View File

@@ -219,6 +219,7 @@
219 219
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
220 220
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
221 221
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
222
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
222 223
 #endif
223 224
 
224 225
 /**

+ 1
- 0
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h View File

@@ -220,6 +220,7 @@
220 220
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
221 221
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
222 222
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
223
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
223 224
 #endif
224 225
 
225 226
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/MeCreator2/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/JGAurora/A5/Configuration.h View File

@@ -221,6 +221,7 @@
221 221
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
222 222
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
223 223
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
224
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
224 225
 #endif
225 226
 
226 227
 /**

+ 1
- 0
Marlin/src/config/examples/MakerParts/Configuration.h View File

@@ -236,6 +236,7 @@
236 236
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
237 237
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
238 238
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
239
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
239 240
 #endif
240 241
 
241 242
 /**

+ 1
- 0
Marlin/src/config/examples/Malyan/M150/Configuration.h View File

@@ -221,6 +221,7 @@
221 221
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
222 222
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
223 223
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
224
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
224 225
 #endif
225 226
 
226 227
 /**

+ 1
- 0
Marlin/src/config/examples/Malyan/M200/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Mks/Sbase/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/RigidBot/Configuration.h View File

@@ -219,6 +219,7 @@
219 219
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
220 220
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
221 221
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
222
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
222 223
 #endif
223 224
 
224 225
 /**

+ 1
- 0
Marlin/src/config/examples/SCARA/Configuration.h View File

@@ -247,6 +247,7 @@
247 247
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
248 248
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
249 249
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
250
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
250 251
 #endif
251 252
 
252 253
 /**

+ 1
- 0
Marlin/src/config/examples/STM32F10/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/STM32F4/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Sanguinololu/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/TheBorg/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/TinyBoy2/Configuration.h View File

@@ -238,6 +238,7 @@
238 238
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
239 239
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
240 240
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
241
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
241 242
 #endif
242 243
 
243 244
 /**

+ 1
- 0
Marlin/src/config/examples/Tronxy/X1/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Tronxy/X3A/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Tronxy/X5S/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Tronxy/XY100/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Velleman/K8200/Configuration.h View File

@@ -236,6 +236,7 @@
236 236
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
237 237
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
238 238
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
239
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
239 240
 #endif
240 241
 
241 242
 /**

+ 1
- 0
Marlin/src/config/examples/Velleman/K8400/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/adafruit/ST7565/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration.h View File

@@ -229,6 +229,7 @@
229 229
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
230 230
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
231 231
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
232
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
232 233
 #endif
233 234
 
234 235
 /**

+ 1
- 0
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h View File

@@ -221,6 +221,7 @@
221 221
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
222 222
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
223 223
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
224
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
224 225
 #endif
225 226
 
226 227
 /**

+ 1
- 0
Marlin/src/config/examples/delta/generic/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

@@ -220,6 +220,7 @@
220 220
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
221 221
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
222 222
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
223
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
223 224
 #endif
224 225
 
225 226
 /**

+ 1
- 0
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h View File

@@ -221,6 +221,7 @@
221 221
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
222 222
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
223 223
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
224
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
224 225
 #endif
225 226
 
226 227
 /**

+ 1
- 0
Marlin/src/config/examples/makibox/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/stm32f103ret6/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/tvrrug/Round2/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 1
- 0
Marlin/src/config/examples/wt150/Configuration.h View File

@@ -216,6 +216,7 @@
216 216
   #define PARKING_EXTRUDER_PARKING_X { -78, 184 }     // X positions for parking the extruders
217 217
   #define PARKING_EXTRUDER_GRAB_DISTANCE 1            // mm to move beyond the parking point to grab the extruder
218 218
   #define PARKING_EXTRUDER_SECURITY_RAISE 5           // Z-raise before parking
219
+  //#define MANUAL_SOLENOID_CONTROL                   // Manual control of docking solenoids with M380 S / M381
219 220
 #endif
220 221
 
221 222
 /**

+ 2
- 2
Marlin/src/feature/solenoid.cpp View File

@@ -22,13 +22,13 @@
22 22
 
23 23
 #include "../inc/MarlinConfig.h"
24 24
 
25
-#if ENABLED(EXT_SOLENOID)
25
+#if ENABLED(EXT_SOLENOID) || ENABLED(MANUAL_SOLENOID_CONTROL)
26 26
 
27 27
 #include "solenoid.h"
28 28
 
29 29
 #include "../module/motion.h" // for active_extruder
30 30
 
31
-inline void enable_solenoid(const uint8_t num) {
31
+void enable_solenoid(const uint8_t num) {
32 32
   switch (num) {
33 33
     case 0:
34 34
       OUT_WRITE(SOL0_PIN, HIGH);

+ 1
- 0
Marlin/src/feature/solenoid.h View File

@@ -25,5 +25,6 @@
25 25
 
26 26
 void enable_solenoid_on_active_extruder();
27 27
 void disable_all_solenoids();
28
+void enable_solenoid(const uint8_t num);
28 29
 
29 30
 #endif // __SOLENOID_H__

+ 12
- 3
Marlin/src/gcode/control/M380_M381.cpp View File

@@ -22,19 +22,28 @@
22 22
 
23 23
 #include "../../inc/MarlinConfig.h"
24 24
 
25
-#if ENABLED(EXT_SOLENOID)
25
+#if ENABLED(EXT_SOLENOID) || ENABLED(MANUAL_SOLENOID_CONTROL)
26 26
 
27 27
 #include "../gcode.h"
28 28
 #include "../../feature/solenoid.h"
29
+#include "../../module/motion.h"
29 30
 
30 31
 /**
31 32
  * M380: Enable solenoid on the active extruder
33
+ *
34
+ *   S<index> to specify a solenoid (Requires MANUAL_SOLENOID_CONTROL)
32 35
  */
33
-void GcodeSuite::M380() { enable_solenoid_on_active_extruder(); }
36
+void GcodeSuite::M380() {
37
+  #if ENABLED(MANUAL_SOLENOID_CONTROL)
38
+    enable_solenoid(parser.seenval('S') ? parser.value_int() : active_extruder);
39
+  #else
40
+    enable_solenoid_on_active_extruder();
41
+  #endif
42
+}
34 43
 
35 44
 /**
36 45
  * M381: Disable all solenoids
37 46
  */
38 47
 void GcodeSuite::M381() { disable_all_solenoids(); }
39 48
 
40
-#endif // EXT_SOLENOID
49
+#endif // EXT_SOLENOID || MANUAL_SOLENOID_CONTROL

+ 2
- 2
Marlin/src/gcode/gcode.cpp View File

@@ -549,8 +549,8 @@ void GcodeSuite::process_parsed_command(
549 549
         case 364: if (M364()) return; break;                      // M364: SCARA Psi pos3 (90 deg to Theta)
550 550
       #endif
551 551
 
552
-      #if ENABLED(EXT_SOLENOID)
553
-        case 380: M380(); break;                                  // M380: Activate solenoid on active extruder
552
+      #if ENABLED(EXT_SOLENOID) || ENABLED(MANUAL_SOLENOID_CONTROL)
553
+        case 380: M380(); break;                                  // M380: Activate solenoid on active (or specified) extruder
554 554
         case 381: M381(); break;                                  // M381: Disable all solenoids
555 555
       #endif
556 556
 

+ 1
- 1
Marlin/src/gcode/gcode.h View File

@@ -687,7 +687,7 @@ private:
687 687
     static bool M364();
688 688
   #endif
689 689
 
690
-  #if ENABLED(EXT_SOLENOID)
690
+  #if ENABLED(EXT_SOLENOID) || ENABLED(MANUAL_SOLENOID_CONTROL)
691 691
     static void M380();
692 692
     static void M381();
693 693
   #endif

Loading…
Cancel
Save