Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

X5 sa #34

Open
wants to merge 2 commits into
base: tronxy-full-mks-tft
Choose a base branch
from
Open

X5 sa #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36ba232
X5SA
armin-62 Mar 15, 2021
9217819
16.03.2021Update Config.h
armin-62 Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//JUST uncomment the option for your machine
// #define V6_330_TITAN_TMC 1
// #define V6_330_TITAN_NO_TMC 1
// #define V6_330_NO_TITAN_TMC 1
#define V6_330_NO_TITAN_TMC 1
// #define V6_330_NO_TITAN_NO_TMC 1
// #define V6_400_TITAN_TMC 1
// #define V6_400_NO_TITAN_TMC 1
Expand Down Expand Up @@ -59,7 +59,7 @@

// #define TFT_LVGL_UI
// #define TFT_CLASSIC_UI
// #define TFT_COLOR_UI
#define TFT_COLOR_UI

#if V6_330_TITAN_TMC
#define MOTHERBOARD BOARD_CHITU3D_V6
Expand Down Expand Up @@ -845,9 +845,12 @@
#else
// If we did not set specific parameters then we use one of the default one
#ifndef DEFAULT_Kp
#define DEFAULT_Kp 22.20
#define DEFAULT_Ki 1.08
#define DEFAULT_Kd 114.00
//#define DEFAULT_Kp 22.20
//#define DEFAULT_Ki 1.08
//#define DEFAULT_Kd 114.00
#define DEFAULT_Kp 19.93
#define DEFAULT_Ki 1.40
#define DEFAULT_Kd 70.70
#endif
#endif
#endif // PIDTEMP
Expand All @@ -871,7 +874,7 @@
*/
//#define PIDTEMPBED

//#define BED_LIMIT_SWITCHING
#define BED_LIMIT_SWITCHING

/**
* Max Bed Power
Expand Down Expand Up @@ -994,7 +997,7 @@

// Enable one of the options below for CoreXY, CoreXZ, or CoreYZ kinematics,
// either in the usual order or reversed
//#define COREXY
#define COREXY
//#define COREXZ
//#define COREYZ
//#define COREYX
Expand Down Expand Up @@ -1190,7 +1193,7 @@
#endif
#endif

// #define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 420 }
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 800, 194 }
//TITAN EXTRUDER:
//#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 92.6 }

Expand Down Expand Up @@ -1281,6 +1284,8 @@
* See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained
*/
// #define S_CURVE_ACCELERATION
//# in Verbindung mit LIN-Advanced sollte S_CURVE_ACCELERATION deaktiviert werden -> BUG
//# LIN_ADVANCED ist in Configuration_adh.h

//===========================================================================
//============================= Z Probe Options =============================
Expand Down
Loading