Skip to content

Add Fast PWM for Controller Fan #12485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 1 commit into from
Nov 23, 2018
Merged

Add Fast PWM for Controller Fan #12485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Marlin/src/module/temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,13 @@ void Temperature::init() {
#endif
#endif

#if ENABLED(USE_CONTROLLER_FAN)
Copy link
Contributor

@marcio-ao marcio-ao Nov 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be #if HAS_CONTROLLER_FAN to mirror the others.

Copy link
Contributor Author

@Sangoku Sangoku Nov 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then i would have to specifically define HAS_CONTROLLER_FAN in a separate file. As far i can tell the ENABLED is a other version of it without the hassle to redefine it via a check.

Copy link
Member

@thinkyhead thinkyhead Nov 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already defined, but you're right to use ENABLED(USE_CONTROLLER_FAN). The other fans are enabled independent of any configuration options, simply on the basis of the pins being defined. (This is a legacy from Marlin 1.0.x.)

SET_OUTPUT(CONTROLLER_FAN_PIN);
#if ENABLED(FAST_PWM_FAN)
setPwmFrequency(CONTROLLER_FAN_PIN, 1); // No prescaling. Pwm frequency = F_CPU/256/8
#endif
#endif

#if ENABLED(HEATER_0_USES_MAX6675)

OUT_WRITE(SCK_PIN, LOW);
Expand Down