Переглянути джерело

Rename auto fan pins and add auto fan flags

Scott Lahteine 8 роки тому
джерело
коміт
b6aa894893
24 змінених файлів з 349 додано та 223 видалено
  1. 12
    12
      Marlin/Conditionals_post.h
  2. 16
    9
      Marlin/Configuration_adv.h
  3. 16
    16
      Marlin/SanityCheck.h
  4. 16
    9
      Marlin/example_configurations/Cartesio/Configuration_adv.h
  5. 16
    9
      Marlin/example_configurations/Felix/Configuration_adv.h
  6. 16
    9
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  7. 16
    9
      Marlin/example_configurations/Hephestos_2/Configuration_adv.h
  8. 16
    9
      Marlin/example_configurations/K8200/Configuration_adv.h
  9. 16
    9
      Marlin/example_configurations/K8400/Configuration_adv.h
  10. 16
    9
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  11. 16
    9
      Marlin/example_configurations/SCARA/Configuration_adv.h
  12. 16
    9
      Marlin/example_configurations/TAZ4/Configuration_adv.h
  13. 16
    9
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  14. 16
    9
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  15. 16
    9
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  16. 16
    9
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  17. 16
    9
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  18. 16
    9
      Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
  19. 16
    9
      Marlin/example_configurations/makibox/Configuration_adv.h
  20. 16
    9
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  21. 4
    4
      Marlin/pins.h
  22. 8
    8
      Marlin/pinsDebug.h
  23. 4
    4
      Marlin/pins_AZTEEG_X3_PRO.h
  24. 17
    17
      Marlin/temperature.cpp

+ 12
- 12
Marlin/Conditionals_post.h Переглянути файл

@@ -426,20 +426,20 @@
426 426
   #define HAS_HEATER_2 (PIN_EXISTS(HEATER_2))
427 427
   #define HAS_HEATER_3 (PIN_EXISTS(HEATER_3))
428 428
   #define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
429
-  #define HAS_AUTO_FAN_0 (PIN_EXISTS(EXTRUDER_0_AUTO_FAN))
430
-  #define HAS_AUTO_FAN_1 (PIN_EXISTS(EXTRUDER_1_AUTO_FAN))
431
-  #define HAS_AUTO_FAN_2 (PIN_EXISTS(EXTRUDER_2_AUTO_FAN))
432
-  #define HAS_AUTO_FAN_3 (PIN_EXISTS(EXTRUDER_3_AUTO_FAN))
433
-  #define AUTO_1_IS_0 (EXTRUDER_1_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
434
-  #define AUTO_2_IS_0 (EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
435
-  #define AUTO_2_IS_1 (EXTRUDER_2_AUTO_FAN_PIN == EXTRUDER_1_AUTO_FAN_PIN)
436
-  #define AUTO_3_IS_0 (EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_0_AUTO_FAN_PIN)
437
-  #define AUTO_3_IS_1 (EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_1_AUTO_FAN_PIN)
438
-  #define AUTO_3_IS_2 (EXTRUDER_3_AUTO_FAN_PIN == EXTRUDER_2_AUTO_FAN_PIN)
429
+  #define HAS_AUTO_FAN_0 (PIN_EXISTS(E0_AUTO_FAN))
430
+  #define HAS_AUTO_FAN_1 (HOTENDS > 1 && PIN_EXISTS(E1_AUTO_FAN))
431
+  #define HAS_AUTO_FAN_2 (HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN))
432
+  #define HAS_AUTO_FAN_3 (HOTENDS > 3 && PIN_EXISTS(E3_AUTO_FAN))
439 433
   #define HAS_AUTO_FAN (HAS_AUTO_FAN_0 || HAS_AUTO_FAN_1 || HAS_AUTO_FAN_2 || HAS_AUTO_FAN_3)
434
+  #define AUTO_1_IS_0 (E1_AUTO_FAN_PIN == E0_AUTO_FAN_PIN)
435
+  #define AUTO_2_IS_0 (E2_AUTO_FAN_PIN == E0_AUTO_FAN_PIN)
436
+  #define AUTO_2_IS_1 (E2_AUTO_FAN_PIN == E1_AUTO_FAN_PIN)
437
+  #define AUTO_3_IS_0 (E3_AUTO_FAN_PIN == E0_AUTO_FAN_PIN)
438
+  #define AUTO_3_IS_1 (E3_AUTO_FAN_PIN == E1_AUTO_FAN_PIN)
439
+  #define AUTO_3_IS_2 (E3_AUTO_FAN_PIN == E2_AUTO_FAN_PIN)
440 440
   #define HAS_FAN0 (PIN_EXISTS(FAN))
441
-  #define HAS_FAN1 (PIN_EXISTS(FAN1) && CONTROLLERFAN_PIN != FAN1_PIN && EXTRUDER_0_AUTO_FAN_PIN != FAN1_PIN && EXTRUDER_1_AUTO_FAN_PIN != FAN1_PIN && EXTRUDER_2_AUTO_FAN_PIN != FAN1_PIN && EXTRUDER_3_AUTO_FAN_PIN != FAN1_PIN)
442
-  #define HAS_FAN2 (PIN_EXISTS(FAN2) && CONTROLLERFAN_PIN != FAN2_PIN && EXTRUDER_0_AUTO_FAN_PIN != FAN2_PIN && EXTRUDER_1_AUTO_FAN_PIN != FAN2_PIN && EXTRUDER_2_AUTO_FAN_PIN != FAN2_PIN && EXTRUDER_3_AUTO_FAN_PIN != FAN2_PIN)
441
+  #define HAS_FAN1 (PIN_EXISTS(FAN1) && CONTROLLERFAN_PIN != FAN1_PIN && E0_AUTO_FAN_PIN != FAN1_PIN && E1_AUTO_FAN_PIN != FAN1_PIN && E2_AUTO_FAN_PIN != FAN1_PIN && E3_AUTO_FAN_PIN != FAN1_PIN)
442
+  #define HAS_FAN2 (PIN_EXISTS(FAN2) && CONTROLLERFAN_PIN != FAN2_PIN && E0_AUTO_FAN_PIN != FAN2_PIN && E1_AUTO_FAN_PIN != FAN2_PIN && E2_AUTO_FAN_PIN != FAN2_PIN && E3_AUTO_FAN_PIN != FAN2_PIN)
443 443
   #define HAS_CONTROLLERFAN (PIN_EXISTS(CONTROLLERFAN))
444 444
   #define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
445 445
   #define HAS_SERVO_0 (PIN_EXISTS(SERVO0))

+ 16
- 9
Marlin/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 16
Marlin/SanityCheck.h Переглянути файл

@@ -678,14 +678,14 @@
678 678
  */
679 679
 #if HAS_AUTO_FAN
680 680
   #if HAS_FAN0
681
-    #if EXTRUDER_0_AUTO_FAN_PIN == FAN_PIN
682
-      #error "You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to FAN_PIN."
683
-    #elif EXTRUDER_1_AUTO_FAN_PIN == FAN_PIN
684
-      #error "You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to FAN_PIN."
685
-    #elif EXTRUDER_2_AUTO_FAN_PIN == FAN_PIN
686
-      #error "You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to FAN_PIN."
687
-    #elif EXTRUDER_3_AUTO_FAN_PIN == FAN_PIN
688
-      #error "You cannot set EXTRUDER_3_AUTO_FAN_PIN equal to FAN_PIN."
681
+    #if E0_AUTO_FAN_PIN == FAN_PIN
682
+      #error "You cannot set E0_AUTO_FAN_PIN equal to FAN_PIN."
683
+    #elif E1_AUTO_FAN_PIN == FAN_PIN
684
+      #error "You cannot set E1_AUTO_FAN_PIN equal to FAN_PIN."
685
+    #elif E2_AUTO_FAN_PIN == FAN_PIN
686
+      #error "You cannot set E2_AUTO_FAN_PIN equal to FAN_PIN."
687
+    #elif E3_AUTO_FAN_PIN == FAN_PIN
688
+      #error "You cannot set E3_AUTO_FAN_PIN equal to FAN_PIN."
689 689
     #endif
690 690
   #endif
691 691
 #endif
@@ -695,14 +695,14 @@
695 695
 #endif
696 696
 
697 697
 #if HAS_CONTROLLERFAN
698
-  #if EXTRUDER_0_AUTO_FAN_PIN == CONTROLLERFAN_PIN
699
-    #error "You cannot set EXTRUDER_0_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
700
-  #elif EXTRUDER_1_AUTO_FAN_PIN == CONTROLLERFAN_PIN
701
-    #error "You cannot set EXTRUDER_1_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
702
-  #elif EXTRUDER_2_AUTO_FAN_PIN == CONTROLLERFAN_PIN
703
-    #error "You cannot set EXTRUDER_2_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
704
-  #elif EXTRUDER_3_AUTO_FAN_PIN == CONTROLLERFAN_PIN
705
-    #error "You cannot set EXTRUDER_3_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
698
+  #if E0_AUTO_FAN_PIN == CONTROLLERFAN_PIN
699
+    #error "You cannot set E0_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
700
+  #elif E1_AUTO_FAN_PIN == CONTROLLERFAN_PIN
701
+    #error "You cannot set E1_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
702
+  #elif E2_AUTO_FAN_PIN == CONTROLLERFAN_PIN
703
+    #error "You cannot set E2_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
704
+  #elif E3_AUTO_FAN_PIN == CONTROLLERFAN_PIN
705
+    #error "You cannot set E3_AUTO_FAN_PIN equal to CONTROLLERFAN_PIN."
706 706
   #endif
707 707
 #endif
708 708
 

+ 16
- 9
Marlin/example_configurations/Cartesio/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN 7
214
-#define EXTRUDER_1_AUTO_FAN_PIN 7
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+//#define E0_AUTO_FAN_PIN -1
221
+//#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 35
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/Felix/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/Hephestos/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/Hephestos_2/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN 11
214
-#define EXTRUDER_1_AUTO_FAN_PIN  6
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+//#define E0_AUTO_FAN_PIN -1
221
+//#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/K8200/Configuration_adv.h Переглянути файл

@@ -211,15 +211,22 @@
211 211
 
212 212
 // @section extruder
213 213
 
214
-// Extruder cooling fans
215
-// Configure fan pin outputs to automatically turn on/off when the associated
216
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
217
-// Multiple extruders can be assigned to the same pin in which case
218
-// the fan will turn on when any selected extruder is above the threshold.
219
-#define EXTRUDER_0_AUTO_FAN_PIN -1
220
-#define EXTRUDER_1_AUTO_FAN_PIN -1
221
-#define EXTRUDER_2_AUTO_FAN_PIN -1
222
-#define EXTRUDER_3_AUTO_FAN_PIN -1
214
+/**
215
+ * Extruder cooling fans
216
+ *
217
+ * Extruder auto fans automatically turn on when their extruders'
218
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
219
+ *
220
+ * Your board's pins file specifies the recommended pins. Override those here
221
+ * or set to -1 to disable completely.
222
+ *
223
+ * Multiple extruders can be assigned to the same pin in which case
224
+ * the fan will turn on when any selected extruder is above the threshold.
225
+ */
226
+#define E0_AUTO_FAN_PIN -1
227
+#define E1_AUTO_FAN_PIN -1
228
+#define E2_AUTO_FAN_PIN -1
229
+#define E3_AUTO_FAN_PIN -1
223 230
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
224 231
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
225 232
 

+ 16
- 9
Marlin/example_configurations/K8400/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/RigidBot/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/SCARA/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/TAZ4/Configuration_adv.h Переглянути файл

@@ -213,15 +213,22 @@
213 213
 
214 214
 // @section extruder
215 215
 
216
-// Extruder cooling fans
217
-// Configure fan pin outputs to automatically turn on/off when the associated
218
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
219
-// Multiple extruders can be assigned to the same pin in which case
220
-// the fan will turn on when any selected extruder is above the threshold.
221
-#define EXTRUDER_0_AUTO_FAN_PIN -1
222
-#define EXTRUDER_1_AUTO_FAN_PIN -1
223
-#define EXTRUDER_2_AUTO_FAN_PIN -1
224
-#define EXTRUDER_3_AUTO_FAN_PIN -1
216
+/**
217
+ * Extruder cooling fans
218
+ *
219
+ * Extruder auto fans automatically turn on when their extruders'
220
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
221
+ *
222
+ * Your board's pins file specifies the recommended pins. Override those here
223
+ * or set to -1 to disable completely.
224
+ *
225
+ * Multiple extruders can be assigned to the same pin in which case
226
+ * the fan will turn on when any selected extruder is above the threshold.
227
+ */
228
+#define E0_AUTO_FAN_PIN -1
229
+#define E1_AUTO_FAN_PIN -1
230
+#define E2_AUTO_FAN_PIN -1
231
+#define E3_AUTO_FAN_PIN -1
225 232
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
226 233
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
227 234
 

+ 16
- 9
Marlin/example_configurations/WITBOX/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins.
215
+ * Override those here. Set to -1 to disable unused fans.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/delta/generic/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Переглянути файл

@@ -210,15 +210,22 @@
210 210
 
211 211
 // @section extruder
212 212
 
213
-// Extruder cooling fans
214
-// Configure fan pin outputs to automatically turn on/off when the associated
215
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
216
-// Multiple extruders can be assigned to the same pin in which case
217
-// the fan will turn on when any selected extruder is above the threshold.
218
-#define EXTRUDER_0_AUTO_FAN_PIN -1
219
-#define EXTRUDER_1_AUTO_FAN_PIN -1
220
-#define EXTRUDER_2_AUTO_FAN_PIN -1
221
-#define EXTRUDER_3_AUTO_FAN_PIN -1
213
+/**
214
+ * Extruder cooling fans
215
+ *
216
+ * Extruder auto fans automatically turn on when their extruders'
217
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
218
+ *
219
+ * Your board's pins file specifies the recommended pins. Override those here
220
+ * or set to -1 to disable completely.
221
+ *
222
+ * Multiple extruders can be assigned to the same pin in which case
223
+ * the fan will turn on when any selected extruder is above the threshold.
224
+ */
225
+#define E0_AUTO_FAN_PIN -1
226
+#define E1_AUTO_FAN_PIN -1
227
+#define E2_AUTO_FAN_PIN -1
228
+#define E3_AUTO_FAN_PIN -1
222 229
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
223 230
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
224 231
 

+ 16
- 9
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/makibox/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 16
- 9
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Переглянути файл

@@ -205,15 +205,22 @@
205 205
 
206 206
 // @section extruder
207 207
 
208
-// Extruder cooling fans
209
-// Configure fan pin outputs to automatically turn on/off when the associated
210
-// extruder temperature is above/below EXTRUDER_AUTO_FAN_TEMPERATURE.
211
-// Multiple extruders can be assigned to the same pin in which case
212
-// the fan will turn on when any selected extruder is above the threshold.
213
-#define EXTRUDER_0_AUTO_FAN_PIN -1
214
-#define EXTRUDER_1_AUTO_FAN_PIN -1
215
-#define EXTRUDER_2_AUTO_FAN_PIN -1
216
-#define EXTRUDER_3_AUTO_FAN_PIN -1
208
+/**
209
+ * Extruder cooling fans
210
+ *
211
+ * Extruder auto fans automatically turn on when their extruders'
212
+ * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE.
213
+ *
214
+ * Your board's pins file specifies the recommended pins. Override those here
215
+ * or set to -1 to disable completely.
216
+ *
217
+ * Multiple extruders can be assigned to the same pin in which case
218
+ * the fan will turn on when any selected extruder is above the threshold.
219
+ */
220
+#define E0_AUTO_FAN_PIN -1
221
+#define E1_AUTO_FAN_PIN -1
222
+#define E2_AUTO_FAN_PIN -1
223
+#define E3_AUTO_FAN_PIN -1
217 224
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
218 225
 #define EXTRUDER_AUTO_FAN_SPEED   255  // == full speed
219 226
 

+ 4
- 4
Marlin/pins.h Переглянути файл

@@ -306,7 +306,7 @@
306 306
   #endif
307 307
 #endif
308 308
 
309
-#define _H0_PINS HEATER_0_PIN, EXTRUDER_0_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_0_PIN),
309
+#define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_0_PIN),
310 310
 #define _H1_PINS
311 311
 #define _H2_PINS
312 312
 #define _H3_PINS
@@ -314,13 +314,13 @@
314 314
 
315 315
 #if HOTENDS > 1
316 316
   #undef _H1_PINS
317
-  #define _H1_PINS HEATER_1_PIN, EXTRUDER_1_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_1_PIN),
317
+  #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_1_PIN),
318 318
   #if HOTENDS > 2
319 319
     #undef _H2_PINS
320
-    #define _H2_PINS HEATER_2_PIN, EXTRUDER_2_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_2_PIN),
320
+    #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_2_PIN),
321 321
     #if HOTENDS > 3
322 322
       #undef _H3_PINS
323
-      #define _H3_PINS HEATER_3_PIN, EXTRUDER_3_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_3_PIN),
323
+      #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_3_PIN),
324 324
       #if HOTENDS > 4
325 325
         #undef _H4_PINS
326 326
         #define _H4_PINS HEATER_4_PIN, marlinAnalogInputToDigitalPin(TEMP_4_PIN),

+ 8
- 8
Marlin/pinsDebug.h Переглянути файл

@@ -234,17 +234,17 @@ static bool report_pin_name(int8_t pin) {
234 234
   #if PIN_EXISTS(CONTROLLERFAN)
235 235
     PIN_SAY(CONTROLLERFAN_PIN);
236 236
   #endif
237
-  #if PIN_EXISTS(EXTRUDER_0_AUTO_FAN)
238
-    PIN_SAY(EXTRUDER_0_AUTO_FAN_PIN);
237
+  #if PIN_EXISTS(E0_AUTO_FAN)
238
+    PIN_SAY(E0_AUTO_FAN_PIN);
239 239
   #endif
240
-  #if PIN_EXISTS(EXTRUDER_1_AUTO_FAN)
241
-    PIN_SAY(EXTRUDER_1_AUTO_FAN_PIN);
240
+  #if PIN_EXISTS(E1_AUTO_FAN)
241
+    PIN_SAY(E1_AUTO_FAN_PIN);
242 242
   #endif
243
-  #if PIN_EXISTS(EXTRUDER_2_AUTO_FAN)
244
-    PIN_SAY(EXTRUDER_2_AUTO_FAN_PIN);
243
+  #if PIN_EXISTS(E2_AUTO_FAN)
244
+    PIN_SAY(E2_AUTO_FAN_PIN);
245 245
   #endif
246
-  #if PIN_EXISTS(EXTRUDER_3_AUTO_FAN)
247
-    PIN_SAY(EXTRUDER_3_AUTO_FAN_PIN);
246
+  #if PIN_EXISTS(E3_AUTO_FAN)
247
+    PIN_SAY(E3_AUTO_FAN_PIN);
248 248
   #endif
249 249
   #if PIN_EXISTS(HEATER_0)
250 250
     PIN_SAY(HEATER_0_PIN);

+ 4
- 4
Marlin/pins_AZTEEG_X3_PRO.h Переглянути файл

@@ -106,10 +106,10 @@
106 106
 #define CONTROLLERFAN_PIN   4 // Pin used for the fan to cool motherboard (-1 to disable)
107 107
 
108 108
 // Fans/Water Pump to cool the hotend cool side.
109
-#define EXTRUDER_0_AUTO_FAN_PIN   5
110
-#define EXTRUDER_1_AUTO_FAN_PIN   5
111
-#define EXTRUDER_2_AUTO_FAN_PIN   5
112
-#define EXTRUDER_3_AUTO_FAN_PIN   5
109
+#define E0_AUTO_FAN_PIN     5
110
+#define E1_AUTO_FAN_PIN     5
111
+#define E2_AUTO_FAN_PIN     5
112
+#define E3_AUTO_FAN_PIN     5
113 113
 
114 114
 //
115 115
 // LCD / Controller

+ 17
- 17
Marlin/temperature.cpp Переглянути файл

@@ -454,7 +454,7 @@ int Temperature::getHeaterPower(int heater) {
454 454
 #if HAS_AUTO_FAN
455 455
 
456 456
   void Temperature::checkExtruderAutoFans() {
457
-    const int8_t fanPin[] = { EXTRUDER_0_AUTO_FAN_PIN, EXTRUDER_1_AUTO_FAN_PIN, EXTRUDER_2_AUTO_FAN_PIN, EXTRUDER_3_AUTO_FAN_PIN };
457
+    const int8_t fanPin[] = { E0_AUTO_FAN_PIN, E1_AUTO_FAN_PIN, E2_AUTO_FAN_PIN, E3_AUTO_FAN_PIN };
458 458
     const int fanBit[] = {
459 459
                     0,
460 460
       AUTO_1_IS_0 ? 0 :               1,
@@ -1043,43 +1043,43 @@ void Temperature::init() {
1043 1043
   #endif
1044 1044
 
1045 1045
   #if HAS_AUTO_FAN_0
1046
-    #if EXTRUDER_0_AUTO_FAN_PIN == FAN1_PIN
1047
-      SET_OUTPUT(EXTRUDER_0_AUTO_FAN_PIN);
1046
+    #if E0_AUTO_FAN_PIN == FAN1_PIN
1047
+      SET_OUTPUT(E0_AUTO_FAN_PIN);
1048 1048
       #if ENABLED(FAST_PWM_FAN)
1049
-        setPwmFrequency(EXTRUDER_0_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1049
+        setPwmFrequency(E0_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1050 1050
       #endif
1051 1051
     #else
1052
-      pinMode(EXTRUDER_0_AUTO_FAN_PIN, OUTPUT);
1052
+      pinMode(E0_AUTO_FAN_PIN, OUTPUT);
1053 1053
     #endif
1054 1054
   #endif
1055 1055
   #if HAS_AUTO_FAN_1 && !AUTO_1_IS_0
1056
-    #if EXTRUDER_1_AUTO_FAN_PIN == FAN1_PIN
1057
-      SET_OUTPUT(EXTRUDER_1_AUTO_FAN_PIN);
1056
+    #if E1_AUTO_FAN_PIN == FAN1_PIN
1057
+      SET_OUTPUT(E1_AUTO_FAN_PIN);
1058 1058
       #if ENABLED(FAST_PWM_FAN)
1059
-        setPwmFrequency(EXTRUDER_1_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1059
+        setPwmFrequency(E1_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1060 1060
       #endif
1061 1061
     #else
1062
-      pinMode(EXTRUDER_1_AUTO_FAN_PIN, OUTPUT);
1062
+      pinMode(E1_AUTO_FAN_PIN, OUTPUT);
1063 1063
     #endif
1064 1064
   #endif
1065 1065
   #if HAS_AUTO_FAN_2 && !AUTO_2_IS_0 && !AUTO_2_IS_1
1066
-    #if EXTRUDER_2_AUTO_FAN_PIN == FAN1_PIN
1067
-      SET_OUTPUT(EXTRUDER_2_AUTO_FAN_PIN);
1066
+    #if E2_AUTO_FAN_PIN == FAN1_PIN
1067
+      SET_OUTPUT(E2_AUTO_FAN_PIN);
1068 1068
       #if ENABLED(FAST_PWM_FAN)
1069
-        setPwmFrequency(EXTRUDER_2_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1069
+        setPwmFrequency(E2_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1070 1070
       #endif
1071 1071
     #else
1072
-      pinMode(EXTRUDER_2_AUTO_FAN_PIN, OUTPUT);
1072
+      pinMode(E2_AUTO_FAN_PIN, OUTPUT);
1073 1073
     #endif
1074 1074
   #endif
1075 1075
   #if HAS_AUTO_FAN_3 && !AUTO_3_IS_0 && !AUTO_3_IS_1 && !AUTO_3_IS_2
1076
-    #if EXTRUDER_3_AUTO_FAN_PIN == FAN1_PIN
1077
-      SET_OUTPUT(EXTRUDER_3_AUTO_FAN_PIN);
1076
+    #if E3_AUTO_FAN_PIN == FAN1_PIN
1077
+      SET_OUTPUT(E3_AUTO_FAN_PIN);
1078 1078
       #if ENABLED(FAST_PWM_FAN)
1079
-        setPwmFrequency(EXTRUDER_3_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1079
+        setPwmFrequency(E3_AUTO_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
1080 1080
       #endif
1081 1081
     #else
1082
-      pinMode(EXTRUDER_3_AUTO_FAN_PIN, OUTPUT);
1082
+      pinMode(E3_AUTO_FAN_PIN, OUTPUT);
1083 1083
     #endif
1084 1084
   #endif
1085 1085
 

Завантаження…
Відмінити
Зберегти