Skip to content

Commit

Permalink
Apply changes to all configs
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Sep 29, 2016
1 parent 50e5ee4 commit fffc9fe
Show file tree
Hide file tree
Showing 21 changed files with 0 additions and 61 deletions.
3 changes: 0 additions & 3 deletions Marlin/example_configurations/Cartesio/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -330,8 +329,6 @@

//#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 500W silicone heater on to 4mm glass CartesioW
#define DEFAULT_bedKp 390
#define DEFAULT_bedKi 70
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/Felix/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Felix 2.0+ electronics with v4 Hotend
Expand Down Expand Up @@ -317,8 +316,6 @@

//#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
#define DEFAULT_bedKp 103.37
#define DEFAULT_bedKi 2.79
Expand Down
1 change: 0 additions & 1 deletion Marlin/example_configurations/Felix/DUAL/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Felix 2.0+ electronics with v4 Hotend
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/Hephestos/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Hephestos i3
Expand Down Expand Up @@ -320,8 +319,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/Hephestos_2/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 250 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Tuned PID values using M303
Expand Down Expand Up @@ -322,8 +321,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/K8200/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -339,8 +338,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
//#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/K8400/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/K8400/Dual-head/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/RigidBot/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -332,8 +331,6 @@

//#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
#define DEFAULT_bedKp 355
#define DEFAULT_bedKi 66.5
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/SCARA/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Merlin Hotend: From Autotune
Expand Down Expand Up @@ -349,8 +348,6 @@

//#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
//from pidautotune
#define DEFAULT_bedKp 630.14
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/TAZ4/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 16 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -338,8 +337,6 @@

//#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+)
#define DEFAULT_bedKp 20
#define DEFAULT_bedKi 5
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/WITBOX/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Witbox
Expand Down Expand Up @@ -320,8 +319,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/adafruit/ST7565/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/delta/biv2.5/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/delta/generic/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -328,8 +327,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 50 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// Kossel Pro
Expand Down Expand Up @@ -323,8 +322,6 @@

//#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
//from pidautotune (M303 E-1 S60 C8)
#define DEFAULT_bedKp 370.25
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/delta/kossel_xl/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -326,8 +325,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 15.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/makibox/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -331,8 +330,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down
3 changes: 0 additions & 3 deletions Marlin/example_configurations/tvrrug/Round2/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@
// Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID

// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
Expand Down Expand Up @@ -318,8 +317,6 @@

//#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+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
Expand Down

0 comments on commit fffc9fe

Please sign in to comment.