Merge branch 'master' into patch-1

RoboStack · Sep 10, 2023 · 2128d94 · 2128d94
2 parents e86f037 + 6640b9f
commit 2128d94
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 69 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/patch/ros-noetic-moveit-ros-planning.win.patch b/patch/ros-noetic-moveit-ros-planning.win.patch
@@ -1,3 +1,16 @@
+diff --git a/moveit_cpp/CMakeLists.txt b/moveit_cpp/CMakeLists.txt
+index 897af9fc8..6675d1bc6 100644
+--- a/moveit_cpp/CMakeLists.txt
++++ b/moveit_cpp/CMakeLists.txt
+@@ -22,6 +22,8 @@ endif()
+
+ install(TARGETS ${MOVEIT_LIB_NAME}
+   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
++  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
++  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
++  )
+
 diff --git a/plan_execution/CMakeLists.txt b/plan_execution/CMakeLists.txt
 index 6b579cfb1..b95b4c657 100644
 --- a/plan_execution/CMakeLists.txt

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -37,18 +37,32 @@ skip_existing:
   - https://conda.anaconda.org/robostack-staging/
 
 packages_select_by_deps:
-  - actionlib
-  - foxglove_bridge
-  - ros-babel-fish
-  - ros-babel-fish-test-msgs
-  - moveit_visual_tools
-  - moveit-servo
-  - rviz_visual_tools
-  - rgbd-launch
-  - pinocchio
-  - microstrain-inertial-driver
-  - microstrain-inertial-msgs
-  - usb-cam
+  - teleop-twist-keyboard
+  - rosserial-client
+  - rosserial-arduino
+  - rosserial
+  - global-planner
+  - navigation
+  - ecl-core
+  - ecl-threads
+  # - actionlib
+  # - foxglove_bridge
+  # - ros-babel-fish
+  # - ros-babel-fish-test-msgs
+  # - moveit_visual_tools
+  # - moveit-servo
+  # - rviz_visual_tools
+  # - rgbd-launch
+  # - pinocchio
+  # - microstrain-inertial-driver
+  # - microstrain-inertial-msgs
+  # - usb-cam
+  # - octomap-ros
+  # - octomap-mapping
+  # - octomap-server
+  # - ackermann-msgs
+  # - fake-localization
+  # - realsense2-description
 
   # - desktop
   # - desktop-full
@@ -168,7 +182,6 @@ packages_select_by_deps:
   # - turtlebot3-fake
   # - librealsense2
   # - realsense2_camera
-  # - realsense2-description
   # - ur-msgs
   # - rosdoc-lite
   # - ros_numpy
@@ -536,7 +549,6 @@ packages_select_by_deps:
   # - ntpd-driver
   # - obj-to-pointcloud
   # - ocean-battery-driver
-  # - octomap-mapping
   # - omron-os32c-driver
   # - open-manipulator-gazebo
   # - open-manipulator-msgs
@@ -668,7 +680,6 @@ packages_select_by_deps:
   # - pinocchio
   # - rviz
   # - libuvc-ros
-  # - ackermann-msgs
   # - actionlib-tools
   # - agni-tf-tools
   # - app-manager
@@ -874,7 +885,6 @@ packages_select_by_deps:
   # - network-interface
   # - nonpersistent-voxel-layer
   # - novatel-oem7-msgs
-  # - octomap-ros
   # - octomap-rviz-plugins
   # - odva-ethernetip
   # - openzen-sensor

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -38,6 +38,12 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - usb-cam
+  - octomap-ros
+  - octomap-mapping
+  - octomap-server
+  - ackermann-msgs
+  - fake-localization
+  - realsense2-description
 
   # - rqt-gui
   # - catkin

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -32,6 +32,10 @@ packages_select_by_deps:
   - rospack
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+  - octomap-ros
+  - ackermann-msgs
+  - fake-localization
+  - realsense2-description
 
   # - rviz
   # - python-qt-binding
@@ -153,7 +157,6 @@ packages_select_by_deps:
   # - turtlebot3-fake
   # - librealsense2
   # - realsense2_camera
-  # - realsense2-description
   # - ur-msgs
   # - rosdoc-lite
   # - ros_numpy
@@ -648,7 +651,6 @@ packages_select_by_deps:
   # - nonpersistent-voxel-layer
   # - novatel-oem7-msgs
   # - ntpd-driver
-  # - octomap-ros
   # - odva-ethernetip
   # - openzen-sensor
   # - p2os-doc

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -37,6 +37,10 @@ packages_select_by_deps:
   - rospack
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+  - octomap-ros
+  - ackermann-msgs
+  - fake-localization
+  - realsense2-description
 
   # - rviz
   # - python-qt-binding

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -38,7 +38,11 @@ packages_select_by_deps:
   - moveit_visual_tools
   - rviz_visual_tools
   - rgbd-launch
-
+  - octomap-ros
+  - ackermann-msgs
+  - fake-localization
+  - realsense2-description
+
   # - desktop
   # - rqt-gui
   # - catkin
@@ -127,7 +131,6 @@ packages_select_by_deps:
   # - niryo_one_simulation
 
   # - librealsense2
-  # - realsense2-description
   # - ur-msgs
   # - rosdoc-lite
 
@@ -316,7 +319,6 @@ packages_select_by_deps:
   # - neonavigation-common
   # - nonpersistent-voxel-layer
   # - novatel-oem7-msgs
-  # - octomap-ros
   # - odva-ethernetip
   # - open-karto
   # - open-manipulator-msgs