Browse Source

Fixed USE_CONTROLLER_FAN #define usage

Max Matveev 7 years ago
parent
commit
267f3a03d9
2 changed files with 4 additions and 4 deletions
  1. 3
    3
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/SanityCheck.h

+ 3
- 3
Marlin/Marlin_main.cpp View File

11479
 
11479
 
11480
 #endif // BEZIER_CURVE_SUPPORT
11480
 #endif // BEZIER_CURVE_SUPPORT
11481
 
11481
 
11482
-#if USE_CONTROLLER_FAN
11482
+#if ENABLED(USE_CONTROLLER_FAN)
11483
 
11483
 
11484
   void controllerFan() {
11484
   void controllerFan() {
11485
     static millis_t lastMotorOn = 0, // Last time a motor was turned on
11485
     static millis_t lastMotorOn = 0, // Last time a motor was turned on
11933
     }
11933
     }
11934
   #endif
11934
   #endif
11935
 
11935
 
11936
-  #if USE_CONTROLLER_FAN
11936
+  #if ENABLED(USE_CONTROLLER_FAN)
11937
     controllerFan(); // Check if fan should be turned on to cool stepper drivers down
11937
     controllerFan(); // Check if fan should be turned on to cool stepper drivers down
11938
   #endif
11938
   #endif
11939
 
11939
 
12203
     endstops.enable_z_probe(false);
12203
     endstops.enable_z_probe(false);
12204
   #endif
12204
   #endif
12205
 
12205
 
12206
-  #if USE_CONTROLLER_FAN
12206
+  #if ENABLED(USE_CONTROLLER_FAN)
12207
     SET_OUTPUT(CONTROLLER_FAN_PIN); //Set pin used for driver cooling fan
12207
     SET_OUTPUT(CONTROLLER_FAN_PIN); //Set pin used for driver cooling fan
12208
   #endif
12208
   #endif
12209
 
12209
 

+ 1
- 1
Marlin/SanityCheck.h View File

771
   #error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN."
771
   #error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN."
772
 #endif
772
 #endif
773
 
773
 
774
-#if USE_CONTROLLER_FAN
774
+#if ENABLED(USE_CONTROLLER_FAN)
775
   #if !HAS_CONTROLLER_FAN
775
   #if !HAS_CONTROLLER_FAN
776
     #error "USE_CONTROLLER_FAN requires a CONTROLLER_FAN_PIN. Define in Configuration_adv.h."
776
     #error "USE_CONTROLLER_FAN requires a CONTROLLER_FAN_PIN. Define in Configuration_adv.h."
777
   #elif E0_AUTO_FAN_PIN == CONTROLLER_FAN_PIN
777
   #elif E0_AUTO_FAN_PIN == CONTROLLER_FAN_PIN

Loading…
Cancel
Save