Skip to content

Multi Part Cooling Fans With M106 & M107 #25808

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
merged 5 commits into from
May 13, 2023
Merged

Multi Part Cooling Fans With M106 & M107 #25808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d541f9c
Expand M106 & M107 with the ability to use up to 3
May 10, 2023
cf0c1ce
add 4th part cooler option.
May 11, 2023
3c74b4f
fix typo
May 11, 2023
181d7a6
rework REDUNDANT_PART_COOLING_FAN
May 11, 2023
5b8d55a
fix some things
thinkyhead May 11, 2023
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: 5 additions & 2 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,12 @@
#endif

/**
* Use one of the PWM fans as a redundant part-cooling fan
* Assign more PWM fans for part cooling, synchronized with Fan 0
*/
//#define REDUNDANT_PART_COOLING_FAN 2 // Index of the fan to sync with FAN 0.
//#define REDUNDANT_PART_COOLING_FAN 1 // Index of the first fan to synchronize with Fan 0
#ifdef REDUNDANT_PART_COOLING_FAN
//#define NUM_REDUNDANT_FANS 1 // Number of sequential fans to synchronize with Fan 0
#endif

// @section extruder

Expand Down
8 changes: 2 additions & 6 deletions Marlin/src/gcode/temp/M106_M107.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@
void GcodeSuite::M106() {
const uint8_t pfan = parser.byteval('P', _ALT_P);
if (pfan >= _CNT_P) return;
#if REDUNDANT_PART_COOLING_FAN
if (pfan == REDUNDANT_PART_COOLING_FAN) return;
#endif
if (FAN_IS_REDUNDANT(pfan)) return;

#if ENABLED(EXTRA_FAN_SPEED)
const uint16_t t = parser.intval('T');
Expand Down Expand Up @@ -102,9 +100,7 @@ void GcodeSuite::M106() {
void GcodeSuite::M107() {
const uint8_t pfan = parser.byteval('P', _ALT_P);
if (pfan >= _CNT_P) return;
#if REDUNDANT_PART_COOLING_FAN
if (pfan == REDUNDANT_PART_COOLING_FAN) return;
#endif
if (FAN_IS_REDUNDANT(pfan)) return;

thermalManager.set_fan_speed(pfan, 0);

Expand Down
5 changes: 5 additions & 0 deletions Marlin/src/inc/Conditionals_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,3 +1280,8 @@
#define MULTISTEPPING_LIMIT 128
#define MULTISTEPPING_LIMIT_WARNING 1
#endif

// One redundant cooling fan by default
#if defined(REDUNDANT_PART_COOLING_FAN) && !defined(NUM_REDUNDANT_FANS)
#define NUM_REDUNDANT_FANS 1
#endif
6 changes: 4 additions & 2 deletions Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,8 +1843,10 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#ifdef REDUNDANT_PART_COOLING_FAN
#if FAN_COUNT < 2
#error "REDUNDANT_PART_COOLING_FAN requires a board with at least two PWM fans."
#else
static_assert(WITHIN(REDUNDANT_PART_COOLING_FAN, 1, FAN_COUNT - 1), "REDUNDANT_PART_COOLING_FAN must be between 1 and " STRINGIFY(DECREMENT(FAN_COUNT)) ".");
#elif !WITHIN(REDUNDANT_PART_COOLING_FAN, 1, FAN_COUNT - 1)
static_assert(false, "REDUNDANT_PART_COOLING_FAN must be between 1 and " STRINGIFY(DECREMENT(FAN_COUNT)) ".");
#elif !WITHIN(REDUNDANT_PART_COOLING_FAN + NUM_REDUNDANT_FANS - 1, 1, FAN_COUNT - 1)
#error "Not enough fans available for NUM_REDUNDANT_FANS."
#endif
#endif

Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/menu/menu_item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,10 +580,10 @@ class MenuItem_bool : public MenuEditItemBase {
}while(0)

#if FAN_COUNT > 1
#define FAN_EDIT_ITEMS(F) _FAN_EDIT_ITEMS(F,FAN_SPEED_N)
#define FAN_EDIT_ITEMS(F) _FAN_EDIT_ITEMS(F, FAN_SPEED_N)
#endif

#define SNFAN(N) (ENABLED(SINGLENOZZLE_STANDBY_FAN) && !HAS_FAN##N && EXTRUDERS > N)
#define SNFAN(N) (ENABLED(SINGLENOZZLE_STANDBY_FAN) && !HAS_FAN##N && (N) < EXTRUDERS)

#if SNFAN(1) || SNFAN(2) || SNFAN(3) || SNFAN(4) || SNFAN(5) || SNFAN(6) || SNFAN(7)
#define DEFINE_SINGLENOZZLE_ITEM() \
Expand Down
18 changes: 9 additions & 9 deletions Marlin/src/lcd/menu/menu_temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,40 +221,40 @@ void menu_temperature() {

DEFINE_SINGLENOZZLE_ITEM();

#if HAS_FAN0
_FAN_EDIT_ITEMS(0,FIRST_FAN_SPEED);
#if FAN_IS_M106ABLE(0)
_FAN_EDIT_ITEMS(0, FIRST_FAN_SPEED);
#endif
#if HAS_FAN1 && REDUNDANT_PART_COOLING_FAN != 1
#if FAN_IS_M106ABLE(1)
FAN_EDIT_ITEMS(1);
#elif SNFAN(1)
singlenozzle_item(1);
#endif
#if HAS_FAN2 && REDUNDANT_PART_COOLING_FAN != 2
#if FAN_IS_M106ABLE(2)
FAN_EDIT_ITEMS(2);
#elif SNFAN(2)
singlenozzle_item(2);
#endif
#if HAS_FAN3 && REDUNDANT_PART_COOLING_FAN != 3
#if FAN_IS_M106ABLE(3)
FAN_EDIT_ITEMS(3);
#elif SNFAN(3)
singlenozzle_item(3);
#endif
#if HAS_FAN4 && REDUNDANT_PART_COOLING_FAN != 4
#if FAN_IS_M106ABLE(4)
FAN_EDIT_ITEMS(4);
#elif SNFAN(4)
singlenozzle_item(4);
#endif
#if HAS_FAN5 && REDUNDANT_PART_COOLING_FAN != 5
#if FAN_IS_M106ABLE(5)
FAN_EDIT_ITEMS(5);
#elif SNFAN(5)
singlenozzle_item(5);
#endif
#if HAS_FAN6 && REDUNDANT_PART_COOLING_FAN != 6
#if FAN_IS_M106ABLE(6)
FAN_EDIT_ITEMS(6);
#elif SNFAN(6)
singlenozzle_item(6);
#endif
#if HAS_FAN7 && REDUNDANT_PART_COOLING_FAN != 7
#if FAN_IS_M106ABLE(7)
FAN_EDIT_ITEMS(7);
#elif SNFAN(7)
singlenozzle_item(7);
Expand Down
18 changes: 9 additions & 9 deletions Marlin/src/lcd/menu/menu_tune.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,40 +153,40 @@ void menu_tune() {

DEFINE_SINGLENOZZLE_ITEM();

#if HAS_FAN0
_FAN_EDIT_ITEMS(0,FIRST_FAN_SPEED);
#if FAN_IS_M106ABLE(0)
_FAN_EDIT_ITEMS(0, FIRST_FAN_SPEED);
#endif
#if HAS_FAN1 && REDUNDANT_PART_COOLING_FAN != 1
#if FAN_IS_M106ABLE(1)
FAN_EDIT_ITEMS(1);
#elif SNFAN(1)
singlenozzle_item(1);
#endif
#if HAS_FAN2 && REDUNDANT_PART_COOLING_FAN != 2
#if FAN_IS_M106ABLE(2)
FAN_EDIT_ITEMS(2);
#elif SNFAN(2)
singlenozzle_item(2);
#endif
#if HAS_FAN3 && REDUNDANT_PART_COOLING_FAN != 3
#if FAN_IS_M106ABLE(3)
FAN_EDIT_ITEMS(3);
#elif SNFAN(3)
singlenozzle_item(3);
#endif
#if HAS_FAN4 && REDUNDANT_PART_COOLING_FAN != 4
#if FAN_IS_M106ABLE(4)
FAN_EDIT_ITEMS(4);
#elif SNFAN(4)
singlenozzle_item(4);
#endif
#if HAS_FAN5 && REDUNDANT_PART_COOLING_FAN != 5
#if FAN_IS_M106ABLE(5)
FAN_EDIT_ITEMS(5);
#elif SNFAN(5)
singlenozzle_item(5);
#endif
#if HAS_FAN6 && REDUNDANT_PART_COOLING_FAN != 6
#if FAN_IS_M106ABLE(6)
FAN_EDIT_ITEMS(6);
#elif SNFAN(6)
singlenozzle_item(6);
#endif
#if HAS_FAN7 && REDUNDANT_PART_COOLING_FAN != 7
#if FAN_IS_M106ABLE(7)
FAN_EDIT_ITEMS(7);
#elif SNFAN(7)
singlenozzle_item(7);
Expand Down
8 changes: 6 additions & 2 deletions Marlin/src/module/temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,12 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
if (fan >= FAN_COUNT) return;

fan_speed[fan] = speed;
#if REDUNDANT_PART_COOLING_FAN
if (fan == 0) fan_speed[REDUNDANT_PART_COOLING_FAN] = speed;

#if NUM_REDUNDANT_FANS
if (fan == 0) {
for (uint8_t f = REDUNDANT_PART_COOLING_FAN; f < REDUNDANT_PART_COOLING_FAN + NUM_REDUNDANT_FANS; ++f)
thermalManager.set_fan_speed(f, 0);
}
#endif

TERN_(REPORT_FAN_CHANGE, report_fan_speed(fan));
Expand Down
11 changes: 11 additions & 0 deletions Marlin/src/module/temperature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,17 @@
#define HOTEND_INDEX TERN(HAS_MULTI_HOTEND, e, 0)
#define E_NAME TERN_(HAS_MULTI_HOTEND, e)

#if HAS_FAN
#if NUM_REDUNDANT_FANS
#define FAN_IS_REDUNDANT(Q) WITHIN(Q, REDUNDANT_PART_COOLING_FAN, REDUNDANT_PART_COOLING_FAN + NUM_REDUNDANT_FANS - 1)
#else
#define FAN_IS_REDUNDANT(Q) false
#endif
#define FAN_IS_M106ABLE(Q) (HAS_FAN##Q && !FAN_IS_REDUNDANT(Q))
#else
#define FAN_IS_M106ABLE(Q) false
#endif

// Element identifiers. Positive values are hotends. Negative values are other heaters or coolers.
typedef enum : int_fast8_t {
H_REDUNDANT = HID_REDUNDANT,
Expand Down