MAX_OVERSHOOT_PID_AUTOTUNE in all variants
This commit is contained in:
parent
3f3372ed51
commit
5e7e48a1ba
|
|
@ -387,9 +387,6 @@ void __attribute__((noinline)) PID_autotune(float temp, int extruder, int ncycle
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifndef MAX_OVERSHOOT_PID_AUTOTUNE
|
|
||||||
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
|
||||||
#endif
|
|
||||||
if(input > (temp + MAX_OVERSHOOT_PID_AUTOTUNE)) {
|
if(input > (temp + MAX_OVERSHOOT_PID_AUTOTUNE)) {
|
||||||
SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high");
|
SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high");
|
||||||
pid_tuning_finished = true;
|
pid_tuning_finished = true;
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for extruder
|
// Define PID constants for extruder
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 16.13
|
#define DEFAULT_Kp 16.13
|
||||||
#define DEFAULT_Ki 1.1625
|
#define DEFAULT_Ki 1.1625
|
||||||
#define DEFAULT_Kd 56.23
|
#define DEFAULT_Kd 56.23
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for extruder
|
// Define PID constants for extruder
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 16.13
|
#define DEFAULT_Kp 16.13
|
||||||
#define DEFAULT_Ki 1.1625
|
#define DEFAULT_Ki 1.1625
|
||||||
#define DEFAULT_Kd 56.23
|
#define DEFAULT_Kd 56.23
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for extruder
|
// Define PID constants for extruder
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 16.13
|
#define DEFAULT_Kp 16.13
|
||||||
#define DEFAULT_Ki 1.1625
|
#define DEFAULT_Ki 1.1625
|
||||||
#define DEFAULT_Kd 56.23
|
#define DEFAULT_Kd 56.23
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for extruder
|
// Define PID constants for extruder
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 16.13
|
#define DEFAULT_Kp 16.13
|
||||||
#define DEFAULT_Ki 1.1625
|
#define DEFAULT_Ki 1.1625
|
||||||
#define DEFAULT_Kd 56.23
|
#define DEFAULT_Kd 56.23
|
||||||
|
|
|
||||||
|
|
@ -325,6 +325,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for E3D REVO
|
// Define PID constants for E3D REVO
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 25.00
|
#define DEFAULT_Kp 25.00
|
||||||
#define DEFAULT_Ki 4.8
|
#define DEFAULT_Ki 4.8
|
||||||
#define DEFAULT_Kd 32.6
|
#define DEFAULT_Kd 32.6
|
||||||
|
|
|
||||||
|
|
@ -325,6 +325,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for extruder
|
// Define PID constants for extruder
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 16.13
|
#define DEFAULT_Kp 16.13
|
||||||
#define DEFAULT_Ki 1.1625
|
#define DEFAULT_Ki 1.1625
|
||||||
#define DEFAULT_Kd 56.23
|
#define DEFAULT_Kd 56.23
|
||||||
|
|
|
||||||
|
|
@ -325,6 +325,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for E3D REVO
|
// Define PID constants for E3D REVO
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 25.00
|
#define DEFAULT_Kp 25.00
|
||||||
#define DEFAULT_Ki 4.8
|
#define DEFAULT_Ki 4.8
|
||||||
#define DEFAULT_Kd 32.6
|
#define DEFAULT_Kd 32.6
|
||||||
|
|
|
||||||
|
|
@ -325,6 +325,7 @@
|
||||||
#define DEFAULT_Kd 73.76
|
#define DEFAULT_Kd 73.76
|
||||||
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
#else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
|
||||||
// Define PID constants for extruder
|
// Define PID constants for extruder
|
||||||
|
#define MAX_OVERSHOOT_PID_AUTOTUNE 20
|
||||||
#define DEFAULT_Kp 16.13
|
#define DEFAULT_Kp 16.13
|
||||||
#define DEFAULT_Ki 1.1625
|
#define DEFAULT_Ki 1.1625
|
||||||
#define DEFAULT_Kd 56.23
|
#define DEFAULT_Kd 56.23
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue