bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #6556 from thinkyhead/rc_use_controller_fan

Browse Source 
Implement USE_CONTROLLER_FAN as a feature
This commit is contained in:
Scott Lahteine
2017-05-02 22:43:26 -05:00
committed by GitHub
parent f4239e62b1 2c13922c46
commit 902fe76db9
30 changed files with 335 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/Marlin_main.cpp
View File

@ -11471,7 +11471,7 @@ void prepare_move_to_destination() {
#endif // BEZIER_CURVE_SUPPORT
#if HAS_CONTROLLERFAN
#if USE_CONTROLLER_FAN
void controllerFan() {
static millis_t lastMotorOn = 0, // Last time a motor was turned on
@ -11504,12 +11504,12 @@ void prepare_move_to_destination() {
uint8_t speed = (!lastMotorOn || ELAPSED(ms, lastMotorOn + (CONTROLLERFAN_SECS) * 1000UL)) ? 0 : CONTROLLERFAN_SPEED;
// allows digital or PWM fan output to be used (see M42 handling)
WRITE(CONTROLLERFAN_PIN, speed);
analogWrite(CONTROLLERFAN_PIN, speed);
WRITE(CONTROLLER_FAN_PIN, speed);
analogWrite(CONTROLLER_FAN_PIN, speed);
}
}
#endif // HAS_CONTROLLERFAN
#endif // USE_CONTROLLER_FAN
#if ENABLED(MORGAN_SCARA)
@ -11925,7 +11925,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) {
}
#endif
#if HAS_CONTROLLERFAN
#if USE_CONTROLLER_FAN
controllerFan(); // Check if fan should be turned on to cool stepper drivers down
#endif
@ -12195,8 +12195,8 @@ void setup() {
endstops.enable_z_probe(false);
#endif
#if HAS_CONTROLLERFAN
SET_OUTPUT(CONTROLLERFAN_PIN); //Set pin used for driver cooling fan
#if USE_CONTROLLER_FAN
SET_OUTPUT(CONTROLLER_FAN_PIN); //Set pin used for driver cooling fan
#endif
#if HAS_STEPPER_RESET