From 4e72df9a28aeddd3a4e51fc031b602eda2bd0a4b Mon Sep 17 00:00:00 2001
From: Salvatore Bramante <salvatore.bramante@yahoo.it>
Date: Tue, 18 Jan 2022 10:09:06 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20Octopus=20v1.x=20probe=20p?=
 =?UTF-8?q?in=20(#23548)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h  | 4 ++++
 Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
index fd367e87c0..dd8812fe2a 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h
@@ -37,4 +37,8 @@
   #define TEMP_0_PIN                        PF4   // TH0
 #endif
 
+#if !defined(Z_MIN_PROBE_PIN) && DISABLED(BLTOUCH)
+  #define Z_MIN_PROBE_PIN                   PC5   // Probe (Proximity switch) port
+#endif
+
 #include "pins_BTT_OCTOPUS_V1_common.h"
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 04a7d9e0b4..8652a815c2 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -61,11 +61,7 @@
 // Z Probe (when not Z_MIN_PIN)
 //
 #ifndef Z_MIN_PROBE_PIN
-  #if ENABLED(BLTOUCH)
-    #define Z_MIN_PROBE_PIN                 PB7
-  #else
-    #define Z_MIN_PROBE_PIN                 PC5   // Probe (Proximity switch) port
-  #endif
+  #define Z_MIN_PROBE_PIN                   PB7
 #endif
 
 //