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

…into ros-2-complete
purdue-arc · Feb 10, 2024 · 6477f66 · 6477f66
2 parents 242fdf4 + d85b75e
commit 6477f66
Show file tree

Hide file tree

Showing 5 changed files with 489 additions and 4 deletions.
diff --git a/src/rktl_control/package.xml b/src/rktl_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>rktl_control2</name>
+  <name>rktl_control</name>
   <version>0.0.0</version>
   <description>TODO: Package description</description>
   <maintainer email="[email protected]">DinoSage</maintainer>

diff --git a/src/rktl_control/resource/rktl_control2 → src/rktl_control/resource/rktl_control b/src/rktl_control/resource/rktl_control2 → src/rktl_control/resource/rktl_control
diff --git a/src/rktl_control/setup.cfg b/src/rktl_control/setup.cfg
@@ -1,4 +1,4 @@
 [develop]
-script_dir=$base/lib/rktl_control2
+script_dir=$base/lib/rktl_control
 [install]
-install_scripts=$base/lib/rktl_control2
+install_scripts=$base/lib/rktl_control
diff --git a/src/rktl_control/setup.py b/src/rktl_control/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-package_name = 'rktl_control2'
+package_name = 'rktl_control'
 
 setup(
     name=package_name,