Allow more *_AUTO_FAN_PIN and CONTROLLER_FAN_PIN overrides

MarlinFirmware · Jun 27, 2024 · dc6e3c3 · dc6e3c3
1 parent 1275fc9
commit dc6e3c3
Show file tree

Hide file tree

Showing 22 changed files with 64 additions and 32 deletions.
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -112,8 +112,13 @@
 #define FAN1_PIN                             148  // FAN2
 #define HEATER_BED_PIN                       144  // H-BED
 
-//#define CONTROLLER_FAN_PIN                 148  // FAN2
-//#define E0_AUTO_FAN_PIN                    148  // FAN2
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN               FAN1_PIN  // FAN2
+#endif
+
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN            FAN1_PIN  // FAN2
+#endif
 
 //
 // ADC Reference Voltage

diff --git a/Marlin/src/pins/esp32/pins_MM_JOKER.h b/Marlin/src/pins/esp32/pins_MM_JOKER.h
@@ -173,11 +173,7 @@
 #define FAN0_PIN                             143
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                    142  // Enabled in Configuration_adv.h
-#endif
-
-#ifndef CONTROLLER_FAN_PIN
-  //#define CONTROLLER_FAN_PIN                -1
+  #define E0_AUTO_FAN_PIN                    142
 #endif
 
 #if ENABLED(JOKER_PLUS_2)

diff --git a/Marlin/src/pins/esp32/pins_MRR_ESPE.h b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@@ -105,12 +105,20 @@
 //
 #define HEATER_0_PIN                         145  // 2
 #define FAN0_PIN                             146  // 15
+#define FAN1_PIN                             149
 #define HEATER_BED_PIN                       144  // 4
 
-#define CONTROLLER_FAN_PIN                   147
-//#define E0_AUTO_FAN_PIN                    148  // need to update Configuration_adv.h @section extruder
-//#define E1_AUTO_FAN_PIN                    149  // need to update Configuration_adv.h @section extruder
-#define FAN1_PIN                             149
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                 147
+#endif
+
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                    148
+#endif
+
+#ifndef E1_AUTO_FAN_PIN
+  #define E1_AUTO_FAN_PIN               FAN1_PIN
+#endif
 
 //
 // MicroSD card

diff --git a/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h b/Marlin/src/pins/gd32f1/pins_TRIGORILLA_V006.h
@@ -91,7 +91,10 @@
 #define FAN0_PIN                            PA0   // FAN
 #define FAN1_PIN                            PA14  // Connected to +24V
 #define FAN2_PIN                            -1    // PB1, auto fan for E0
-#define CONTROLLER_FAN_PIN              FAN1_PIN
+
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN            FAN1_PIN
+#endif
 
 //
 // Misc

diff --git a/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h b/Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
@@ -125,7 +125,10 @@
 #define HEATER_BED_PIN                     P1_19  // Not a PWM pin, software PWM required
 #define HEATER_0_PIN                       P3_26  // PWM1[3]
 #define FAN0_PIN                           P3_25  // Part cooling fan - connected to PWM1[2]
-#define E0_AUTO_FAN_PIN                    P0_27  // Extruder cooling fan
+
+#ifndef E0_AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                  P0_27  // Extruder cooling fan
+#endif
 
 //
 // Misc. Functions

diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -130,9 +130,8 @@
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN                       P1_22  // FET 3
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN           AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                  P1_22  // FET 3
 #endif
 
 //

diff --git a/Marlin/src/pins/mega/pins_SILVER_GATE.h b/Marlin/src/pins/mega/pins_SILVER_GATE.h
@@ -67,7 +67,9 @@
   #define E0_AUTO_FAN_PIN                      3
 #endif
 
-#define CONTROLLER_FAN_PIN                     2
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                   2
+#endif
 
 #define TEMP_0_PIN                             7  // Analog Input
 

diff --git a/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h b/Marlin/src/pins/ramps/pins_AZTEEG_X3_PRO.h
@@ -118,7 +118,7 @@
 #define HEATER_7_PIN                          11
 
 #ifndef CONTROLLER_FAN_PIN
-  #define CONTROLLER_FAN_PIN                   4  // Pin used for the fan to cool motherboard (-1 to disable)
+  #define CONTROLLER_FAN_PIN                   4
 #endif
 
 //

diff --git a/Marlin/src/pins/ramps/pins_K8800.h b/Marlin/src/pins/ramps/pins_K8800.h
@@ -74,7 +74,10 @@
 //
 #define HEATER_0_PIN                          10
 #define FAN0_PIN                               8
-#define CONTROLLER_FAN_PIN                     9
+
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                   9
+#endif
 
 //
 // Misc. Functions

diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_13.h
@@ -38,7 +38,7 @@
 #define FAN2_PIN                               9
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                      9
+  #define E0_AUTO_FAN_PIN               FAN2_PIN
 #endif
 
 #include "pins_RAMPS_13.h" // ... RAMPS
diff --git a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h b/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
@@ -127,7 +127,9 @@
     #define Z_MIN_PROBE_PIN                    2  // X+
   #endif
 
-  #define CONTROLLER_FAN_PIN            FAN1_PIN
+  #ifndef CONTROLLER_FAN_PIN
+    #define CONTROLLER_FAN_PIN          FAN1_PIN
+  #endif
 
   #if ENABLED(POWER_LOSS_RECOVERY)
     #define OUTAGETEST_PIN                    79

diff --git a/Marlin/src/pins/ramps/pins_VORON.h b/Marlin/src/pins/ramps/pins_VORON.h
@@ -34,7 +34,10 @@
 //
 #define MOSFET_C_PIN                          11
 #define FAN0_PIN                               5  // Using the pin for the controller fan since controller fan is always on.
-#define CONTROLLER_FAN_PIN                     8
+
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                   8
+#endif
 
 //
 // Auto fans

diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -126,7 +126,6 @@
   #define FAN0_PIN                             9
 #endif
 #define FAN1_PIN                               8
-#define CONTROLLER_FAN_PIN                    -1
 
 //
 // Temperature Sensors

diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -116,7 +116,6 @@
 
 #define FAN0_PIN                               9
 #define FAN1_PIN                               8
-#define CONTROLLER_FAN_PIN                    -1
 
 //
 // Temperature Sensors

diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
@@ -116,7 +116,9 @@
 #define FAN0_PIN                            PC6   // FAN
 #define FAN_SOFT_PWM_REQUIRED
 
-#define CONTROLLER_FAN_PIN                  PC7
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                PC7
+#endif
 
 //
 // LCD / Controller

diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h b/Marlin/src/pins/stm32f1/pins_CHITU3D_common.h
@@ -98,7 +98,9 @@
 //
 // Fans
 //
-#define CONTROLLER_FAN_PIN                  PD6   // BOARD FAN
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                PD6   // BOARD FAN
+#endif
 #define FAN0_PIN                            PG13  // FAN
 #define FAN2_PIN                            PG14
 

diff --git a/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h b/Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
@@ -116,7 +116,9 @@
 //
 // Fans
 //
-#define CONTROLLER_FAN_PIN                  PD6   // FAN
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                PD6   // FAN
+#endif
 #define FAN0_PIN                            PG13  // FAN
 #define FAN1_PIN                            PG14  // FAN
 

diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_K.h b/Marlin/src/pins/stm32f4/pins_LERDGE_K.h
@@ -199,7 +199,9 @@
   #define E1_AUTO_FAN_PIN                   PB0
 #endif
 
-#define CONTROLLER_FAN_PIN                  PF8
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                PF8
+#endif
 
 //
 // LED / Lighting

diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_S.h b/Marlin/src/pins/stm32f4/pins_LERDGE_S.h
@@ -127,7 +127,7 @@
 #define FAN2_PIN                            PF5   // heater 0 fan 2 and heater 1 fan 1 (two sockets, switched together)
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                   PF5
+  #define E0_AUTO_FAN_PIN               FAN2_PIN
 #endif
 
 //

diff --git a/Marlin/src/pins/stm32f4/pins_LERDGE_X.h b/Marlin/src/pins/stm32f4/pins_LERDGE_X.h
@@ -105,7 +105,7 @@
 #define FAN2_PIN                            PA0
 
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN                   PC15  // FAN1_PIN
+  #define E0_AUTO_FAN_PIN               FAN1_PIN
 #endif
 
 //

diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -177,9 +177,8 @@
 //
 // Auto fans
 //
-#define AUTO_FAN_PIN                        PC7
 #ifndef E0_AUTO_FAN_PIN
-  #define E0_AUTO_FAN_PIN           AUTO_FAN_PIN
+  #define E0_AUTO_FAN_PIN                   PC7
 #endif
 
 //

diff --git a/Marlin/src/pins/stm32f4/pins_TRONXY_CXY_446_V10.h b/Marlin/src/pins/stm32f4/pins_TRONXY_CXY_446_V10.h
@@ -155,7 +155,10 @@
 #define FAN1_PIN                            PB6   // Part Cooling Fan #2
 #define FAN2_PIN                            PG9   // Extruder/Hotend #1 Heatsink Fan
 #define FAN3_PIN                            PF10  // Extruder/Hotend #2 Heatsink Fan
-#define CONTROLLER_FAN_PIN                  PD7
+
+#ifndef CONTROLLER_FAN_PIN
+  #define CONTROLLER_FAN_PIN                PD7
+#endif
 
 //
 // Laser / Servos