Update probe inputs for AUX claiming code

dresco · Jul 8, 2024 · dccdbdb · dccdbdb
1 parent 303eea3
commit dccdbdb
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 20 deletions.
diff --git a/Inc/btt_octopus_max_map.h b/Inc/btt_octopus_max_map.h
@@ -157,16 +157,20 @@
 #define AUXINPUT0_PORT              GPIOF
 #define AUXINPUT0_PIN               12      // PWR-DET
 
+#define AUXINPUT1_PORT              GPIOB
+#define AUXINPUT1_PIN               15      // Z probe
+
 #if SAFETY_DOOR_ENABLE
 #define SAFETY_DOOR_PORT            AUXINPUT0_PORT
 #define SAFETY_DOOR_PIN             AUXINPUT0_PIN
 #endif
 
-#define CONTROL_INMODE              GPIO_SINGLE
+#if PROBE_ENABLE
+#define PROBE_PORT                  AUXINPUT1_PORT
+#define PROBE_PIN                   AUXINPUT1_PIN
+#endif
 
-// Define probe switch input pin.
-#define PROBE_PORT                  GPIOB
-#define PROBE_PIN                   15      // Z probe
+#define CONTROL_INMODE              GPIO_SINGLE
 
 #if TRINAMIC_UART_ENABLE
 

diff --git a/Inc/btt_skr_v3.0_map.h b/Inc/btt_skr_v3.0_map.h
@@ -138,16 +138,20 @@
 #define AUXINPUT0_PORT              GPIOA
 #define AUXINPUT0_PIN               7                           // EXP2 - PA7, pin 5
 
+#define AUXINPUT1_PORT              GPIOC
+#define AUXINPUT1_PIN               13                          // Z probe
+
 #if SAFETY_DOOR_ENABLE
 #define SAFETY_DOOR_PORT            AUXINPUT0_PORT
 #define SAFETY_DOOR_PIN             AUXINPUT0_PIN
 #endif
 
-#define CONTROL_INMODE              GPIO_SINGLE
+#if PROBE_ENABLE
+#define PROBE_PORT                  AUXINPUT1_PORT
+#define PROBE_PIN                   AUXINPUT1_PIN
+#endif
 
-// Define probe switch input pin.
-#define PROBE_PORT                  GPIOC
-#define PROBE_PIN                   13                         // Z probe
+#define CONTROL_INMODE              GPIO_SINGLE
 
 #if TRINAMIC_UART_ENABLE
 

diff --git a/Inc/dresco_octave_map.h b/Inc/dresco_octave_map.h
@@ -193,22 +193,26 @@
 #define AUXINPUT2_PIN               13
 #define AUXINPUT3_PORT              GPIOD
 #define AUXINPUT3_PIN               10
-#define AUXINPUT4_PORT              GPIOF
-#define AUXINPUT4_PIN               0
+#define AUXINPUT4_PORT              GPIOD
+#define AUXINPUT4_PIN               12
+#define AUXINPUT5_PORT              GPIOF
+#define AUXINPUT5_PIN               0
 
 #if SAFETY_DOOR_ENABLE
 #define SAFETY_DOOR_PORT            AUXINPUT0_PORT
 #define SAFETY_DOOR_PIN             AUXINPUT0_PIN
 #endif
 
-#if MOTOR_FAULT_ENABLE
-#define MOTOR_FAULT_PORT            AUXINPUT4_PORT
-#define MOTOR_FAULT_PIN             AUXINPUT4_PIN
+// Define probe switch input pin.
+#if PROBE_ENABLE
+#define PROBE_PORT                  AUXINPUT4_PORT
+#define PROBE_PIN                   AUXINPUT4_PIN
 #endif
 
-// Define probe switch input pin.
-#define PROBE_PORT                  GPIOD
-#define PROBE_PIN                   12
+#if MOTOR_FAULT_ENABLE
+#define MOTOR_FAULT_PORT            AUXINPUT5_PORT
+#define MOTOR_FAULT_PIN             AUXINPUT5_PIN
+#endif
 
 // Spindle encoder pins.
 #if SPINDLE_ENCODER_ENABLE

diff --git a/Inc/weact_mini_map.h b/Inc/weact_mini_map.h
@@ -112,16 +112,20 @@
 #define AUXINPUT0_PORT              GPIOA
 #define AUXINPUT0_PIN               7
 
+#define AUXINPUT1_PORT              GPIOA
+#define AUXINPUT1_PIN               15
+
 #if SAFETY_DOOR_ENABLE
 #define SAFETY_DOOR_PORT            AUXINPUT0_PORT
 #define SAFETY_DOOR_PIN             AUXINPUT0_PIN
 #endif
 
-#define CONTROL_INMODE              GPIO_SINGLE
+#if PROBE_ENABLE
+#define PROBE_PORT                  AUXINPUT1_PORT
+#define PROBE_PIN                   AUXINPUT1_PIN
+#endif
 
-// Define probe switch input pin.
-#define PROBE_PORT                  GPIOA
-#define PROBE_PIN                   15                         // Z probe
+#define CONTROL_INMODE              GPIO_SINGLE
 
 #if TRINAMIC_UART_ENABLE