Skip to content

Commit 99022e3

Browse files
author
Luca Toniolo
committed
build fix, and cruckig compatibility fix
1 parent 49133ba commit 99022e3

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

src/emc/motion_planning/Submakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ TARGETS += ../lib/libmotion_planning_9d.so ../lib/libmotion_planning_9d.so.0
8989
# included from emc/tp/tc_types.h). Internal headers like blend_sizing.h
9090
# stay local — they reference ../tp/ paths that break in the flat include/.
9191
MOTION_PLANNING_PUBLIC_H := emc/motion_planning/bezier9.h
92-
$(patsubst ./emc/motion_planning/%,../include/%,$(MOTION_PLANNING_PUBLIC_H)): ../include/%.h: ./emc/motion_planning/%.h
92+
$(patsubst emc/motion_planning/%,../include/%,$(MOTION_PLANNING_PUBLIC_H)): ../include/%.h: emc/motion_planning/%.h
9393
cp $^ $@
94-
$(patsubst ./emc/motion_planning/%,../include/%,$(wildcard ./emc/motion_planning/*.hh)): ../include/%.hh: ./emc/motion_planning/%.hh
94+
$(patsubst emc/motion_planning/%,../include/%,$(wildcard emc/motion_planning/*.hh)): ../include/%.hh: emc/motion_planning/%.hh
9595
cp $^ $@

src/emc/tp/cruckig/ruckig_compat.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ struct InputParameter {
4747
std::array<double, 1> max_velocity = {0};
4848
std::array<double, 1> max_acceleration = {0};
4949
std::array<double, 1> max_jerk = {0};
50-
std::array<double, 1> min_velocity = {0};
51-
std::array<double, 1> min_acceleration = {0};
5250
ControlInterface control_interface = ControlInterface::Position;
5351
};
5452

@@ -159,8 +157,8 @@ class Ruckig {
159157
cinp->max_velocity[0] = input.max_velocity[0];
160158
cinp->max_acceleration[0] = input.max_acceleration[0];
161159
cinp->max_jerk[0] = input.max_jerk[0];
162-
cinp->min_velocity[0] = input.min_velocity[0];
163-
cinp->min_acceleration[0] = input.min_acceleration[0];
160+
// min_velocity and min_acceleration are NULL in cruckig (optional).
161+
// cruckig uses -max when NULL, which matches ruckig's default.
164162
cinp->control_interface = static_cast<CRuckigControlInterface>(input.control_interface);
165163

166164
CRuckigResult cresult = cruckig_calculate(otg_, cinp, traj.c_ptr());

0 commit comments

Comments
 (0)