From 156130e1af42c5fd3968efcbb6b2b6113a38a69e Mon Sep 17 00:00:00 2001 From: Brian Kahl Date: Mon, 17 Jan 2022 14:29:33 -0600 Subject: [PATCH] Modifying the default PID values --- Marlin/Configuration.h | 17 +++++++++++------ Marlin/Configuration_adv.h | 12 +++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 57b20c5d5..f43fda63d 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -846,9 +846,14 @@ #if ENABLED(LULZBOT_UNIVERSAL_TOOLHEAD) #if ANY(Sidekick_289, Sidekick_747) // SK Tool heads (30W) - #define LULZBOT_DEFAULT_Kp 26.47 - #define LULZBOT_DEFAULT_Ki 2.32 - #define LULZBOT_DEFAULT_Kd 75.56 + #define LULZBOT_DEFAULT_Kp 26.90 + #define LULZBOT_DEFAULT_Ki 2.41 + #define LULZBOT_DEFAULT_Kd 75.19 + #elif ENABLED(TAZ6) + //TAZ 6 Single Extruder + #define LULZBOT_DEFAULT_Kp 28.79 + #define LULZBOT_DEFAULT_Ki 1.91 + #define LULZBOT_DEFAULT_Kd 108.51 #else // E3D Titan Aero with LulzBot V6 block #define LULZBOT_DEFAULT_Kp 21.0 @@ -865,9 +870,9 @@ #define LULZBOT_DEFAULT_Ki 2.32 #define LULZBOT_DEFAULT_Kd 75.56 #elif ENABLED(TOOLHEAD_SK285) - #define LULZBOT_DEFAULT_Kp 26.47 - #define LULZBOT_DEFAULT_Ki 2.32 - #define LULZBOT_DEFAULT_Kd 75.56 + #define LULZBOT_DEFAULT_Kp 26.90 + #define LULZBOT_DEFAULT_Ki 2.41 + #define LULZBOT_DEFAULT_Kd 75.19 #elif ENABLED(TOOLHEAD_H175) #define LULZBOT_DEFAULT_Kp 27.58 #define LULZBOT_DEFAULT_Ki 3.22 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 08b69c9a2..0d9c51e33 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -3822,11 +3822,9 @@ #define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script #define CUSTOM_MENU_MAIN_ONLY_IDLE // Only show custom menu when the machine is idle - #if ANY(TAZ6) - #define DEFAULT_PID "P28.79I1.91D108.51" - #else - #define DEFAULT_PID "P21.0I1.78D61.93" - #endif + #define SK_DEFAULT_PID "26.90I2.41D75.19" + #define TAZ6_DEFAULT_PID "P28.79I1.91D108.51" + #define DEFAULT_PID "P21.0I1.78D61.93" #if ANY(TAZ6, Workhorse) //conversion to digipot units = ((mA-750)/5+135) #define E_CURRENT_Aero "160" //((875-750)/5+135) = 160 @@ -3842,7 +3840,7 @@ #define MAIN_MENU_ITEM_1_GCODE "M92E420\nM301P26.29I2.57D72.59\nM906E" E_CURRENT_Aero "\nM500\nM117 SK175|0.50mm|BRASS" #define MAIN_MENU_ITEM_2_DESC "SK285|0.50mm|BRASS" - #define MAIN_MENU_ITEM_2_GCODE "M92E420\nM301P26.90I2.41D75.19\nM906E" E_CURRENT_Aero "\nM500\nM117 SK285|0.50mm|BRASS" + #define MAIN_MENU_ITEM_2_GCODE "M92E420\nM301" SK_DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 SK285|0.50mm|BRASS" #endif #if DISABLED(TAZ6, Workhorse) #define MAIN_MENU_ITEM_3_DESC "M175v2|0.50mm|CRB CU" @@ -3890,7 +3888,7 @@ #if defined(TAZ6) #define MAIN_MENU_ITEM_1_DESC "Standard|0.5mm" - #define MAIN_MENU_ITEM_1_GCODE "M92E833\nM206Y4\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Std "\nM500\nM117 Standard|0.5mm" + #define MAIN_MENU_ITEM_1_GCODE "M92E833\nM206Y4\nM301" TAZ6_DEFAULT_PID "\nM907E" E_CURRENT_Std "\nM500\nM117 Standard|0.5mm" #endif #endif