From 53cc6cca465e9e45256b454bc467b1ff05ee9cce Mon Sep 17 00:00:00 2001 From: Scott Lahteine <sourcetree@thinkyhead.com> Date: Fri, 25 Mar 2016 19:07:50 -0700 Subject: [PATCH] Formalize some dependencies on PIDTEMPBED --- Marlin/Configuration.h | 4 ++-- Marlin/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/Felix/Configuration.h | 4 ++-- Marlin/example_configurations/Felix/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/Hephestos/Configuration.h | 4 ++-- .../example_configurations/Hephestos/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/Hephestos_2/Configuration.h | 4 ++-- .../Hephestos_2/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/K8200/Configuration.h | 4 ++-- Marlin/example_configurations/K8200/Configuration_adv.h | 8 +++++--- .../RepRapWorld/Megatronics/Configuration.h | 4 ++-- Marlin/example_configurations/RigidBot/Configuration.h | 4 ++-- .../example_configurations/RigidBot/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/SCARA/Configuration.h | 4 ++-- Marlin/example_configurations/SCARA/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/TAZ4/Configuration.h | 4 ++-- Marlin/example_configurations/TAZ4/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/WITBOX/Configuration.h | 4 ++-- Marlin/example_configurations/WITBOX/Configuration_adv.h | 8 +++++--- .../adafruit/ST7565/Configuration.h | 4 ++-- .../example_configurations/delta/biv2.5/Configuration.h | 4 ++-- .../delta/biv2.5/Configuration_adv.h | 8 +++++--- .../example_configurations/delta/generic/Configuration.h | 4 ++-- .../delta/generic/Configuration_adv.h | 8 +++++--- .../delta/kossel_mini/Configuration.h | 4 ++-- .../delta/kossel_mini/Configuration_adv.h | 8 +++++--- .../delta/kossel_pro/Configuration.h | 4 ++-- .../delta/kossel_pro/Configuration_adv.h | 8 +++++--- .../delta/kossel_xl/Configuration.h | 4 ++-- .../delta/kossel_xl/Configuration_adv.h | 8 +++++--- Marlin/example_configurations/makibox/Configuration.h | 4 ++-- Marlin/example_configurations/makibox/Configuration_adv.h | 8 +++++--- .../example_configurations/tvrrug/Round2/Configuration.h | 4 ++-- .../tvrrug/Round2/Configuration_adv.h | 8 +++++--- 34 files changed, 116 insertions(+), 84 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 0470717ee6..fc884523cd 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -280,10 +280,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 8b3edfc719..53c529f2fe 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 07ba5d3ae1..e593e3fffa 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -269,10 +269,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term // Felix Foil Heater diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 54f6421e3b..5c493138b4 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 668a6d19fe..28f31bc8dd 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -272,10 +272,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 603a39a48d..c35788addd 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/Hephestos_2/Configuration.h index e9f46bf802..fd68d6b921 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration.h @@ -274,10 +274,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index b5480ffa0e..04fa3111ec 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index ac11f90e45..a339ca7ccb 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -291,10 +291,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 6a14bf9139..f5b6e70ea6 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -47,10 +47,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index f3c599018b..bd2eeede27 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -280,10 +280,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 1449618e21..a9c7f836a3 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -281,10 +281,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //RigidBot, from pid autotune diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 79f71c7203..08e9f6e593 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 617297b7a3..6b90f968a9 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -294,10 +294,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //12v Heatbed Mk3 12V in parallel diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index ab8219fc2b..41533b5735 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 3000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 3000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index b264983c16..e59b53a48d 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -290,10 +290,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 206 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //24V 360W silicone heater from NPH on 3mm borosilicate (TAZ 2.2+) diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 724b03cda6..3b4b16a822 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 8b542f0a87..48bad33e47 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -272,10 +272,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index 603a39a48d..c35788addd 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 99e45c63eb..8a9f1b86b3 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -280,10 +280,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 0be53f0e57..7e721e450b 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -280,10 +280,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index 371b7499bb..a491731738 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index d50c4fd73e..c4f201056b 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -280,10 +280,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 05c62c75c8..b5cb7ef1ca 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index d3181ac1c6..625b999e29 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -280,10 +280,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 776efae909..63ad90552a 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index be6db9240d..1c27135ebc 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -275,10 +275,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //Kossel Pro heated bed plate with borosilicate glass diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index ff226d0765..5f2c24e83a 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -46,10 +46,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration.h b/Marlin/example_configurations/delta/kossel_xl/Configuration.h index 7fcb955dbb..4ca1d71f1e 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration.h @@ -308,10 +308,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 3c6ce07c4f..f8e4dbaec1 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 5da1898426..9dc34cf619 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -283,10 +283,10 @@ // to increase the heat up rate. However, if changed, user must be aware of the safety concerns // of drawing too much current from the power supply. -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index c2e5550a72..f8e1287a92 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index d98c5f65ec..8204cf28ef 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -270,10 +270,10 @@ // so you shouldn't use it unless you are OK with PWM on your bed. (see the comment on enabling PIDTEMPBED) #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current -//#define PID_BED_DEBUG // Sends debug data to the serial port. - #if ENABLED(PIDTEMPBED) + //#define PID_BED_DEBUG // Sends debug data to the serial port. + #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index d513cdfa62..5ae2355e34 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -41,10 +41,12 @@ //=============================Thermal Settings ============================ //=========================================================================== -#if ENABLED(BED_LIMIT_SWITCHING) - #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif #endif -#define BED_CHECK_INTERVAL 5000 //ms between checks in bang-bang control /** * Thermal Protection protects your printer from damage and fire if a -- GitLab