andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove PID examples from preconfigured configs

pull/1/head
Scott Lahteine 10 years ago
committed by Richard Wackerbarth
parent
7456710a1f
commit
de25a48dec
9 changed files with 33 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 31
      Marlin/configurator/config/Configuration.h
  2. 18
      Marlin/example_configurations/Hephestos/Configuration.h
  3. 28
      Marlin/example_configurations/K8200/Configuration.h
  4. 16
      Marlin/example_configurations/RigidBot/Configuration.h
  5. 33
      Marlin/example_configurations/SCARA/Configuration.h
  6. 16
      Marlin/example_configurations/WITBOX/Configuration.h
  7. 31
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  8. 28
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  9. 15
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

31
Marlin/configurator/config/Configuration.h
View File

@ -205,21 +205,22 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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 // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
// Ultimaker // Ultimaker
#define DEFAULT_Kp 22.2 #define DEFAULT_Kp 22.2
#define DEFAULT_Ki 1.08 #define DEFAULT_Ki 1.08
#define DEFAULT_Kd 114 #define DEFAULT_Kd 114
// MakerGear // MakerGear
// #define DEFAULT_Kp 7.0 //#define DEFAULT_Kp 7.0
// #define DEFAULT_Ki 0.1 //#define DEFAULT_Ki 0.1
// #define DEFAULT_Kd 12 //#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V // Mendel Parts V9 on 12V
// #define DEFAULT_Kp 63.0 //#define DEFAULT_Kp 63.0
// #define DEFAULT_Ki 2.25 //#define DEFAULT_Ki 2.25
// #define DEFAULT_Kd 440 //#define DEFAULT_Kd 440
#endif // PIDTEMP #endif // PIDTEMP
//=========================================================================== //===========================================================================

18
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -208,23 +208,7 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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 // Hephestos i3
// Ultimaker
//#define DEFAULT_Kp 22.2
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
// Hephestos (i3)
#define DEFAULT_Kp 23.05 #define DEFAULT_Kp 23.05
#define DEFAULT_Ki 2.00 #define DEFAULT_Ki 2.00
#define DEFAULT_Kd 66.47 #define DEFAULT_Kd 66.47

28
Marlin/example_configurations/K8200/Configuration.h
View File

@ -210,22 +210,6 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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
// Ultimaker
//#define DEFAULT_Kp 22.2
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
// Vellemann K8200 Extruder - calculated with PID Autotune and tested // Vellemann K8200 Extruder - calculated with PID Autotune and tested
#define DEFAULT_Kp 24.29 #define DEFAULT_Kp 24.29
#define DEFAULT_Ki 1.58 #define DEFAULT_Ki 1.58
@ -261,18 +245,6 @@ Here are some standard links for getting your machine calibrated:
#define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term #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
//#define DEFAULT_bedKi .023
//#define DEFAULT_bedKd 305.4
//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune
//#define DEFAULT_bedKp 97.1
//#define DEFAULT_bedKi 1.41
//#define DEFAULT_bedKd 1675.16
//Vellemann K8200 PCB heatbed with standard PCU at 60 degreesC - calculated with PID Autotune and tested //Vellemann K8200 PCB heatbed with standard PCU at 60 degreesC - calculated with PID Autotune and tested
//from pidautotune //from pidautotune
#define DEFAULT_bedKp 341.88 #define DEFAULT_bedKp 341.88

16
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -211,16 +211,6 @@ Here are some standard links for getting your machine calibrated:
#define DEFAULT_Ki 4.21 //Base DGlass3D/E3Dv6 = 0.85 ; RigidBot redesigned = 0.85 #define DEFAULT_Ki 4.21 //Base DGlass3D/E3Dv6 = 0.85 ; RigidBot redesigned = 0.85
#define DEFAULT_Kd 88.41 //Base DGlass3D/E3Dv6 = 245 ; RigidBot redesigned = 76.55 #define DEFAULT_Kd 88.41 //Base DGlass3D/E3Dv6 = 245 ; RigidBot redesigned = 76.55
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
#endif // PIDTEMP #endif // PIDTEMP
//=========================================================================== //===========================================================================
@ -256,12 +246,6 @@ Here are some standard links for getting your machine calibrated:
#define DEFAULT_bedKi 66.5 #define DEFAULT_bedKi 66.5
#define DEFAULT_bedKd 480 #define DEFAULT_bedKd 480
//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune
//#define DEFAULT_bedKp 97.1
//#define DEFAULT_bedKi 1.41
//#define DEFAULT_bedKd 1675.16
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED #endif // PIDTEMPBED

33
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -230,27 +230,6 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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
// Ultimaker
//#define DEFAULT_Kp 22.2
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
// Jhead MK5: From Autotune
//#define DEFAULT_Kp 20.92
//#define DEFAULT_Ki 1.51
//#define DEFAULT_Kd 72.34
// Merlin Hotend: From Autotune // Merlin Hotend: From Autotune
#define DEFAULT_Kp 24.5 #define DEFAULT_Kp 24.5
#define DEFAULT_Ki 1.72 #define DEFAULT_Ki 1.72
@ -286,18 +265,6 @@ Here are some standard links for getting your machine calibrated:
#define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term #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
//#define DEFAULT_bedKi .023
//#define DEFAULT_bedKd 305.4
//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune
//#define DEFAULT_bedKp 97.1
//#define DEFAULT_bedKi 1.41
//#define DEFAULT_bedKd 1675.16
//12v Heatbed Mk3 12V in parallel //12v Heatbed Mk3 12V in parallel
//from pidautotune //from pidautotune
#define DEFAULT_bedKp 630.14 #define DEFAULT_bedKp 630.14

16
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -208,22 +208,6 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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
// Ultimaker
//#define DEFAULT_Kp 22.2
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
// Witbox // Witbox
#define DEFAULT_Kp 22.2 #define DEFAULT_Kp 22.2
#define DEFAULT_Ki 1.08 #define DEFAULT_Ki 1.08

31
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -205,21 +205,22 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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 // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
// Ultimaker // Ultimaker
#define DEFAULT_Kp 22.2 #define DEFAULT_Kp 22.2
#define DEFAULT_Ki 1.08 #define DEFAULT_Ki 1.08
#define DEFAULT_Kd 114 #define DEFAULT_Kd 114
// MakerGear // MakerGear
// #define DEFAULT_Kp 7.0 //#define DEFAULT_Kp 7.0
// #define DEFAULT_Ki 0.1 //#define DEFAULT_Ki 0.1
// #define DEFAULT_Kd 12 //#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V // Mendel Parts V9 on 12V
// #define DEFAULT_Kp 63.0 //#define DEFAULT_Kp 63.0
// #define DEFAULT_Ki 2.25 //#define DEFAULT_Ki 2.25
// #define DEFAULT_Kd 440 //#define DEFAULT_Kd 440
#endif // PIDTEMP #endif // PIDTEMP
//=========================================================================== //===========================================================================

28
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -209,27 +209,11 @@ Here are some standard links for getting your machine calibrated:
#define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
#define K1 0.95 //smoothing factor within the PID #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
// Ultimaker
//#define DEFAULT_Kp 22.2
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114
// Kossel Pro // Kossel Pro
#define DEFAULT_Kp 19.30 #define DEFAULT_Kp 19.30
#define DEFAULT_Ki 3.51 #define DEFAULT_Ki 3.51
#define DEFAULT_Kd 26.56 #define DEFAULT_Kd 26.56
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
#endif // PIDTEMP #endif // PIDTEMP
//=========================================================================== //===========================================================================
@ -266,18 +250,6 @@ Here are some standard links for getting your machine calibrated:
#define DEFAULT_bedKi 62.77 #define DEFAULT_bedKi 62.77
#define DEFAULT_bedKd 545.98 #define DEFAULT_bedKd 545.98
//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
//#define DEFAULT_bedKi .023
//#define DEFAULT_bedKd 305.4
//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune
//#define DEFAULT_bedKp 97.1
//#define DEFAULT_bedKi 1.41
//#define DEFAULT_bedKd 1675.16
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED #endif // PIDTEMPBED

15
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -211,21 +211,6 @@ Here are some standard links for getting your machine calibrated:
#define DEFAULT_Ki 2.30 #define DEFAULT_Ki 2.30
#define DEFAULT_Kd 68.15 #define DEFAULT_Kd 68.15
// Ultimaker
//#define DEFAULT_Kp 22.2
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
#endif // PIDTEMP #endif // PIDTEMP
//=========================================================================== //===========================================================================

Write Preview
Loading…
Cancel
Save