updated branches

ctu-mrs · Oct 10, 2023 · 2a48197 · 2a48197
1 parent 3d1aa76
commit 2a48197
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 48 deletions.
diff --git a/mrs.yaml b/mrs.yaml
@@ -1,36 +1,7 @@
-mrs_uav_system:
-  architecture: [amd64, arm64]
-  source: https://github.com/ctu-mrs/mrs_uav_system
-  unstable_ref: 1.5
-  stable_ref: release
-
-mrs_uav_core:
-  architecture: [amd64, arm64]
-  source: https://github.com/ctu-mrs/mrs_uav_core
-  unstable_ref: master
-  stable_ref: release
-
-mrs_uav_modules:
-  architecture: [amd64, arm64]
-  source: https://github.com/ctu-mrs/mrs_uav_modules
-  unstable_ref: master
-  stable_ref: release
-
-mrs_uav_gazebo_simulation:
-  architecture: [amd64, arm64]
-  source: https://github.com/ctu-mrs/mrs_uav_gazebo_simulation
-  unstable_ref: master
-  stable_ref: release
-
-mrs_uav_coppelia_simulation:
-  architecture: [amd64, arm64]
-  source: https://github.com/ctu-mrs/mrs_uav_coppelia_simulation
-  unstable_ref: master
-
 mrs_msgs:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_msgs
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_modules_msgs:
@@ -41,19 +12,19 @@ mrs_modules_msgs:
 mrs_lib:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_lib
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_managers:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_managers
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_bumper:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_bumper
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_multirotor_simulator:
@@ -65,7 +36,7 @@ mrs_multirotor_simulator:
 mrs_uav_controllers:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_controllers
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_autostart:
@@ -95,13 +66,13 @@ mrs_uav_deployment:
 mrs_uav_status:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_status
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_trackers:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_trackers
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_px4_api:
@@ -119,43 +90,43 @@ mrs_uav_dji_tello_api:
 mrs_rviz_plugins:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_rviz_plugins
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_trajectory_generation:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_trajectory_generation
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_serial:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_serial
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_path_loader:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_path_loader
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_uav_trajectory_loader:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_uav_trajectory_loader
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_utils:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_utils
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_gazebo_common_resources:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_gazebo_common_resources
-  unstable_ref: hw_api
+  unstable_ref: master
   stable_ref: release
 
 mrs_pcl_tools:
@@ -173,23 +144,52 @@ mrs_subt_planning_lib:
 mrs_octomap_tools:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_octomap_tools
-  unstable_ref: 1.5
+  unstable_ref: master
   stable_ref: release
 
 mrs_octomap_server:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_octomap_server
-  unstable_ref: 1.5
+  unstable_ref: master
   stable_ref: release
 
 mrs_octomap_planner:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_octomap_planner
-  unstable_ref: 1.5
+  unstable_ref: master
   stable_ref: release
 
 mrs_octomap_mapping_planning:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/mrs_octomap_mapping_planning
-  unstable_ref: 1.5
+  unstable_ref: master
+  stable_ref: release
+
+mrs_uav_coppelia_simulation:
+  architecture: [amd64, arm64]
+  source: https://github.com/ctu-mrs/mrs_uav_coppelia_simulation
+  unstable_ref: master
+
+mrs_uav_gazebo_simulation:
+  architecture: [amd64, arm64]
+  source: https://github.com/ctu-mrs/mrs_uav_gazebo_simulation
+  unstable_ref: master
+  stable_ref: release
+
+mrs_uav_modules:
+  architecture: [amd64, arm64]
+  source: https://github.com/ctu-mrs/mrs_uav_modules
+  unstable_ref: master
+  stable_ref: release
+
+mrs_uav_core:
+  architecture: [amd64, arm64]
+  source: https://github.com/ctu-mrs/mrs_uav_core
+  unstable_ref: master
+  stable_ref: release
+
+mrs_uav_system:
+  architecture: [amd64, arm64]
+  source: https://github.com/ctu-mrs/mrs_uav_system
+  unstable_ref: master
   stable_ref: release
diff --git a/thirdparty.yaml b/thirdparty.yaml
@@ -7,7 +7,7 @@ px4_sitl_gazebo:
 nlopt:
   architecture: [amd64, arm64]
   source: https://github.com/ctu-mrs/nlopt_ros
-  unstable_ref: hw_api_ci
+  unstable_ref: master
   stable_ref: release
 
 ouster_ros: