0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-07-22 09:42:01 +00:00

🔧 Update CLASSIC_JERK conditionals

This commit is contained in:
Scott Lahteine 2023-12-14 10:03:11 -06:00
parent 8bce9dec90
commit 75da3555ee
21 changed files with 83 additions and 93 deletions
Marlin/src/lcd/menu

View file

@ -587,18 +587,12 @@ void menu_backlash();
#endif
#if HAS_CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
void menu_advanced_jerk() {
START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS);
#if HAS_JUNCTION_DEVIATION
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, TERN(LIN_ADVANCE, 0.3f, 0.5f)
OPTARG(LIN_ADVANCE, planner.recalculate_max_e_jerk)
);
#endif
constexpr xyze_float_t max_jerk_edit =
#ifdef MAX_JERK_EDIT_VALUES
MAX_JERK_EDIT_VALUES
@ -711,12 +705,12 @@ void menu_advanced_settings() {
if (!is_busy) SUBMENU(MSG_INPUT_SHAPING, menu_advanced_input_shaping);
#endif
#if HAS_CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
// M205 - Max Jerk
SUBMENU(MSG_JERK, menu_advanced_jerk);
#elif HAS_JUNCTION_DEVIATION
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.001f, 0.3f
OPTARG(LIN_ADVANCE, planner.recalculate_max_e_jerk)
OPTARG(HAS_LINEAR_E_JERK, planner.recalculate_max_e_jerk)
);
#endif