From 606338c6527056579014aca51456a57af0fc1cc7 Mon Sep 17 00:00:00 2001
From: Holger Wirtz <wirtz@dfn.de>
Date: Tue, 23 Mar 2021 15:48:41 +0100
Subject: [PATCH] Several small fixes.

---
 Marlin/Configuration.h     | 31 ++++++++++++++++++++++---------
 Marlin/Configuration_adv.h |  3 +--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c22ba31..7acbcfe 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -476,6 +476,8 @@
 //===========================================================================
 // PID Tuning Guide here: https://reprap.org/wiki/PID_Tuning
 
+// https://drucktipps3d.de/pid-tuning-stabile-temperaturen-fuer-den-drucker/ //HW
+
 // Comment the following line to disable PID and enable bang-bang.
 #define PIDTEMP
 #define BANG_MAX 255     // Limits current to nozzle while in bang-bang mode; 255=full current
@@ -491,9 +493,9 @@
   // 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
+  //#define DEFAULT_Kp 22.2
+  //#define DEFAULT_Ki 1.08
+  //#define DEFAULT_Kd 114
 
   // MakerGear
   //#define DEFAULT_Kp 7.0
@@ -505,6 +507,11 @@
   //#define DEFAULT_Ki 2.25
   //#define DEFAULT_Kd 440
 
+  // Ender-3 (HW)
+  #define DEFAULT_Kp 18.55 //HW
+  #define DEFAULT_Ki 1.26 //HW
+  #define DEFAULT_Kd 68.11 //HW
+
 #endif // PIDTEMP
 
 //===========================================================================
@@ -543,9 +550,9 @@
 
   //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
+  //#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
@@ -554,6 +561,12 @@
   //#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.
+
+  // Ender-3 (HW)
+  #define DEFAULT_bedKp 87.11 //HW
+  #define DEFAULT_bedKi 16.20 //HW
+  #define DEFAULT_bedKd 312.17 //HW
+
 #endif // PIDTEMPBED
 
 #if EITHER(PIDTEMP, PIDTEMPBED)
@@ -762,7 +775,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 // #define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 }
-#define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 25 } //HW
+#define DEFAULT_MAX_FEEDRATE          { 500, 500, 5, 25 } //HW
 
 //#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
 #if ENABLED(LIMITED_MAX_FR_EDITING)
@@ -776,7 +789,7 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 //#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 10000 }
-#define DEFAULT_MAX_ACCELERATION      { 500, 500, 100, 5000 } //HW
+#define DEFAULT_MAX_ACCELERATION      { 500, 500, 100, 1000 } //HW
 
 //#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
@@ -796,7 +809,7 @@
 //#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
 #define DEFAULT_ACCELERATION          500    // X, Y, Z and E acceleration for printing moves //HW
 #define DEFAULT_RETRACT_ACCELERATION  500    // E acceleration for retracts //HW
-#define DEFAULT_TRAVEL_ACCELERATION   500    // X, Y, Z acceleration for travel (non printing) moves //HW
+#define DEFAULT_TRAVEL_ACCELERATION   1000    // X, Y, Z acceleration for travel (non printing) moves //HW
 
 /**
  * Default Jerk limits (mm/s)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 25019f2..e969ab4 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -2529,7 +2529,7 @@
     #define X_STALL_SENSITIVITY  118 //HW
     #define X2_STALL_SENSITIVITY X_STALL_SENSITIVITY
     //#define Y_STALL_SENSITIVITY  8
-    #define Y_STALL_SENSITIVITY  118 //HW
+    #define Y_STALL_SENSITIVITY  100 //HW
     #define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY
     //#define Z_STALL_SENSITIVITY  8
     //#define Z2_STALL_SENSITIVITY Z_STALL_SENSITIVITY
@@ -2564,7 +2564,6 @@
   //#define TMC_DEBUG
 
   /**
-   * You can set your own advanced settings by filling in predefined functions.
    * A list of available functions can be found on the library github page
    * https://github.com/teemuatlut/TMCStepper
    *