Merge branch 'ros-2-complete' of https://github.com/purdue-arc/rocket…

…_league into ros-2-complete
purdue-arc · Mar 2, 2024 · f3da2d9 · f3da2d9
2 parents 214080e + 84bfd2c
commit f3da2d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/rktl_planner/rktl_planner/nodes/path_planner.py b/src/rktl_planner/rktl_planner/nodes/path_planner.py
@@ -9,10 +9,10 @@
 from geometry_msgs.msg import Pose
 from rktl_msgs.msg import BezierPathList, Path
 from std_srvs.srv import Empty, Empty_Request, Empty_Response
-from rktl_msgs.srv import CreateBezierPath, CreateBezierPathRequest
+from rktl_msgs.srv import CreateBezierPath
 
 def create_simple_path_req(car_odom, ball_odom, goal_pos):
-    req = CreateBezierPathRequest()
+    req = CreateBezierPath.Request()
 
     req.velocity = 0.5
     req.bezier_segment_duration.data = node.create_rate(0.5)

diff --git a/src/rktl_planner/setup.py b/src/rktl_planner/setup.py
@@ -14,7 +14,7 @@
         ('share/' + package_name, ['package.xml']),
         (os.path.join('share', package_name, 'launch'), glob(os.path.join('launch', '*launch.[pxy][yma]*'))),
         (os.path.join('lib', package_name), glob(os.path.join(package_name, '*.py'))),
-        (os.path.join('lib', package_name), glob(os.path.join(package_name, 'nodes', '*.py'))),
+        (os.path.join('lib', package_name, 'nodes'), glob(os.path.join(package_name, 'nodes', '*.py'))),
         (os.path.join('share', package_name, 'config'), glob(os.path.join('config', '*.yaml'))),
     ],
     install_requires=['setuptools'],