Skip to content

Commit 84a6c4e

Browse files
committed
fix include paths in motion_planning: use relative ../tp/ and motion/ prefixes
Flat includes of tc_types.h, tc.h, tp.h, tp_types.h and motion.h fail when motion_planning headers are included from directories without -Iemc/tp or -Iemc/motion in their compile flags (e.g. emc/ini/). Use "../tp/" and "motion/" qualified paths throughout, consistent with the upstream three-tier include ethos.
1 parent 969bded commit 84a6c4e

9 files changed

Lines changed: 16 additions & 16 deletions

src/emc/motion_planning/bezier9.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "bezier9.h"
2-
#include "tp_types.h"
2+
#include "../tp/tp_types.h"
33
#include "../tp/tp_debug.h"
44
#include "posemath.h"
55
#include "blendmath.h"

src/emc/motion_planning/blend_sizing.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include "blend_sizing.h"
1515

1616
extern "C" {
17-
#include "tp_types.h"
17+
#include "../tp/tp_types.h"
1818
#include "../tp/tp_debug.h"
19-
#include "tc.h"
19+
#include "../tp/tc.h"
2020
#include "blendmath.h"
2121
#include "emcpose.h"
2222
#include "rtapi_math.h"

src/emc/motion_planning/blend_sizing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "posemath.h"
1717
#include "emcpos.h"
18-
#include "tc_types.h"
18+
#include "../tp/tc_types.h"
1919
#include "bezier9.h"
2020

2121
#ifdef __cplusplus

src/emc/motion_planning/motion_planning_9d.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
#include "motion_planning_9d.hh"
2121
#include "smoothing_data.hh"
22-
#include "motion.h" // For emcmot_status_t (must be before tp.h)
23-
#include "tc.h"
24-
#include "tp.h"
22+
#include "motion/motion.h" // For emcmot_status_t (must be before tp.h)
23+
#include "../tp/tc.h"
24+
#include "../tp/tp.h"
2525
#include "../motion/atomic_9d.h"
2626
#include "posemath.h"
2727
#include "rtapi.h" // For rtapi_print_msg

src/emc/motion_planning/motion_planning_9d.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#define MOTION_PLANNING_9D_HH
2525

2626
#include "posemath.h"
27-
#include "tc_types.h"
28-
#include "tp_types.h"
27+
#include "../tp/tc_types.h"
28+
#include "../tp/tp_types.h"
2929

3030
#include <cstddef>
3131
#include <vector>

src/emc/motion_planning/motion_planning_9d_userspace.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
// C headers need extern "C" when included from C++
2323
extern "C" {
24-
#include "motion.h" // emcmot_status_t, emcmot_config_t (needed before tp.h)
25-
#include "tp.h"
26-
#include "tc.h"
27-
#include "tc_types.h"
24+
#include "motion/motion.h" // emcmot_status_t, emcmot_config_t (needed before tp.h)
25+
#include "../tp/tp.h"
26+
#include "../tp/tc.h"
27+
#include "../tp/tc_types.h"
2828
#include "emcpos.h"
2929
#include "emcpose.h" // pmCartesianToEmcPose
3030
#include "posemath.h"

src/emc/motion_planning/path_sampler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
extern "C" {
1818
#include "blendmath.h" // For pmCircleAngleFromProgress, pmCirclePoint
19-
#include "tc.h" // For pmCircle9Target, pmCartLinePoint
19+
#include "../tp/tc.h" // For pmCircle9Target, pmCartLinePoint
2020
#include "bezier9.h" // For bezier9Point, bezier9Length
2121
}
2222

src/emc/motion_planning/path_sampler.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
extern "C" {
2323
#include "kinematics_userspace/kinematics_user.h"
24-
#include "tc_types.h" // For PmCircle9
24+
#include "../tp/tc_types.h" // For PmCircle9
2525
}
2626

2727
namespace motion_planning {

src/emc/motion_planning/userspace_kinematics.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "joint_limits.hh"
2424

2525
// tc_types.h and emcpos.h include posemath.h which has C++ overloads
26-
#include "tc_types.h"
26+
#include "../tp/tc_types.h"
2727
#include "emcpos.h"
2828

2929
namespace motion_planning {

0 commit comments

Comments
 (0)