Skip to content

Commit eba8e59

Browse files
committed
fix remaining flat includes in motion_planning: blendmath.h and motion_types.h
blendmath.h is in emc/tp/, motion_types.h is in emc/motion/ — both need qualified paths when compiled without -Iemc/tp or -Iemc/motion in scope.
1 parent 84a6c4e commit eba8e59

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/emc/motion_planning/bezier9.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "../tp/tp_types.h"
33
#include "../tp/tp_debug.h"
44
#include "posemath.h"
5-
#include "blendmath.h"
5+
#include "../tp/blendmath.h"
66
#include "rtapi_math.h"
77
#include <math.h>
88

src/emc/motion_planning/blend_sizing.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extern "C" {
1717
#include "../tp/tp_types.h"
1818
#include "../tp/tp_debug.h"
1919
#include "../tp/tc.h"
20-
#include "blendmath.h"
20+
#include "../tp/blendmath.h"
2121
#include "emcpose.h"
2222
#include "rtapi_math.h"
2323
}

src/emc/motion_planning/motion_planning_9d.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "../motion/atomic_9d.h"
2626
#include "posemath.h"
2727
#include "rtapi.h" // For rtapi_print_msg
28-
#include "motion_types.h" // For EMC_MOTION_TYPE_TRAVERSE
28+
#include <motion_types.h> // For EMC_MOTION_TYPE_TRAVERSE
2929
#include <ruckig/ruckig.hpp> // Ruckig integration
3030

3131
#include <algorithm>

src/emc/motion_planning/motion_planning_9d_stubs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
*/
99

1010
#include <stddef.h>
11-
#include "motion.h"
11+
#include "motion/motion.h"
1212

1313
/* emcmotStatus and other globals are now provided by tp.c */

src/emc/motion_planning/motion_planning_9d_userspace.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ extern "C" {
2828
#include "emcpos.h"
2929
#include "emcpose.h" // pmCartesianToEmcPose
3030
#include "posemath.h"
31-
#include "blendmath.h" // pmCircleEffectiveMinRadius, findIntersectionAngle
31+
#include "../tp/blendmath.h" // pmCircleEffectiveMinRadius, findIntersectionAngle
3232
#include "../motion/atomic_9d.h" // atomicStoreDouble
33-
#include "motion_types.h" // EMC_MOTION_TYPE_TRAVERSE
33+
#include <motion_types.h> // EMC_MOTION_TYPE_TRAVERSE
3434
}
3535

3636
// External queue functions (from motion_planning_9d.cc - will be made public)

src/emc/motion_planning/path_sampler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <algorithm>
1616

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

src/emc/motion_planning/userspace_kinematics.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#include <vector>
1717

1818
extern "C" {
19-
#include "blendmath.h" // For pmCircleEffectiveMinRadius
19+
#include "../tp/blendmath.h" // For pmCircleEffectiveMinRadius
2020
}
2121

2222
// Include inihal for access to current joint limits (reflects HAL pin changes)
2323
// The old_inihal_data structure is updated by inihal.cc when HAL pins change
2424
// (ini.N.max_velocity, ini.N.max_limit, etc.)
25-
#include "inihal.hh"
25+
#include "../ini/inihal.hh"
2626
extern value_inihal_data old_inihal_data;
2727

2828
namespace motion_planning {

src/emc/tp/tcq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
********************************************************************/
1919

2020
#include <stddef.h>
21-
#include "motion.h"
21+
#include "../motion/motion.h"
2222
#include "../motion/atomic_9d.h"
2323
#include "rtapi.h"
2424

0 commit comments

Comments
 (0)