-
-
Notifications
You must be signed in to change notification settings - Fork 19.2k
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.
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
[WIP] 🔧 Revamp AUTO_FAN configuration #27214
base: bugfix-2.1.x
Are you sure you want to change the base?
[WIP] 🔧 Revamp AUTO_FAN configuration #27214
Conversation
df40f98
to
0a26e4d
Compare
0a26e4d
to
e2e2c32
Compare
GTR test fails due to the following: Marlin/src/module/temperature.cpp: In static member function 'static void Temperature::update_autofans()':
Marlin/src/module/temperature.cpp:1315:56: error: 'E3_AUTO_FAN_PIN' was not declared in this scope; did you mean 'E0_AUTO_FAN_PIN'?
1315 | #define _EFANOVERLAP(I,N) ((I != N) && _FANOVERLAP(I,E##N))
| ^
Marlin/src/module/../inc/../core/macros.h:643:24: note: in definition of macro 'EVAL1'
643 | #define EVAL1(V...) V
| ^ edit: After testing this on an SKR V3 build with two extruders/hotends (to simplify what needs be enabled to test), you're forced to define each additional |
The "*_AUTO_FAN_PIN hack" commit is just that. I'm sure there's a better place or better way to unset all these pins, but it's basically what we're doing now in the config. |
Fixes CI error
PA1 cannot be both the hotend & hotend cooling fan pin. Official Creality Klipper configs list PC0 as the correct pin.
9ea4452
to
39e2e4a
Compare
Keep in mind that this is one of the more "unusual" settings, and it hasn't been changed because it would require a bit of overhaul.
We don't need to alter this configuration strategy right now, but consider how auto fans ought to be defined to be consistent with how other settings work. e.g., If you enable filament runout, the board pins file may provide you a default filament detect pin. If you have one or more extruders, the board may define En auto fan pins for you. There is no difference here in substance, except that we can disable these optional pins. At most you might add an option to enable/disable extruder auto fans as a whole, but this is covered now by selectively defining the auto fans you don't want as -1. |
Not really. Using
Right, but the main point of this PR is to make it more like other config-based pin overrides and have the options commented out instead of set to -1 by default since being set to -1 by default means that any auto fan set in the pins file is not used. |
This reverts commit 4c349bf.
//#define CONTROLLER_FAN_PIN 148 // FAN2 | ||
//#define E0_AUTO_FAN_PIN 148 // FAN2 | ||
#ifndef E0_AUTO_FAN_PIN | ||
#define E0_AUTO_FAN_PIN FAN1_PIN // FAN2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've been conscientiously defining more pins using the pin number rather than references to other defined pins, especially those that have an optional function w/r/t Marlin. This is in consideration of the possibility of some configuration variant that includes #undef FAN1_PIN
(because why define a pin that's not needed?) or which redefines FAN1_PIN
— either of which would then break the definition of E0_AUTO_FAN_PIN
. Although in most cases fan pins do correspond well to the pins marked for fans on the board, that is not strictly the way fan pins must be defined.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using FAN1_PIN
for E0_AUTO_FAN_PIN
, FAN2_PIN
for E1_AUTO_FAN_PIN
, etc. is a common configuration and has been around since as long as I have been using Marlin (since at least 2017), so it would be really tough to see that go away.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Defining pins in reference to other pins is fine when they are known to be unaltered and works best in the case of a configuration file. But pins files are only meant to define the best defaults for any board, while also leaving open the potential for overrides and reordering. Tying the default of one pin to the value of another, which might be modified, is bound to cause confusion, so I am inclined to avoid this inside of pins files going forward. A common internal default used only within a pins file is another matter, as individual pins files are free to define "private" pin names according to their AUX number, silkscreen name, etc.
I resubmitted the It's fixed in this (#27214) PR, but this PR is in the "After 2.1.3" milestone due to it being low priority & needing work. We don't want to leave the M300 config broken & unsafe since the hotend cooling fan no longer works. EDIT: I broke out the M300 |
Thanks! The |
This PR really was low priority and I'd still like see it wait until after |
The rest of the changes in this PR are good, so these pins can be overridden / disabled without compiler warnings. However, we need to leave these pin defines enabled and set to -1 in the default configuration because by default we don't want any auto fans except those enabled in the config explicitly (by the unusual convention of commenting them out). If the aim is to use a more standard convention, we would do something more like this… // Which extruders have auto fans?
//#define USE_E0_AUTO_FAN
//#define USE_E1_AUTO_FAN
//#define USE_E2_AUTO_FAN
//#define USE_E3_AUTO_FAN
//#define USE_E4_AUTO_FAN
//#define USE_E5_AUTO_FAN
//#define USE_E6_AUTO_FAN
//#define USE_E7_AUTO_FAN
// Provide overrides if needed. Leave undefined to use board defaults.
//#define E0_AUTO_FAN_PIN -1
//#define E1_AUTO_FAN_PIN -1
//#define E2_AUTO_FAN_PIN -1
//#define E3_AUTO_FAN_PIN -1
//#define E4_AUTO_FAN_PIN -1
//#define E5_AUTO_FAN_PIN -1
//#define E6_AUTO_FAN_PIN -1
//#define E7_AUTO_FAN_PIN -1 |
e4604b1
to
22107c4
Compare
Related to this, I think it'd be good to extend & rework/apply similar config options to |
c792921
to
37fb26b
Compare
Description
Many pins files have
*_AUTO_FAN_PIN
(s) defined directly or with an#ifndef
, but by setting*_AUTO_FAN_PIN
(s) to-1
as default in a config, this will keep the pin unset or cause a wall of redefined warnings.By disabling/commenting out these in the config by default, it'll allow board defaults to be used and is more in line with how pin overrides are done in the rest of the config.
Some other fixes/improvements:
*_AUTO_FAN_PIN
(s) &CONTROLLER_FAN_PIN
(s) are wrapped in#ifndef
s so they can be overridden.E4_AUTO_FAN_PIN
to Azteeg X3 ProE0_AUTO_FAN_PIN
onBOARD_CREALITY_F401RE
(Ender-5 S1) since both the hotend & hotend cooling fan pin cannot bePA1
. Official Creality Klipper configs listPC0
as the correct pin, but I cannot test this.E0_AUTO_FAN_PIN
since it was just "AUTO_FAN_PIN
". Needs 🔧 Define Malyan M300 E0_AUTO_FAN_PIN directly Configurations#1074 for M300 test to pass.Benefits
Allows board OEMs to specify
*_AUTO_FAN_PIN
(s) in pins files with easy overrides via configs.