From b0a400da72f6752619a82246fac55a07a4e67f3c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 22 Mar 2022 18:14:17 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20No=20PE=5FMAGNET=5FON=5FSTATE=20?=
 =?UTF-8?q?without=20PARKING=5FEXTRUDER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/feature/solenoid.cpp        | 18 ++++++------------
 Marlin/src/feature/solenoid.h          |  1 -
 Marlin/src/gcode/control/M380_M381.cpp |  2 +-
 Marlin/src/gcode/gcode.h               |  4 ++--
 Marlin/src/module/tool_change.cpp      |  2 +-
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Marlin/src/feature/solenoid.cpp b/Marlin/src/feature/solenoid.cpp
index b6795d1a1e..f78a529280 100644
--- a/Marlin/src/feature/solenoid.cpp
+++ b/Marlin/src/feature/solenoid.cpp
@@ -27,17 +27,11 @@
 #include "solenoid.h"
 
 #include "../module/motion.h" // for active_extruder
-
-// PARKING_EXTRUDER options alter the default behavior of solenoids, this ensures compliance of M380-381
-
-#if ENABLED(PARKING_EXTRUDER)
-  #include "../module/tool_change.h"
-#endif
+#include "../module/tool_change.h"
 
 // Used primarily with MANUAL_SOLENOID_CONTROL
-static void set_solenoid(const uint8_t num, const bool active) {
-  const uint8_t value = active ? PE_MAGNET_ON_STATE : !PE_MAGNET_ON_STATE;
-  #define _SOL_CASE(N) case N: TERN_(HAS_SOLENOID_##N, OUT_WRITE(SOL##N##_PIN, value)); break;
+static void set_solenoid(const uint8_t num, const uint8_t state) {
+  #define _SOL_CASE(N) case N: TERN_(HAS_SOLENOID_##N, OUT_WRITE(SOL##N##_PIN, state)); break;
   switch (num) {
     REPEAT(8, _SOL_CASE)
     default: SERIAL_ECHO_MSG(STR_INVALID_SOLENOID); break;
@@ -49,9 +43,9 @@ static void set_solenoid(const uint8_t num, const bool active) {
   #endif
 }
 
-void enable_solenoid(const uint8_t num) { set_solenoid(num, true); }
-void disable_solenoid(const uint8_t num) { set_solenoid(num, false); }
-void enable_solenoid_on_active_extruder() {  }
+// PARKING_EXTRUDER options alter the default behavior of solenoids to ensure compliance of M380-381
+void  enable_solenoid(const uint8_t num) { set_solenoid(num, TERN1(PARKING_EXTRUDER,  PE_MAGNET_ON_STATE)); }
+void disable_solenoid(const uint8_t num) { set_solenoid(num, TERN0(PARKING_EXTRUDER, !PE_MAGNET_ON_STATE)); }
 
 void disable_all_solenoids() {
   #define _SOL_DISABLE(N) TERN_(HAS_SOLENOID_##N, disable_solenoid(N));
diff --git a/Marlin/src/feature/solenoid.h b/Marlin/src/feature/solenoid.h
index 2ba4983fb0..3131aeb868 100644
--- a/Marlin/src/feature/solenoid.h
+++ b/Marlin/src/feature/solenoid.h
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-void enable_solenoid_on_active_extruder();
 void disable_all_solenoids();
 void enable_solenoid(const uint8_t num);
 void disable_solenoid(const uint8_t num);
diff --git a/Marlin/src/gcode/control/M380_M381.cpp b/Marlin/src/gcode/control/M380_M381.cpp
index 3f5b252465..6bcec891e2 100644
--- a/Marlin/src/gcode/control/M380_M381.cpp
+++ b/Marlin/src/gcode/control/M380_M381.cpp
@@ -37,7 +37,7 @@ void GcodeSuite::M380() {
   #if ENABLED(MANUAL_SOLENOID_CONTROL)
     enable_solenoid(parser.intval('S', active_extruder));
   #else
-    enable_solenoid_on_active_extruder();
+    enable_solenoid(active_extruder);
   #endif
 }
 
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 6e331c1273..61fe6cb9d9 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -219,8 +219,8 @@
  * M350 - Set microstepping mode. (Requires digital microstepping pins.)
  * M351 - Toggle MS1 MS2 pins directly. (Requires digital microstepping pins.)
  * M355 - Set Case Light on/off and set brightness. (Requires CASE_LIGHT_PIN)
- * M380 - Activate solenoid on active extruder. (Requires EXT_SOLENOID)
- * M381 - Disable all solenoids. (Requires EXT_SOLENOID)
+ * M380 - Activate solenoid on active tool (Requires EXT_SOLENOID) or the tool specified by 'S' (Requires MANUAL_SOLENOID_CONTROL).
+ * M381 - Disable solenoids on all tools (Requires EXT_SOLENOID) or the tool specified by 'S' (Requires MANUAL_SOLENOID_CONTROL).
  * M400 - Finish all moves.
  * M401 - Deploy and activate Z probe. (Requires a probe)
  * M402 - Deactivate and stow Z probe. (Requires a probe)
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index f2767f2b5b..ceed05dcf3 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -1292,7 +1292,7 @@ void tool_change(const uint8_t new_tool, bool no_move/*=false*/) {
 
     #if ENABLED(EXT_SOLENOID) && DISABLED(PARKING_EXTRUDER)
       disable_all_solenoids();
-      enable_solenoid_on_active_extruder();
+      enable_solenoid(active_extruder);
     #endif
 
     #if HAS_PRUSA_MMU1