Skip to content

Commit

Permalink
Add a warning on LA + S-Curve
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Apr 21, 2020
1 parent 5de8736 commit c3946dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions Marlin/Configuration_adv.h
Expand Up @@ -1542,6 +1542,7 @@
//#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
#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
#endif

// @section leveling
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/inc/SanityCheck.h
Expand Up @@ -964,6 +964,9 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
WITHIN(LIN_ADVANCE_K, 0, 10),
"LIN_ADVANCE_K must be a value from 0 to 10 (Changed in LIN_ADVANCE v1.5, Marlin 1.1.9)."
);
#if ENABLED(S_CURVE_ACCELERATION) && DISABLED(EXPERIMENTAL_SCURVE)
#error "LIN_ADVANCE and S_CURVE_ACCELERATION may not play well together! Enable EXPERIMENTAL_SCURVE to continue."
#endif
#endif

/**
Expand Down

0 comments on commit c3946dd

Please sign in to comment.