Move submodules to avoid nested catkin packages

nasa · Dec 21, 2023 · 059b3eb · 059b3eb
1 parent bf514c2
commit 059b3eb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,10 +2,10 @@
 	path = communications/isaac_msgs
 	url = https://github.com/nasa/isaac_msgs.git
 [submodule "astrobee/survey_manager/survey_planner/src/ros2_planning_system"]
-	path = astrobee/survey_manager/survey_planner/src/ros2_planning_system
+	path = astrobee/survey_manager/ros2_planning_system
 	url = https://github.com/bckempa/ros2_planning_system
 	branch = noetic-devel
 [submodule "astrobee/survey_manager/survey_planner/src/ros1_lifecycle"]
-	path = astrobee/survey_manager/survey_planner/src/ros1_lifecycle
+	path = astrobee/survey_manager/ros1_lifecycle
 	url = https://github.com/bckempa/ros1_lifecycle
 	branch = noetic-devel
diff --git a/...manager/survey_planner/src/ros1_lifecycle → astrobee/survey_manager/ros1_lifecycle b/...manager/survey_planner/src/ros1_lifecycle → astrobee/survey_manager/ros1_lifecycle
diff --git a/...r/survey_planner/src/ros2_planning_system → astrobee/survey_manager/ros2_planning_system b/...r/survey_planner/src/ros2_planning_system → astrobee/survey_manager/ros2_planning_system
diff --git a/astrobee/survey_manager/survey_planner/launch/survey_domain.launch b/astrobee/survey_manager/survey_planner/launch/survey_domain.launch
@@ -23,6 +23,18 @@
     <arg name="params_file" value="$(arg params_file)"/>
   </include>
 
+  <!-- Planner -->
+  <include file="$(find plansys2_planner)/launch/planner.launch">
+    <arg name="namespace"  value="$(arg namespace)"/>
+    <arg name="params_file" value="$(arg params_file)"/>
+  </include>
+
+  <!-- Executor -->
+  <include file="$(find plansys2_executor)/launch/executor.launch">
+    <arg name="namespace"  value="$(arg namespace)"/>
+    <arg name="params_file" value="$(arg params_file)"/>
+  </include>
+
   <!-- Manager -->
   <node name="lifecycle_manager_node" pkg="plansys2_lifecycle_manager" type="lifecycle_manager_node" output="screen">
   </node>