Use the common pattern for auto fan pins

Now that pins.h is guaranteed included after configs.
2020-04-16 03:24:41 -05:00
parent 3a9f8a00bf
commit 03020dd31e
33 changed files with 245 additions and 132 deletions
--- a/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
+++ b/Marlin/src/pins/stm32f4/pins_GENERIC_STM32F4.h
@ -126,7 +126,9 @@
 #define FAN1_PIN                            PC7
 #define FAN2_PIN                            PC8

-#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                   PC7
+#endif

 //
 // Misc. Functions
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@ -115,7 +115,9 @@
 #define FAN1_PIN                            PF6
 #define FAN2_PIN                            PF7

-#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                   PF6
+#endif

 //
 // LED / Lighting
--- a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
+++ b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@ -107,12 +107,14 @@
 #define HEATER_BED_PIN                      PA2

 #ifndef FAN_PIN
-//  #define FAN_PIN        PC15
+  //#define FAN_PIN                         PC15
 #endif
 #define FAN1_PIN                            PC15
 #define FAN2_PIN                            PA0

-#define ORIG_E0_AUTO_FAN_PIN                PC15  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                   PC15  // FAN1_PIN
+#endif

 //
 // Prusa i3 MK2 Multi Material Multiplexer Support
--- a/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
+++ b/Marlin/src/pins/stm32f4/pins_STEVAL_3DP001V1.h
@ -166,9 +166,12 @@

 #define FAN_PIN                               57  // PC4   E1_FAN   PWM pin, Part cooling fan FET
 #define FAN1_PIN                              58  // PC5   E2_FAN   PWM pin, Extruder fan FET
-#define ORIG_E0_AUTO_FAN_PIN            FAN1_PIN
 #define FAN2_PIN                              59  // PE8   E3_FAN   PWM pin, Controller fan FET

+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                     58  // FAN1_PIN
+#endif
+
 //
 // Misc functions
 //
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@ -135,7 +135,9 @@
 #define FAN1_PIN                            PB5   // PA0
 #define FAN2_PIN                            PB4   // PA1

-#define ORIG_E0_AUTO_FAN_PIN                PD13  // Use this by NOT overriding E0_AUTO_FAN_PIN
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                   PD13
+#endif

 //
 // Misc. Functions