diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8cdd7f5d06752ab9819312f862f629404b610a62..bf37fe1eeaa066af9a1f0819b3f3f47f5ce35b99 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index 8cdd7f5d06752ab9819312f862f629404b610a62..bf37fe1eeaa066af9a1f0819b3f3f47f5ce35b99 100644 --- a/Marlin/src/config/default/Configuration_adv.h +++ b/Marlin/src/config/default/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h index 7278321821a7f1248153975f3b62dcf81f85c2c9..90674661d789cf45754cb378581595ead3ff2468 100644 --- a/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h +++ b/Marlin/src/config/examples/3DFabXYZ/Migbot/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index f3a3b701f99e5c33d6acdad288c074cadcbf41fe..a9ed5c838dd7632243e1216a4138a5d93d480f2e 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index bdcb981bc460b7fa4721c3c0c0282c80cb017725..35b30313f2cd4ac6fad5314973b5bc3a05a7aa34 100644 --- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index bdcb981bc460b7fa4721c3c0c0282c80cb017725..35b30313f2cd4ac6fad5314973b5bc3a05a7aa34 100644 --- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 3431b89822409f836ca0df6c2f8c71316c50e03a..bef3af95edfc77c9c34ec72f13ed742fa9fe8fed 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index 56df31fc22c6c6693032b0fa365304724ac176e7..94ddc4f5c4aea6d1e6289d29a36bd0bb8ef0f7c4 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h index e49b4ecd671de022371eac0780f6dcdf53d08f6f..5c9d22308fe66ecd5cfa53a76b7f3d3b986a604f 100644 --- a/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h +++ b/Marlin/src/config/examples/AnyCubic/i3/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h index 2d19ad6372d34886d319d7df48a242c0b4e0b85a..97023bbb20dec1d0c241f2fe4d7667f5822c6b3b 100644 --- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h +++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h @@ -82,6 +82,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index b992e9a78e5b45688604f2688b058fec84c81423..57a9767dfdd531079284f523ac3641941bd7ba52 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 2 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index a5afef4c1691e40770dac8feb6b768b52ce1f729..5ccefe6428f7633d2054d8dfa99090e8086d605d 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 2 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index f4618d4c501b9d618334c9c5c0b6f6433b781393..286079964121b898f9ae8d92e5ee3595cbafac8a 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index 1cfaebfb93fceef312318d4a9d7268a4e9a4259a..21115f65d20a173a92b860e67bd101fd1f7e8b1b 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index f4618d4c501b9d618334c9c5c0b6f6433b781393..286079964121b898f9ae8d92e5ee3595cbafac8a 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index 11ba9a9b6277a1fb20e6b74b32da03d75414e864..a4e124f3f39924cc93a24e5d909e7c532ca272ea 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h +++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index ca0af674bbfef01f7cfa85c175596308eaad17f2..8d157eab9a52bf9ea21b3677df7dc0c71ccaca0e 100644 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index 51a8d27941aa79db1d973a29cb315bfbeefa4156..6abb4b4b22e9b83e4034bbeb8df9a8de63baf3bb 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index b18d14789a8051a70afaaa73c4c5dcb8885b2deb..886fbc8ac0c88cb635796b278567e683295ee7ea 100644 --- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index 557dde89acc6ae7cb97bee573e08c9bcaae908a4..a118d09b3adaba873003231aa76c0b663b2a8253 100644 --- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 8405e547c0b23d4f1b016807dbe27250f4070a71..99ae40bdcaca96e31ff737569de51cca83c4290e 100644 --- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index aa53d5181292c18ee9393e0ce83ba8dafd7959aa..54a57e81dd332107d78ab4bd874ba6f667cd185a 100644 --- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index 3876a9c55956a64236d7aec42061063f4e5e30f9..2dd5c9f65ae6c567e5ac74a7fe2042a7f4dd2c04 100644 --- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h +++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index 698765a1ca00ba4c960e3a6aa2624363c02ff46b..e890b893287243dd1133640474be30da7f01082b 100644 --- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h +++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index 317324c6f3eddc93787b3908433f1f7d5e572931..8a954e93244a388726b69b15b9a94e21b17cdc71 100644 --- a/Marlin/src/config/examples/Felix/Configuration_adv.h +++ b/Marlin/src/config/examples/Felix/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h index d06005ae412c68df4491a37b6d7931300372377d..4e1461581cf98ba883071ad0b77f0102bfb9bea3 100644 --- a/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h +++ b/Marlin/src/config/examples/FlashForge/CreatorPro/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index a8daafccc4423977b344841683e77ee878b97d55..6cef2e73c8c71ca1a732530531bcbfb3f04c1475 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 2 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index 7eb68c141228212815d40e898ac2544666094b79..4335cead860a264ced9bd1a58bbaf54b15b9e185 100644 --- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 2 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index cb36de30f71568f2611e9a54c7d200c8a96df74c..9961329dfc103ac5ad625838623d32c415e7e24a 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h index 19f559137dfdcafbaa6e20d786e351ac3c795eb5..427c41df147e14aae4a7ea63fdc0f54436509848 100644 --- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h +++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h index 6d93fd0d2e5ae22b7b2a9a332e42b8a05bda57d8..4e9235b0ca4870666edb6c04febb826e30ffb64b 100644 --- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 3fb163f520bba5fe5edd547b3260b213b5f45d43..4f2cc5f567d427382418f192b40554a464321cc8 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 3fb163f520bba5fe5edd547b3260b213b5f45d43..4f2cc5f567d427382418f192b40554a464321cc8 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 73bdf62dd1e087ed118be46a8d8f16306ff94ecc..e1f7984fef254a46cf87f51fbeb072788e4e22e9 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index 4bc3c5166dd4017541eb9e3351049645cc35e439..149912837e19f86a1fcb457493ee515ad67022b8 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 9a977efdda8f0f8ed4e1c710be8d9bc9fdf01588..bd01a83732b17966023ac0a0f111f827c30ae932 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h +++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index 85f736061c75ac160e2ebebe5fda011f95fc78d6..c976f5d77acde9d54dff5fa89311ded95f6c482e 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 2f65e8d30ea9cf23676800284e8eadd8b13e9c07..3f03df0f3585a255e5894367e1b03aca16917c43 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index 84e3a71615de444f52ec4dde8294c73d72ac8818..d6781ad60ffe59c1b51c7e7a9895f2e62024bf14 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h index 70ec34d6db237fad3a641316d76bd033e3f6fc7f..bc9f6149b327a246b51c3c38b0af5f75507e76a2 100644 --- a/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Robin/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index 92227eca99baee6cf4a67cb340c315d09dd7f838..ab97398f059cf350d494a74611703314530232ea 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 6 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h index c75fbefe450fedae8a18d9ed9d5269ed2ee3fd93..1c30a371913bc9a7d95a88c7c39eb3cf5e503142 100644 --- a/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h +++ b/Marlin/src/config/examples/RapideLite/RL200/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index a11e33efc920aa5fba8901d5dfdf57e7a08e1a94..cf8abe0d65979d439443246266df562df3334946 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h +++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index 515dc02e970981090ed14ec896fdd95d6bcd1936..dd760ba6f39c141cc39c56fcba534dbc6e5cc91c 100644 --- a/Marlin/src/config/examples/SCARA/Configuration_adv.h +++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 91843aacf3fe0dfda9cbe206cd116d072533c5eb..820c2b41c85dee9e856aaec264ef405c3dc5c9bf 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 08f5dd90d1ee8a4451cab8e7bd28b672dd84c269..128dd57882a6e03dae3b515cbbefe7a20e10f0fc 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h +++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 6 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index a1db5bcc9c94167f67a6478362776279f74a3a22..faea40427c47ec09ef858793d4ceddbf3bfa325a 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index 50f7ca0902cd6c059dca12adb1a15b5f4fb6ab2c..ae9d30b4562ad1a87aa4291bb2da9cb9328b24fc 100644 --- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h +++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h index d74bc59ac13b2794d4fcf1ce33f140396cc3cec2..1b4376b50d19769cf789b4ee95f0b71ef56f6627 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim1/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 06698fbf2cfebed18e299fc6923bd3a08a8e981b..4452a21f2eb594552aa94d2234b6dc2b24bedaec 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h index 84bbd62cc65770f9568d8a0f786d6170f7c9157a..e4d81a85058fd91a913c601ffbfe8af800a858ab 100644 --- a/Marlin/src/config/examples/VORONDesign/Configuration_adv.h +++ b/Marlin/src/config/examples/VORONDesign/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index 80f0cce15baa0a57a74e1bd263c63224de0b9292..58b94889603b80d600ec3e7ca1611dcb7774f80b 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h @@ -88,6 +88,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 8 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 29b3401770e181dbdde62bb15c5075b2c0394fb3..accc7822783149c91b48b3a606e704de7ef6bb18 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h index 9763bfc32e3482110f853e330d6c512d37fbf4b9..35d0a95a010c706c286cf87e332c8d04c7d07d34 100644 --- a/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h +++ b/Marlin/src/config/examples/WASP/PowerWASP/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 97378fcdfad94eb36659b2fa1b7210d1ece540b3..529ebb59fdfc6c2e20328dfa667313883d2615dd 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 92e3209032bab61ebac3e93d9cb05352f42d500d..d06363b7e02e6a2b5b94f1f78a23446a8ebeeeac 100644 --- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 9eb442c047470822ee73e900427c0e46de1ba4ba..90ed68c9bccaedf1f65d0cd36520aca6634fbf9b 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 9eb442c047470822ee73e900427c0e46de1ba4ba..90ed68c9bccaedf1f65d0cd36520aca6634fbf9b 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 3c5359e20bc341471e9dde9bfcd528d817468188..361ec5d92b03054940f0b15299eca34294892a36 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h index 2df5dd8bf99fd668d31ad0d4bba831bd17575f31..e864d530859084ea7c1d6f52bce9779ee4856bab 100644 --- a/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h index d61a32e8160547ed7bba315e4617fe1e22f26b2e..e5620681ee4129035f758256658d6e8a83fb6aab 100644 --- a/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/MKS/SBASE/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 6 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h index 08cec58140e56c8d9c61d759434eb179b3a82464..c793d4df682f6495a41b132a6cbca28ac6cf5e3e 100644 --- a/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/Tevo Little Monster/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index 3c5359e20bc341471e9dde9bfcd528d817468188..361ec5d92b03054940f0b15299eca34294892a36 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index 3c5359e20bc341471e9dde9bfcd528d817468188..361ec5d92b03054940f0b15299eca34294892a36 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index 702c319b49aa70c42660c80aaf7fcd1325e047ed..174433816c442e81d640121ad20c4667f4b40e73 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 1785ce62bc1752f8cdc470576e91a8a7343ca860..f4b074f3c3c01508f902b400a47fc2d8adb8f2e9 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 3 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index 6b9f4512b03336117c6e9f59eeb0ab932c220f55..a697d85771fae10e21f54bb8d0bd187989961b84 100644 --- a/Marlin/src/config/examples/makibox/Configuration_adv.h +++ b/Marlin/src/config/examples/makibox/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index 7e5e37caffdf62bf1f468cbce3a605376c64f6ee..5af50c00c900c20e15c76164bfed4e39f8ad3478 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index a82743befd110983af1efa1e2f5216a1fb0221ac..5a6e470b14f6dffc4506ecbd81d3183f391e8c7d 100644 --- a/Marlin/src/config/examples/wt150/Configuration_adv.h +++ b/Marlin/src/config/examples/wt150/Configuration_adv.h @@ -78,6 +78,9 @@ #define THERMAL_PROTECTION_HYSTERESIS 4 // Degrees Celsius //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif /** * Whenever an M104, M109, or M303 increases the target temperature, the diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index f50a0ffdc70fafdffcdc1b737b4e7a5cc5d9edf6..4b22ca465729b63fe56ea9c6956ab608432b7dc9 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -1260,11 +1260,14 @@ #endif /** - * Heater & Fan Pausing + * Heater, Fan, and Probe interactions */ #if FAN_COUNT == 0 #undef PROBING_FANS_OFF + #undef ADAPTIVE_FAN_SLOWING + #undef NO_FAN_SLOWING_IN_PID_TUNING #endif + #define QUIET_PROBING (HAS_BED_PROBE && (ENABLED(PROBING_HEATERS_OFF) || ENABLED(PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0)) #define HEATER_IDLE_HANDLER (ENABLED(ADVANCED_PAUSE_FEATURE) || ENABLED(PROBING_HEATERS_OFF)) diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 0cb8b04349889a92cbeda6991bd2b0d02746296f..a201fee31bad0f6bde74218cb28ecce3e0e0873f 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -96,6 +96,10 @@ Temperature thermalManager; // public: +#if ENABLED(NO_FAN_SLOWING_IN_PID_TUNING) + bool Temperature::adaptive_fan_slowing = true; +#endif + float Temperature::current_temperature[HOTENDS]; // = { 0.0 }; int16_t Temperature::current_temperature_raw[HOTENDS], // = { 0 } Temperature::target_temperature[HOTENDS]; // = { 0 } @@ -392,6 +396,10 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS]; LEDColor color = ONHEATINGSTART(); #endif + #if ENABLED(NO_FAN_SLOWING_IN_PID_TUNING) + adaptive_fan_slowing = false; + #endif + // PID Tuning loop while (wait_for_heatup) { @@ -570,18 +578,27 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS]; _SET_BED_PID(); #endif } + #if ENABLED(PRINTER_EVENT_LEDS) printerEventLEDs.onPidTuningDone(color); #endif - return; + goto EXIT_M303; } ui.update(); } + disable_all_heaters(); + #if ENABLED(PRINTER_EVENT_LEDS) printerEventLEDs.onPidTuningDone(color); #endif + + EXIT_M303: + #if ENABLED(NO_FAN_SLOWING_IN_PID_TUNING) + adaptive_fan_slowing = true; + #endif + return; } #endif // HAS_PID_HEATING @@ -1627,8 +1644,8 @@ void Temperature::init() { // While the temperature is stable watch for a bad temperature case TRStable: - #if ENABLED(ADAPTIVE_FAN_SLOWING) && FAN_COUNT > 0 - if (heater_id >= 0) { + #if ENABLED(ADAPTIVE_FAN_SLOWING) + if (adaptive_fan_slowing && heater_id >= 0) { const int fan_index = MIN(heater_id, FAN_COUNT - 1); if (fan_speed[fan_index] == 0 || current >= tr_target_temperature[heater_id] - (hysteresis_degc * 0.25f)) fan_speed_scaler[fan_index] = 128; diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h index 0d67163cad1d126ab6ba8eadcdaff1f2aeb8fe0d..d68ce819e6747b2ae7ddab50bad228ef8f4552b5 100644 --- a/Marlin/src/module/temperature.h +++ b/Marlin/src/module/temperature.h @@ -565,6 +565,12 @@ class Temperature { #if HAS_PID_HEATING static void PID_autotune(const float &target, const int8_t hotend, const int8_t ncycles, const bool set_result=false); + #if ENABLED(NO_FAN_SLOWING_IN_PID_TUNING) + static bool adaptive_fan_slowing; + #elif ENABLED(ADAPTIVE_FAN_SLOWING) + constexpr static bool adaptive_fan_slowing = true; + #endif + /** * Update the temp manager when PID values change */ diff --git a/buildroot/share/tests/LPC1768_tests b/buildroot/share/tests/LPC1768_tests index f79cefa00c18c4d4ee3490ee90405ab458979d53..56e405e7d7c927882a4736e5dd551597b13d1479 100755 --- a/buildroot/share/tests/LPC1768_tests +++ b/buildroot/share/tests/LPC1768_tests @@ -36,7 +36,7 @@ opt_set EXTRUDERS 2 opt_set TEMP_SENSOR_0 1 opt_set TEMP_SENSOR_1 5 opt_set TEMP_SENSOR_BED 1 -opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT ADAPTIVE_FAN_SLOWING \ +opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \ FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY \ FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \ BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \