added usb-cam (#373)

* added usb-cam * Update ros-noetic-hpp-fcl.patch * Update vinca_osx.yaml * Update vinca_osx_arm64.yaml * Update vinca_win.yaml * Update testpr.yml * Update testpr.yml --------- Co-authored-by: Tobias Fischer <[email protected]>
RoboStack · Jun 25, 2023 · 86701ed · 86701ed
1 parent e4c4e41
commit 86701ed
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
@@ -38,10 +38,13 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: install mamba
-      uses: mamba-org/provision-with-micromamba@main
+      uses: mamba-org/setup-micromamba@main
       with:
         environment-file: .github/testpr_environment.yml
-
+        condarc: |
+          channels:
+            - robostack-staging
+            - conda-forge
     - shell: bash -l {0}
       if: contains(matrix.os, 'linux-aarch64')
       run: |

diff --git a/patch/ros-noetic-hpp-fcl.patch b/patch/ros-noetic-hpp-fcl.patch
@@ -15,3 +15,16 @@ index 58dd41d..c3c0a5a 100644
 
  pkg_config_append_libs("hpp-fcl")
  IF(HPP_FCL_HAS_OCTOMAP)
+diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
+index 995a8c6c..c960e27d 100644
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -51,7 +51,7 @@ SET(${LIBRARY_NAME}_HEADERS
+   pickle.hh
+   )
+
+-SET(ENABLE_PYTHON_DOXYGEN_AUTODOC TRUE CACHE BOOL "Enable automatic documentation of Python bindings from Doxygen documentation")
++SET(ENABLE_PYTHON_DOXYGEN_AUTODOC FALSE CACHE BOOL "Enable automatic documentation of Python bindings from Doxygen documentation")
+
+ IF(    NOT ENABLE_PYTHON_DOXYGEN_AUTODOC
+     OR NOT DOXYGEN_FOUND)
diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -48,6 +48,7 @@ packages_select_by_deps:
   - pinocchio
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+  - usb-cam
 
   # - desktop
   # - desktop-full

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -37,6 +37,7 @@ packages_select_by_deps:
   - rgbd-launch
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+  - usb-cam
 
   # - rqt-gui
   # - catkin

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -32,6 +32,7 @@ packages_select_by_deps:
   - rospack
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+
   # - rviz
   # - python-qt-binding
   # - qt-gui-cpp

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -37,6 +37,7 @@ packages_select_by_deps:
   - rospack
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+
   # - rviz
   # - python-qt-binding
   # - qt-gui-cpp