From aaf23d46af6501c8885f615d33dd9949b30b0c77 Mon Sep 17 00:00:00 2001 From: Danny Oh Date: Thu, 28 Jul 2022 12:46:27 -0700 Subject: [PATCH] Reverts changes from 2b2db885088b61938bf476b9c10eafef9fe8d021 --- Marlin/Configuration.h | 10 +++++----- Marlin/Configuration_adv.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 53b01aaefd..8028d64492 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -622,9 +622,9 @@ #define DEFAULT_Ki_LIST { 1.08, 1.08 } #define DEFAULT_Kd_LIST { 114.00, 114.00 } #else - #define DEFAULT_Kp 9.06 - #define DEFAULT_Ki 0.52 - #define DEFAULT_Kd 60.28 + #define DEFAULT_Kp 9 + #define DEFAULT_Ki 0.53 + #define DEFAULT_Kd 100 #endif #endif @@ -1109,7 +1109,7 @@ * Override with M203 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] */ -#define DEFAULT_MAX_FEEDRATE { 500, 500, 4, 25 } +#define DEFAULT_MAX_FEEDRATE { 500, 500, 4, 40 } //#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 #if ENABLED(LIMITED_MAX_FR_EDITING) @@ -1186,7 +1186,7 @@ * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ -// #define S_CURVE_ACCELERATION +#define S_CURVE_ACCELERATION //=========================================================================== //============================= Z Probe Options ============================= diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 1bb44a2c2a..96136a5ef9 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -608,9 +608,9 @@ #define COOLER_AUTO_FAN_PIN -1 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 -#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 == full speed +#define EXTRUDER_AUTO_FAN_SPEED 165 // 255 == full speed #define CHAMBER_AUTO_FAN_TEMPERATURE 30 -#define CHAMBER_AUTO_FAN_SPEED 192 +#define CHAMBER_AUTO_FAN_SPEED 165 #define COOLER_AUTO_FAN_TEMPERATURE 18 #define COOLER_AUTO_FAN_SPEED 255 @@ -2001,10 +2001,10 @@ * * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. */ -#define LIN_ADVANCE +// #define LIN_ADVANCE #if ENABLED(LIN_ADVANCE) //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants - #define LIN_ADVANCE_K 0.08 // Unit: mm compression per 1mm/s extruder speed + #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed //#define LA_DEBUG // If enabled, this will generate debug information output over USB. //#define EXPERIMENTAL_SCURVE // Enable this option to permit S-Curve Acceleration //#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.