From 5de565fa4fef47999e926a9fd7eb1e65ed92074f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 24 Dec 2023 21:55:13 -0600 Subject: [PATCH 1/2] use TEMP_SENSOR_0_IS_MAX31865 --- Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h | 2 +- Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h | 2 +- 2 files changed, 2 insertions(+), 2 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 dd8812fe2af9..dafe336733ea 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 @@ -26,7 +26,7 @@ // // Temperature Sensors // -#if TEMP_SENSOR_0 == -5 +#if TEMP_SENSOR_0_IS_MAX31865 #define TEMP_0_CS_PIN PF8 // Max31865 CS #define TEMP_0_SCK_PIN PA5 #define TEMP_0_MISO_PIN PA6 diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h index 82216dec170f..47823569b500 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h @@ -218,7 +218,7 @@ #define TEMP_2_PIN PF6 // TH2 #define TEMP_3_PIN PF7 // TH3 -#if TEMP_SENSOR_0 == -5 +#if TEMP_SENSOR_0_IS_MAX31865 #define TEMP_0_CS_PIN PF8 // Max31865 CS #define TEMP_0_SCK_PIN PA5 #define TEMP_0_MISO_PIN PA6 From 51a7dea14f95d6d3aff990d44a83327138cfdb83 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 24 Dec 2023 21:59:01 -0600 Subject: [PATCH 2/2] keep temp pins defined (?) --- Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_PRO_V1_0.h | 4 ++-- Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h | 3 +-- 2 files changed, 3 insertions(+), 4 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 dafe336733ea..72a6db73354e 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 @@ -26,6 +26,8 @@ // // Temperature Sensors // +#define TEMP_0_PIN PF4 // TH0 + #if TEMP_SENSOR_0_IS_MAX31865 #define TEMP_0_CS_PIN PF8 // Max31865 CS #define TEMP_0_SCK_PIN PA5 @@ -33,8 +35,6 @@ #define TEMP_0_MOSI_PIN PA7 #define SOFTWARE_SPI // Max31865 and LCD SD share a set of SPIs, Set SD to softwareSPI for Max31865 #define FORCE_SOFT_SPI -#else - #define TEMP_0_PIN PF4 // TH0 #endif #if !defined(Z_MIN_PROBE_PIN) && DISABLED(BLTOUCH) diff --git a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h index 47823569b500..43b3d6852237 100644 --- a/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h +++ b/Marlin/src/pins/stm32h7/pins_BTT_OCTOPUS_PRO_V1_common.h @@ -214,6 +214,7 @@ // Temperature Sensors // #define TEMP_BED_PIN PF3 // TB +#define TEMP_0_PIN PF4 // TH0 #define TEMP_1_PIN PF5 // TH1 #define TEMP_2_PIN PF6 // TH2 #define TEMP_3_PIN PF7 // TH3 @@ -225,8 +226,6 @@ #define TEMP_0_MOSI_PIN PA7 #define SOFTWARE_SPI // Max31865 and LCD SD share a set of SPIs, Set SD to softwareSPI for Max31865 #define FORCE_SOFT_SPI -#else - #define TEMP_0_PIN PF4 // TH0 #endif //