MAX_OVERSHOOT_PID_AUTOTUNE in all variants

3d-gussner · Jan 8, 2025 · eb1b6d5 · eb1b6d5
1 parent 5878aa7
commit eb1b6d5
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 3 deletions.
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
@@ -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)) {
       SERIAL_PROTOCOLLNPGM("PID Autotune failed! Temperature too high");
 	  pid_tuning_finished = true;

diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23

diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23

diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23

diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h
@@ -189,6 +189,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23

diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for E3D REVO
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 25.00
 #define DEFAULT_Ki 4.8
 #define DEFAULT_Kd 32.6

diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23

diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for E3D REVO
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 25.00
 #define DEFAULT_Ki 4.8
 #define DEFAULT_Kd 32.6

diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h
@@ -325,6 +325,7 @@
 #define DEFAULT_Kd 73.76
 #else //NOT E3D_PT100_EXTRUDER_WITH_AMP || E3D_PT100_EXTRUDER_NO_AMP
 // Define PID constants for extruder
+#define MAX_OVERSHOOT_PID_AUTOTUNE 20
 #define DEFAULT_Kp 16.13
 #define DEFAULT_Ki 1.1625
 #define DEFAULT_Kd 56.23