attempt simplifications

MarlinFirmware · Jan 3, 2022 · 2606efe · 2606efe
1 parent 35ab1a3
commit 2606efe
Show file tree

Hide file tree

Showing 40 changed files with 742 additions and 1,138 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1025,20 +1025,12 @@
 // See https://marlinfw.org/docs/configuration/probes.html
 //
 
-/**
- * Enable this option for a probe connected to the Z-MIN pin.
- * The probe replaces the Z-MIN endstop and is used for Z homing.
- * (Automatically enables USE_PROBE_FOR_Z_HOMING.)
- */
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
-
 // Force the use of the probe for Z-axis homing
 //#define USE_PROBE_FOR_Z_HOMING
 
 /**
  * Z_MIN_PROBE_PIN
  *
- * Define this pin if the probe is not connected to Z_MIN_PIN.
  * If not defined the default pin for the selected MOTHERBOARD
  * will be used. Most of the time the default is what you want.
  *
@@ -1050,7 +1042,7 @@
  *      - normally-closed switches to GND and D32.
  *      - normally-open switches to 5V and D32.
  */
-//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default
+//#define Z_MIN_PROBE_PIN Z_MIN_PIN   // Override the default pin, if needed
 
 /**
  * Probe Type

diff --git a/Marlin/src/HAL/AVR/endstop_interrupts.h b/Marlin/src/HAL/AVR/endstop_interrupts.h
@@ -120,186 +120,83 @@ void pciSetup(const int8_t pin) {
 
 void setup_endstop_interrupts() {
   #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  #if HAS_X_MAX
-    #if (digitalPinToInterrupt(X_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(X_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(X_MAX_PIN), "X_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(X_MAX_PIN);
-    #endif
-  #endif
-  #if HAS_X_MIN
-    #if (digitalPinToInterrupt(X_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(X_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(X_MIN_PIN), "X_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(X_MIN_PIN);
-    #endif
-  #endif
-  #if HAS_Y_MAX
-    #if (digitalPinToInterrupt(Y_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Y_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Y_MAX_PIN), "Y_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Y_MAX_PIN);
-    #endif
-  #endif
-  #if HAS_Y_MIN
-    #if (digitalPinToInterrupt(Y_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Y_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Y_MIN_PIN), "Y_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Y_MIN_PIN);
-    #endif
-  #endif
-  #if HAS_Z_MAX
-    #if (digitalPinToInterrupt(Z_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z_MAX_PIN), "Z_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z_MAX_PIN);
-    #endif
-  #endif
-  #if HAS_Z_MIN
-    #if (digitalPinToInterrupt(Z_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z_MIN_PIN), "Z_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z_MIN_PIN);
-    #endif
-  #endif
-  #if HAS_I_MAX
-    #if (digitalPinToInterrupt(I_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(I_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(I_MAX_PIN), "I_MAX_PIN is not interrupt-capable");
-      pciSetup(I_MAX_PIN);
-    #endif
-  #elif HAS_I_MIN
-    #if (digitalPinToInterrupt(I_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(I_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(I_MIN_PIN), "I_MIN_PIN is not interrupt-capable");
-      pciSetup(I_MIN_PIN);
-    #endif
-  #endif
-  #if HAS_J_MAX
-    #if (digitalPinToInterrupt(J_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(J_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(J_MAX_PIN), "J_MAX_PIN is not interrupt-capable");
-      pciSetup(J_MAX_PIN);
-    #endif
-  #elif HAS_J_MIN
-    #if (digitalPinToInterrupt(J_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(J_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(J_MIN_PIN), "J_MIN_PIN is not interrupt-capable");
-      pciSetup(J_MIN_PIN);
-    #endif
-  #endif
-  #if HAS_K_MAX
-    #if (digitalPinToInterrupt(K_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(K_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(K_MAX_PIN), "K_MAX_PIN is not interrupt-capable");
-      pciSetup(K_MAX_PIN);
-    #endif
-  #elif HAS_K_MIN
-    #if (digitalPinToInterrupt(K_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(K_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(K_MIN_PIN), "K_MIN_PIN is not interrupt-capable");
-      pciSetup(K_MIN_PIN);
-    #endif
+  #define TRY_TO_ATTACH(P) do{ \
+    if (digitalPinToInterrupt(P) != NOT_AN_INTERRUPT) \
+      _ATTACH(P); \
+    else { \
+      static_assert(digitalPinHasPCICR(P), #P " is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue."); \
+      pciSetup(P); \
+    } }while(0)
+
+  #if X_HOME_TO_MAX
+    TRY_TO_ATTACH(X_MAX_PIN);
+  #elif X_HOME_TO_MIN
+    TRY_TO_ATTACH(X_MIN_PIN);
   #endif
+
   #if HAS_X2_MAX
-    #if (digitalPinToInterrupt(X2_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(X2_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(X2_MAX_PIN), "X2_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(X2_MAX_PIN);
-    #endif
+    TRY_TO_ATTACH(X2_MAX_PIN);
   #endif
   #if HAS_X2_MIN
-    #if (digitalPinToInterrupt(X2_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(X2_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(X2_MIN_PIN), "X2_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(X2_MIN_PIN);
-    #endif
+    TRY_TO_ATTACH(X2_MIN_PIN);
   #endif
+
+  #if Y_HOME_TO_MAX
+    TRY_TO_ATTACH(Y_MAX_PIN);
+  #elif Y_HOME_TO_MIN
+    TRY_TO_ATTACH(Y_MIN_PIN);
+  #endif
+
   #if HAS_Y2_MAX
-    #if (digitalPinToInterrupt(Y2_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Y2_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Y2_MAX_PIN), "Y2_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Y2_MAX_PIN);
-    #endif
+    TRY_TO_ATTACH(Y2_MAX_PIN);
+  #elif HAS_Y2_MIN
+    TRY_TO_ATTACH(Y2_MIN_PIN);
   #endif
-  #if HAS_Y2_MIN
-    #if (digitalPinToInterrupt(Y2_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Y2_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Y2_MIN_PIN), "Y2_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Y2_MIN_PIN);
-    #endif
+
+  #if Z_HOME_TO_MAX
+    TRY_TO_ATTACH(Z_MAX_PIN);
+  #elif Z_HOME_TO_MIN
+    TRY_TO_ATTACH(Z_MIN_PIN);
   #endif
+
   #if HAS_Z2_MAX
-    #if (digitalPinToInterrupt(Z2_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z2_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z2_MAX_PIN), "Z2_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z2_MAX_PIN);
-    #endif
-  #endif
-  #if HAS_Z2_MIN
-    #if (digitalPinToInterrupt(Z2_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z2_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z2_MIN_PIN), "Z2_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z2_MIN_PIN);
-    #endif
+    TRY_TO_ATTACH(Z2_MAX_PIN);
+  #elif HAS_Z2_MIN
+    TRY_TO_ATTACH(Z2_MIN_PIN);
   #endif
+
   #if HAS_Z3_MAX
-    #if (digitalPinToInterrupt(Z3_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z3_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z3_MAX_PIN), "Z3_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z3_MAX_PIN);
-    #endif
-  #endif
-  #if HAS_Z3_MIN
-    #if (digitalPinToInterrupt(Z3_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z3_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z3_MIN_PIN), "Z3_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z3_MIN_PIN);
-    #endif
+    TRY_TO_ATTACH(Z3_MAX_PIN);
+  #elif HAS_Z3_MIN
+    TRY_TO_ATTACH(Z3_MIN_PIN);
   #endif
+
   #if HAS_Z4_MAX
-    #if (digitalPinToInterrupt(Z4_MAX_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z4_MAX_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z4_MAX_PIN), "Z4_MAX_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z4_MAX_PIN);
-    #endif
+    TRY_TO_ATTACH(Z4_MAX_PIN);
+  #elif HAS_Z4_MIN
+    TRY_TO_ATTACH(Z4_MIN_PIN);
   #endif
-  #if HAS_Z4_MIN
-    #if (digitalPinToInterrupt(Z4_MIN_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z4_MIN_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z4_MIN_PIN), "Z4_MIN_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z4_MIN_PIN);
-    #endif
+
+  #if I_HOME_TO_MAX
+    TRY_TO_ATTACH(I_MAX_PIN);
+  #elif I_HOME_TO_MIN
+    TRY_TO_ATTACH(I_MIN_PIN);
+  #endif
+
+  #if J_HOME_TO_MAX
+    TRY_TO_ATTACH(J_MAX_PIN);
+  #elif J_HOME_TO_MIN
+    TRY_TO_ATTACH(J_MIN_PIN);
   #endif
+
+  #if K_HOME_TO_MAX
+    TRY_TO_ATTACH(K_MAX_PIN);
+  #elif K_HOME_TO_MIN
+    TRY_TO_ATTACH(K_MIN_PIN);
+  #endif
+
   #if HAS_Z_MIN_PROBE_PIN
-    #if (digitalPinToInterrupt(Z_MIN_PROBE_PIN) != NOT_AN_INTERRUPT)
-      _ATTACH(Z_MIN_PROBE_PIN);
-    #else
-      static_assert(digitalPinHasPCICR(Z_MIN_PROBE_PIN), "Z_MIN_PROBE_PIN is not interrupt-capable. Disable ENDSTOP_INTERRUPTS_FEATURE to continue.");
-      pciSetup(Z_MIN_PROBE_PIN);
-    #endif
+    TRY_TO_ATTACH(Z_MIN_PROBE_PIN);
   #endif
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
 }
diff --git a/Marlin/src/HAL/DUE/endstop_interrupts.h b/Marlin/src/HAL/DUE/endstop_interrupts.h
@@ -47,27 +47,27 @@ void endstop_ISR() { endstops.update(); }
 
 void setup_endstop_interrupts() {
   #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  TERN_(HAS_X_MAX, _ATTACH(X_MAX_PIN));
-  TERN_(HAS_X_MIN, _ATTACH(X_MIN_PIN));
-  TERN_(HAS_Y_MAX, _ATTACH(Y_MAX_PIN));
-  TERN_(HAS_Y_MIN, _ATTACH(Y_MIN_PIN));
-  TERN_(HAS_Z_MAX, _ATTACH(Z_MAX_PIN));
-  TERN_(HAS_Z_MIN, _ATTACH(Z_MIN_PIN));
+  TERN_(X_HOME_TO_MAX, _ATTACH(X_MAX_PIN));
+  TERN_(X_HOME_TO_MIN, _ATTACH(X_MIN_PIN));
   TERN_(HAS_X2_MAX, _ATTACH(X2_MAX_PIN));
   TERN_(HAS_X2_MIN, _ATTACH(X2_MIN_PIN));
+  TERN_(Y_HOME_TO_MAX, _ATTACH(Y_MAX_PIN));
+  TERN_(Y_HOME_TO_MIN, _ATTACH(Y_MIN_PIN));
   TERN_(HAS_Y2_MAX, _ATTACH(Y2_MAX_PIN));
   TERN_(HAS_Y2_MIN, _ATTACH(Y2_MIN_PIN));
+  TERN_(Z_HOME_TO_MAX, _ATTACH(Z_MAX_PIN));
+  TERN_(Z_HOME_TO_MIN, _ATTACH(Z_MIN_PIN));
   TERN_(HAS_Z2_MAX, _ATTACH(Z2_MAX_PIN));
   TERN_(HAS_Z2_MIN, _ATTACH(Z2_MIN_PIN));
   TERN_(HAS_Z3_MAX, _ATTACH(Z3_MAX_PIN));
   TERN_(HAS_Z3_MIN, _ATTACH(Z3_MIN_PIN));
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
+  TERN_(I_HOME_TO_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(I_HOME_TO_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(J_HOME_TO_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(J_HOME_TO_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(K_HOME_TO_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(K_HOME_TO_MIN, _ATTACH(K_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
-  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
-  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
-  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
-  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
-  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
-  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }
diff --git a/Marlin/src/HAL/ESP32/endstop_interrupts.h b/Marlin/src/HAL/ESP32/endstop_interrupts.h
@@ -42,12 +42,12 @@ void ICACHE_RAM_ATTR endstop_ISR() { endstops.update(); }
 
 void setup_endstop_interrupts() {
   #define _ATTACH(P) attachInterrupt(digitalPinToInterrupt(P), endstop_ISR, CHANGE)
-  TERN_(HAS_X_MAX, _ATTACH(X_MAX_PIN));
-  TERN_(HAS_X_MIN, _ATTACH(X_MIN_PIN));
-  TERN_(HAS_Y_MAX, _ATTACH(Y_MAX_PIN));
-  TERN_(HAS_Y_MIN, _ATTACH(Y_MIN_PIN));
-  TERN_(HAS_Z_MAX, _ATTACH(Z_MAX_PIN));
-  TERN_(HAS_Z_MIN, _ATTACH(Z_MIN_PIN));
+  TERN_(X_HOME_TO_MAX, _ATTACH(X_MAX_PIN));
+  TERN_(X_HOME_TO_MIN, _ATTACH(X_MIN_PIN));
+  TERN_(Y_HOME_TO_MAX, _ATTACH(Y_MAX_PIN));
+  TERN_(Y_HOME_TO_MIN, _ATTACH(Y_MIN_PIN));
+  TERN_(Z_HOME_TO_MAX, _ATTACH(Z_MAX_PIN));
+  TERN_(Z_HOME_TO_MIN, _ATTACH(Z_MIN_PIN));
   TERN_(HAS_X2_MAX, _ATTACH(X2_MAX_PIN));
   TERN_(HAS_X2_MIN, _ATTACH(X2_MIN_PIN));
   TERN_(HAS_Y2_MAX, _ATTACH(Y2_MAX_PIN));
@@ -58,11 +58,11 @@ void setup_endstop_interrupts() {
   TERN_(HAS_Z3_MIN, _ATTACH(Z3_MIN_PIN));
   TERN_(HAS_Z4_MAX, _ATTACH(Z4_MAX_PIN));
   TERN_(HAS_Z4_MIN, _ATTACH(Z4_MIN_PIN));
+  TERN_(I_HOME_TO_MAX, _ATTACH(I_MAX_PIN));
+  TERN_(I_HOME_TO_MIN, _ATTACH(I_MIN_PIN));
+  TERN_(J_HOME_TO_MAX, _ATTACH(J_MAX_PIN));
+  TERN_(J_HOME_TO_MIN, _ATTACH(J_MIN_PIN));
+  TERN_(K_HOME_TO_MAX, _ATTACH(K_MAX_PIN));
+  TERN_(K_HOME_TO_MIN, _ATTACH(K_MIN_PIN));
   TERN_(HAS_Z_MIN_PROBE_PIN, _ATTACH(Z_MIN_PROBE_PIN));
-  TERN_(HAS_I_MAX, _ATTACH(I_MAX_PIN));
-  TERN_(HAS_I_MIN, _ATTACH(I_MIN_PIN));
-  TERN_(HAS_J_MAX, _ATTACH(J_MAX_PIN));
-  TERN_(HAS_J_MIN, _ATTACH(J_MIN_PIN));
-  TERN_(HAS_K_MAX, _ATTACH(K_MAX_PIN));
-  TERN_(HAS_K_MIN, _ATTACH(K_MIN_PIN));
 }