🐛 Fix redundant heater / sensor pin assignments (#22309)

This commit is contained in:
InsanityAutomation 2021-07-08 00:41:33 -04:00 committed by Scott Lahteine
parent 5026797310
commit a35c234ce1
7 changed files with 8 additions and 8 deletions

View File

@ -192,7 +192,7 @@
#else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE") #else // Non-specific are "EFB" (i.e., "EFBF" or "EFBE")
#define FAN_PIN RAMPS_D9_PIN #define FAN_PIN RAMPS_D9_PIN
#define HEATER_BED_PIN RAMPS_D8_PIN #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#define FAN1_PIN MOSFET_D_PIN #define FAN1_PIN MOSFET_D_PIN
#else #else
#define HEATER_1_PIN MOSFET_D_PIN #define HEATER_1_PIN MOSFET_D_PIN

View File

@ -65,7 +65,7 @@
#define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN #define TEMP_BED_PIN P0_23_A0 // A0 (T0) - (67) - TEMP_BED_PIN
#endif #endif
#if HOTENDS == 1 #if HOTENDS == 1 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
#if TEMP_SENSOR_PROBE #if TEMP_SENSOR_PROBE
#define TEMP_PROBE_PIN TEMP_1_PIN #define TEMP_PROBE_PIN TEMP_1_PIN
#elif TEMP_SENSOR_CHAMBER #elif TEMP_SENSOR_CHAMBER
@ -79,7 +79,7 @@
#ifndef HEATER_0_PIN #ifndef HEATER_0_PIN
#define HEATER_0_PIN P2_07 #define HEATER_0_PIN P2_07
#endif #endif
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#ifndef FAN1_PIN #ifndef FAN1_PIN
#define FAN1_PIN P2_04 #define FAN1_PIN P2_04
#endif #endif

View File

@ -202,7 +202,7 @@
// //
#define HEATER_BED_PIN P2_05 #define HEATER_BED_PIN P2_05
#define HEATER_0_PIN P2_07 #define HEATER_0_PIN P2_07
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#ifndef FAN1_PIN #ifndef FAN1_PIN
#define FAN1_PIN P2_06 #define FAN1_PIN P2_06
#endif #endif

View File

@ -217,7 +217,7 @@
#define FAN1_PIN RAMPS_D8_PIN #define FAN1_PIN RAMPS_D8_PIN
#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE") #elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
#define HEATER_BED_PIN RAMPS_D8_PIN #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#define FAN1_PIN MOSFET_D_PIN #define FAN1_PIN MOSFET_D_PIN
#else #else
#define HEATER_1_PIN MOSFET_D_PIN #define HEATER_1_PIN MOSFET_D_PIN

View File

@ -219,7 +219,7 @@
#define FAN1_PIN RAMPS_D8_PIN #define FAN1_PIN RAMPS_D8_PIN
#elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE") #elif DISABLED(IS_RAMPS_SF) // Not Spindle, Fan (i.e., "EFBF" or "EFBE")
#define HEATER_BED_PIN RAMPS_D8_PIN #define HEATER_BED_PIN RAMPS_D8_PIN
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#define FAN1_PIN MOSFET_D_PIN #define FAN1_PIN MOSFET_D_PIN
#else #else
#define HEATER_1_PIN MOSFET_D_PIN #define HEATER_1_PIN MOSFET_D_PIN

View File

@ -105,7 +105,7 @@
#ifndef HEATER_0_PIN #ifndef HEATER_0_PIN
#define HEATER_0_PIN PC3 #define HEATER_0_PIN PC3
#endif #endif
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#ifndef FAN1_PIN #ifndef FAN1_PIN
#define FAN1_PIN PB0 #define FAN1_PIN PB0
#endif #endif

View File

@ -210,7 +210,7 @@
#define TEMP_0_PIN PA2 // TH0 #define TEMP_0_PIN PA2 // TH0
#define TEMP_1_PIN PA3 // TH1 #define TEMP_1_PIN PA3 // TH1
#if HOTENDS == 1 #if HOTENDS == 1 && DISABLED(HEATERS_PARALLEL)
#if TEMP_SENSOR_PROBE #if TEMP_SENSOR_PROBE
#define TEMP_PROBE_PIN TEMP_1_PIN #define TEMP_PROBE_PIN TEMP_1_PIN
#elif TEMP_SENSOR_CHAMBER #elif TEMP_SENSOR_CHAMBER