Skip to content

Commit 9813970

Browse files
author
Luca Toniolo
committed
small tweak to allow different order of setting max and default jerk
1 parent 732a18e commit 9813970

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/emc/ini/inihal.cc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,14 @@ int check_ini_hal_items(int numjoints)
292292
rcs_print("check_ini_hal_items:bad return value from emcTrajSetMaxJerk\n");
293293
}
294294
}
295+
// Re-apply default_jerk with new max limit (in case it was set before max_jerk)
296+
if (0 != emcTrajSetJerk(NEW(traj_default_jerk))) {
297+
if (emc_debug & EMC_DEBUG_CONFIG) {
298+
rcs_print("check_ini_hal_items:bad return value from emcTrajSetJerk\n");
299+
}
300+
}
295301
}
296-
302+
297303
if (CHANGED(traj_planner_type)) {
298304
if (debug) SHOW_CHANGE_INT(traj_planner_type)
299305
UPDATE(traj_planner_type);

0 commit comments

Comments
 (0)