MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6587 from zlowred/bugfix-1.1.x

Browse Source 
Fixed USE_CONTROLLER_FAN #define usage
This commit is contained in:
Scott Lahteine 2017-05-05 01:02:09 -05:00 committed by GitHub
commit 0cc4b08b93
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -11479,7 +11479,7 @@ void prepare_move_to_destination() {
#endif // BEZIER_CURVE_SUPPORT #endif // BEZIER_CURVE_SUPPORT
#if USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN)
void controllerFan() { void controllerFan() {
static millis_t lastMotorOn = 0, // Last time a motor was turned on static millis_t lastMotorOn = 0, // Last time a motor was turned on
@ -11933,7 +11933,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
} }
#endif #endif
#if USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN)
controllerFan(); // Check if fan should be turned on to cool stepper drivers down controllerFan(); // Check if fan should be turned on to cool stepper drivers down
#endif #endif
@ -12203,7 +12203,7 @@ void setup() {
endstops.enable_z_probe(false); endstops.enable_z_probe(false);
#endif #endif
#if USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN)
SET_OUTPUT(CONTROLLER_FAN_PIN); //Set pin used for driver cooling fan SET_OUTPUT(CONTROLLER_FAN_PIN); //Set pin used for driver cooling fan
#endif #endif

2
Marlin/SanityCheck.h
View File

@ -771,7 +771,7 @@ static_assert(1 >= 0
#error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN." #error "You cannot set CONTROLLER_FAN_PIN equal to FAN_PIN."
#endif #endif
#if USE_CONTROLLER_FAN #if ENABLED(USE_CONTROLLER_FAN)
#if !HAS_CONTROLLER_FAN #if !HAS_CONTROLLER_FAN
#error "USE_CONTROLLER_FAN requires a CONTROLLER_FAN_PIN. Define in Configuration_adv.h." #error "USE_CONTROLLER_FAN requires a CONTROLLER_FAN_PIN. Define in Configuration_adv.h."
#elif E0_AUTO_FAN_PIN == CONTROLLER_FAN_PIN #elif E0_AUTO_FAN_PIN == CONTROLLER_FAN_PIN