From e04902f5891c9027375dccee2530a29875b6c7ff Mon Sep 17 00:00:00 2001
From: studiodyne <diabolomix@hotmail.fr>
Date: Sat, 7 Oct 2017 16:29:22 +0200
Subject: [PATCH] Add EXTRA_FAN_SPEED feature
---
Marlin/Configuration_adv.h | 9 ++++
Marlin/Marlin.h | 4 ++
Marlin/Marlin_main.cpp | 43 ++++++++++++++++---
.../AlephObjects/TAZ4/Configuration_adv.h | 9 ++++
.../Anet/A6/Configuration_adv.h | 9 ++++
.../Anet/A8/Configuration_adv.h | 9 ++++
.../BQ/Hephestos/Configuration_adv.h | 9 ++++
.../BQ/Hephestos_2/Configuration_adv.h | 9 ++++
.../BQ/WITBOX/Configuration_adv.h | 9 ++++
.../Cartesio/Configuration_adv.h | 9 ++++
.../Creality/CR-10/Configuration_adv.h | 9 ++++
.../Felix/Configuration_adv.h | 9 ++++
.../Folger Tech/i3-2020/Configuration_adv.h | 9 ++++
.../Infitary/i3-M508/Configuration_adv.h | 9 ++++
.../Malyan/M150/Configuration_adv.h | 9 ++++
.../RigidBot/Configuration_adv.h | 9 ++++
.../SCARA/Configuration_adv.h | 9 ++++
.../Sanguinololu/Configuration_adv.h | 9 ++++
.../TinyBoy2/Configuration_adv.h | 9 ++++
.../Velleman/K8200/Configuration_adv.h | 9 ++++
.../Velleman/K8400/Configuration_adv.h | 9 ++++
.../FLSUN/auto_calibrate/Configuration_adv.h | 9 ++++
.../FLSUN/kossel_mini/Configuration_adv.h | 9 ++++
.../delta/generic/Configuration_adv.h | 9 ++++
.../delta/kossel_mini/Configuration_adv.h | 9 ++++
.../delta/kossel_pro/Configuration_adv.h | 9 ++++
.../delta/kossel_xl/Configuration_adv.h | 9 ++++
.../gCreate/gMax1.5+/Configuration_adv.h | 9 ++++
.../makibox/Configuration_adv.h | 9 ++++
.../tvrrug/Round2/Configuration_adv.h | 9 ++++
.../wt150/Configuration_adv.h | 9 ++++
Marlin/language_en.h | 3 ++
Marlin/ultralcd.cpp | 39 ++++++++++++-----
33 files changed, 333 insertions(+), 17 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index e837e658f91..3520bd52de9 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index b52a348bc56..b33d2404a84 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -354,6 +354,10 @@ extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ];
#if FAN_COUNT > 0
extern int16_t fanSpeeds[FAN_COUNT];
+ #if ENABLED(EXTRA_FAN_SPEED)
+ extern int16_t old_fanSpeeds[FAN_COUNT],
+ new_fanSpeeds[FAN_COUNT];
+ #endif
#if ENABLED(PROBING_FANS_OFF)
extern bool fans_paused;
extern int16_t paused_fanSpeeds[FAN_COUNT];
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 1825386f458..21fff14ebe8 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -117,8 +117,8 @@
* M100 - Watch Free Memory (for debugging) (Requires M100_FREE_MEMORY_WATCHER)
* M104 - Set extruder target temp.
* M105 - Report current temperatures.
- * M106 - Fan on.
- * M107 - Fan off.
+ * M106 - Set print fan speed.
+ * M107 - Print fan off.
* M108 - Break out of heating loops (M109, M190, M303). With no controller, breaks out of M0/M1. (Requires EMERGENCY_PARSER)
* M109 - Sxxx Wait for extruder current temp to reach target temp. Waits only when heating
* Rxxx Wait for extruder current temp to reach target temp. Waits when heating and cooling
@@ -479,6 +479,10 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
#if FAN_COUNT > 0
int16_t fanSpeeds[FAN_COUNT] = { 0 };
+ #if ENABLED(EXTRA_FAN_SPEED)
+ int16_t old_fanSpeeds[FAN_COUNT],
+ new_fanSpeeds[FAN_COUNT];
+ #endif
#if ENABLED(PROBING_FANS_OFF)
bool fans_paused = false;
int16_t paused_fanSpeeds[FAN_COUNT] = { 0 };
@@ -7453,12 +7457,39 @@ inline void gcode_M105() {
*
* S<int> Speed between 0-255
* P<index> Fan index, if more than one fan
+ *
+ * With EXTRA_FAN_SPEED enabled:
+ *
+ * T<int> Restore/Use/Set Temporary Speed:
+ * 1 = Restore previous speed after T2
+ * 2 = Use temporary speed set with T3-255
+ * 3-255 = Set the speed for use with T2
*/
inline void gcode_M106() {
- uint16_t s = parser.ushortval('S', 255);
- NOMORE(s, 255);
- const uint8_t p = parser.byteval('P', 0);
- if (p < FAN_COUNT) fanSpeeds[p] = s;
+ const uint8_t p = parser.byteval('P');
+ if (p < FAN_COUNT) {
+ #if ENABLED(EXTRA_FAN_SPEED)
+ const int16_t t = parser.intval('T');
+ NOMORE(t, 255);
+ if (t > 0) {
+ switch (t) {
+ case 1:
+ fanSpeeds[p] = old_fanSpeeds[p];
+ break;
+ case 2:
+ old_fanSpeeds[p] = fanSpeeds[p];
+ fanSpeeds[p] = new_fanSpeeds[p];
+ break;
+ default:
+ new_fanSpeeds[p] = t;
+ break;
+ }
+ return;
+ }
+ #endif // EXTRA_FAN_SPEED
+ const uint16_t s = parser.ushortval('S', 255);
+ fanSpeeds[p] = min(s, 255);
+ }
}
/**
diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
index dbcdf7b244c..767da54bf3c 100644
--- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Anet/A6/Configuration_adv.h b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
index e3cebb068da..7e6b0078497 100644
--- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Anet/A8/Configuration_adv.h b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
index f41e4ffda24..5dfe6bc7b8d 100644
--- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
index f04869c2306..e33564cfffc 100644
--- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
index a89e69784e3..4e45995ba86 100644
--- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
@@ -807,6 +807,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
index f04869c2306..e33564cfffc 100644
--- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
index 3de5111b5bb..db913fdb3b2 100644
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
index 14150e1e218..04bb514b06d 100755
--- a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index 38fcf602c06..f1de9820319 100644
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
index 891571ea33d..377af558fa1 100644
--- a/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
+++ b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
index a381cb00e2e..7c525300258 100644
--- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
index f16d9c2cc8e..3043b51adee 100644
--- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
+++ b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
@@ -807,6 +807,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h
index d0ae01fb2bd..a684bd5a036 100644
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index cf4a82afee4..0c7313f02ef 100644
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
index 2e8e793d7af..4d90c1cbb62 100644
--- a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
+++ b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
@@ -777,6 +777,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
index a6c9d07d3f8..d00a18a98e2 100644
--- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
index 2e5fa1e708f..7157ac3487a 100644
--- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
@@ -820,6 +820,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
index dd889587e6c..96654938483 100644
--- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
index 41023ea40af..6d88e2fc331 100644
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -812,6 +812,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
index 2e39eded2bc..50d7a361b18 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -812,6 +812,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index 2e39eded2bc..50d7a361b18 100644
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -812,6 +812,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index 2e39eded2bc..50d7a361b18 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -812,6 +812,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
index dd1922f12aa..96f5b5f021d 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -817,6 +817,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
index 1763794cef3..23f4033469a 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
@@ -812,6 +812,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
index 31fcefc84c1..e8d76745fb0 100644
--- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index fad81700ca2..ab9508025c4 100644
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index 29c1f42962d..d72cc8996e7 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h
index 9b5695b94ea..096f5c66f6b 100644
--- a/Marlin/example_configurations/wt150/Configuration_adv.h
+++ b/Marlin/example_configurations/wt150/Configuration_adv.h
@@ -810,6 +810,15 @@
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
#endif
+/**
+ * Extra Fan Speed
+ * Adds a secondary fan speed for each print-cooling fan.
+ * 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
+ * 'M106 P<fan> T2' : Use the set secondary speed
+ * 'M106 P<fan> T1' : Restore the previous fan speed
+ */
+//#define EXTRA_FAN_SPEED
+
/**
* Advanced Pause
* Experimental feature for filament change support and for parking the nozzle when paused.
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index 811b132fb4b..3713433530e 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -398,6 +398,9 @@
#ifndef MSG_FAN_SPEED
#define MSG_FAN_SPEED _UxGT("Fan speed")
#endif
+#ifndef MSG_EXTRA_FAN_SPEED
+ #define MSG_EXTRA_FAN_SPEED _UxGT("Extra fan speed")
+#endif
#ifndef MSG_FLOW
#define MSG_FLOW _UxGT("Flow")
#endif
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index c803b71b41a..a13055b7247 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1241,6 +1241,15 @@ void kill_screen(const char* lcd_msg) {
#endif // ADVANCED_PAUSE_FEATURE
+ // First Fan Speed title in "Tune" and "Control>Temperature" menus
+ #if FAN_COUNT > 0 && HAS_FAN0
+ #if FAN_COUNT > 1
+ #define FAN_SPEED_1_SUFFIX " 1"
+ #else
+ #define FAN_SPEED_1_SUFFIX ""
+ #endif
+ #endif
+
/**
*
* "Tune" submenu
@@ -1296,18 +1305,22 @@ void kill_screen(const char* lcd_msg) {
//
#if FAN_COUNT > 0
#if HAS_FAN0
- #if FAN_COUNT > 1
- #define MSG_1ST_FAN_SPEED MSG_FAN_SPEED " 1"
- #else
- #define MSG_1ST_FAN_SPEED MSG_FAN_SPEED
- #endif
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255);
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED FAN_SPEED_1_SUFFIX, &fanSpeeds[0], 0, 255);
+ #if ENABLED(EXTRA_FAN_SPEED)
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED FAN_SPEED_1_SUFFIX, &new_fanSpeeds[0], 3, 255);
+ #endif
#endif
#if HAS_FAN1
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
+ #if ENABLED(EXTRA_FAN_SPEED)
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 2", &new_fanSpeeds[1], 3, 255);
+ #endif
#endif
#if HAS_FAN2
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
+ #if ENABLED(EXTRA_FAN_SPEED)
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 3", &new_fanSpeeds[2], 3, 255);
+ #endif
#endif
#endif // FAN_COUNT > 0
@@ -3317,18 +3330,22 @@ void kill_screen(const char* lcd_msg) {
//
#if FAN_COUNT > 0
#if HAS_FAN0
- #if FAN_COUNT > 1
- #define MSG_1ST_FAN_SPEED MSG_FAN_SPEED " 1"
- #else
- #define MSG_1ST_FAN_SPEED MSG_FAN_SPEED
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED FAN_SPEED_1_SUFFIX, &fanSpeeds[0], 0, 255);
+ #if ENABLED(EXTRA_FAN_SPEED)
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED FAN_SPEED_1_SUFFIX, &new_fanSpeeds[0], 3, 255);
#endif
- MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255);
#endif
#if HAS_FAN1
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
+ #if ENABLED(EXTRA_FAN_SPEED)
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 2", &new_fanSpeeds[1], 3, 255);
+ #endif
#endif
#if HAS_FAN2
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
+ #if ENABLED(EXTRA_FAN_SPEED)
+ MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 3", &new_fanSpeeds[2], 3, 255);
+ #endif
#endif
#endif // FAN_COUNT > 0