From 5e7e48a1ba8ee02f8020a58071ec9eb09cdc8063 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 8 Jan 2025 07:08:53 +0100
Subject: [PATCH] MAX_OVERSHOOT_PID_AUTOTUNE in all variants

---
 Firmware/temperature.cpp           | 3 ---
 Firmware/variants/MK25-RAMBo10a.h  | 1 +
 Firmware/variants/MK25-RAMBo13a.h  | 1 +
 Firmware/variants/MK25S-RAMBo10a.h | 1 +
 Firmware/variants/MK25S-RAMBo13a.h | 1 +
 Firmware/variants/MK3-E3DREVO.h    | 1 +
 Firmware/variants/MK3.h            | 1 +
 Firmware/variants/MK3S-E3DREVO.h   | 1 +
 Firmware/variants/MK3S.h           | 1 +
 9 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index cee55b661..4b490e08d 100755
--- 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
index 88cd5d115..0460e2e19 100644
--- 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
index 74fad4e2c..1db1018c3 100644
--- 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
index 4238f925e..a8f249267 100644
--- 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
index b9c3df828..7e9afd207 100644
--- 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
index a5f3351b8..086860423 100644
--- 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
index 4a27960dd..ea7c66a9d 100644
--- 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
index d1d7e78a0..287d5ce85 100644
--- 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
index 154706f70..452cb4dce 100644
--- 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