From 192821bf5d90fe67a478b58d853df260475ad947 Mon Sep 17 00:00:00 2001
From: Joey Rowell <79405074+joerowelll@users.noreply.github.com>
Date: Mon, 10 Jul 2023 02:23:25 +0100
Subject: [PATCH 1/9] adding octomap_ros (#376)

* adding octomap_ros on linux

* move to top of file

* add octomap_ros to osx

* add octomap_ros to win

* - octomap-ros on osx-arm64

* - octomap-ros on linux-aarch64

---------

Co-authored-by: Tobias Fischer <info@tobiasfischer.info>
---
 vinca_linux_64.yaml      | 2 +-
 vinca_linux_aarch64.yaml | 1 +
 vinca_osx.yaml           | 2 +-
 vinca_osx_arm64.yaml     | 1 +
 vinca_win.yaml           | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
index 83153696e..10a316eb0 100644
--- a/vinca_linux_64.yaml
+++ b/vinca_linux_64.yaml
@@ -49,6 +49,7 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - usb-cam
+  - octomap-ros
 
   # - desktop
   # - desktop-full
@@ -874,7 +875,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
index d9653d9ba..a18f02984 100644
--- a/vinca_linux_aarch64.yaml
+++ b/vinca_linux_aarch64.yaml
@@ -38,6 +38,7 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - usb-cam
+  - octomap-ros
 
   # - rqt-gui
   # - catkin
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
index 9c1544158..a77f90ef2 100644
--- a/vinca_osx.yaml
+++ b/vinca_osx.yaml
@@ -32,6 +32,7 @@ packages_select_by_deps:
   - rospack
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
+  - octomap-ros
 
   # - rviz
   # - python-qt-binding
@@ -648,7 +649,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
index 3dea8efe5..e6dfa9096 100644
--- 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
+  - octomap-ros
 
   # - rviz
   # - python-qt-binding
diff --git a/vinca_win.yaml b/vinca_win.yaml
index 77125ff58..5fe80ff16 100644
--- a/vinca_win.yaml
+++ b/vinca_win.yaml
@@ -38,6 +38,7 @@ packages_select_by_deps:
   - moveit_visual_tools
   - rviz_visual_tools
   - rgbd-launch
+  - octomap-ros
 
   # - desktop
   # - rqt-gui
@@ -316,7 +317,6 @@ packages_select_by_deps:
   # - neonavigation-common
   # - nonpersistent-voxel-layer
   # - novatel-oem7-msgs
-  # - octomap-ros
   # - odva-ethernetip
   # - open-karto
   # - open-manipulator-msgs

From 0bc1b9d2ea151c93efb9b51cad5a662ed71afe5b Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Mon, 10 Jul 2023 20:13:10 +1000
Subject: [PATCH 2/9] Update vinca_linux_64.yaml

---
 vinca_linux_64.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
index 10a316eb0..df3e69274 100644
--- a/vinca_linux_64.yaml
+++ b/vinca_linux_64.yaml
@@ -45,7 +45,7 @@ packages_select_by_deps:
   - moveit-servo
   - rviz_visual_tools
   - rgbd-launch
-  - pinocchio
+  # - pinocchio
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - usb-cam

From fc9c5c10dc914a6b0c65453d8fd66728b350d7f8 Mon Sep 17 00:00:00 2001
From: Joey Rowell <79405074+joerowelll@users.noreply.github.com>
Date: Wed, 19 Jul 2023 20:11:47 +0100
Subject: [PATCH 3/9] Add octomap-mapping & octomap-server (#378)

* adding octomap-mapping to linux 64

* adding octomap-mapping to aarch64

* adding octomap-mapping to osx_arm64

* adding octomap-mapping to osx

* adding octomap-mapping to win

* adding octomap-server to linux_64

* adding octomap-server to aarch64

* adding octomap-server to osx_arm64

* adding octomap-server to osx

* adding octomap-server to win

* removing octomap-server and octomap-mapping from macos and win
---
 vinca_linux_64.yaml      | 4 ++--
 vinca_linux_aarch64.yaml | 2 ++
 vinca_osx.yaml           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
index df3e69274..53dd59916 100644
--- a/vinca_linux_64.yaml
+++ b/vinca_linux_64.yaml
@@ -50,7 +50,8 @@ packages_select_by_deps:
   - microstrain-inertial-msgs
   - usb-cam
   - octomap-ros
-
+  - octomap-mapping
+  - octomap-server
   # - desktop
   # - desktop-full
   # # - pybind11_catkin  # Needs to be patched to use conda-forge's pybind11
@@ -537,7 +538,6 @@ packages_select_by_deps:
   # - ntpd-driver
   # - obj-to-pointcloud
   # - ocean-battery-driver
-  # - octomap-mapping
   # - omron-os32c-driver
   # - open-manipulator-gazebo
   # - open-manipulator-msgs
diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
index a18f02984..0977daa78 100644
--- a/vinca_linux_aarch64.yaml
+++ b/vinca_linux_aarch64.yaml
@@ -39,6 +39,8 @@ packages_select_by_deps:
   - microstrain-inertial-msgs
   - usb-cam
   - octomap-ros
+  - octomap-mapping
+  - octomap-server
 
   # - rqt-gui
   # - catkin
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
index a77f90ef2..e0ced73a6 100644
--- a/vinca_osx.yaml
+++ b/vinca_osx.yaml
@@ -33,7 +33,7 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - octomap-ros
-
+  
   # - rviz
   # - python-qt-binding
   # - qt-gui-cpp

From 4cd0931abfeecdffe3acc9a3666e268fa386a62a Mon Sep 17 00:00:00 2001
From: Griffin Tabor <tabor473@gmail.com>
Date: Wed, 16 Aug 2023 15:20:44 -0600
Subject: [PATCH 4/9] add fake localization and ackermann msgs (#382)

---
 vinca_linux_64.yaml      | 3 ++-
 vinca_linux_aarch64.yaml | 2 ++
 vinca_osx.yaml           | 4 +++-
 vinca_osx_arm64.yaml     | 2 ++
 vinca_win.yaml           | 4 +++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
index 53dd59916..19d712f4e 100644
--- a/vinca_linux_64.yaml
+++ b/vinca_linux_64.yaml
@@ -52,6 +52,8 @@ packages_select_by_deps:
   - octomap-ros
   - octomap-mapping
   - octomap-server
+  - ackermann-msgs
+  - fake-localization
   # - desktop
   # - desktop-full
   # # - pybind11_catkin  # Needs to be patched to use conda-forge's pybind11
@@ -669,7 +671,6 @@ packages_select_by_deps:
   # - pinocchio
   # - rviz
   # - libuvc-ros
-  # - ackermann-msgs
   # - actionlib-tools
   # - agni-tf-tools
   # - app-manager
diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
index 0977daa78..6cd5ea410 100644
--- a/vinca_linux_aarch64.yaml
+++ b/vinca_linux_aarch64.yaml
@@ -41,6 +41,8 @@ packages_select_by_deps:
   - octomap-ros
   - octomap-mapping
   - octomap-server
+  - ackermann-msgs
+  - fake-localization
 
   # - rqt-gui
   # - catkin
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
index e0ced73a6..785769a35 100644
--- a/vinca_osx.yaml
+++ b/vinca_osx.yaml
@@ -33,7 +33,9 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - octomap-ros
-  
+  - ackermann-msgs
+  - fake-localization
+
   # - rviz
   # - python-qt-binding
   # - qt-gui-cpp
diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
index e6dfa9096..9b27837c4 100644
--- a/vinca_osx_arm64.yaml
+++ b/vinca_osx_arm64.yaml
@@ -38,6 +38,8 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - octomap-ros
+  - ackermann-msgs
+  - fake-localization
 
   # - rviz
   # - python-qt-binding
diff --git a/vinca_win.yaml b/vinca_win.yaml
index 5fe80ff16..7006aa975 100644
--- a/vinca_win.yaml
+++ b/vinca_win.yaml
@@ -39,7 +39,9 @@ packages_select_by_deps:
   - rviz_visual_tools
   - rgbd-launch
   - octomap-ros
-
+  - ackermann-msgs
+  - fake-localization
+  
   # - desktop
   # - rqt-gui
   # - catkin

From 9b4219c16667ddad433f258db956b7f1a90022a1 Mon Sep 17 00:00:00 2001
From: Marco Esposito <esposito@imfusion.com>
Date: Fri, 18 Aug 2023 22:20:18 +0200
Subject: [PATCH 5/9] Solve moveit_cpp.dll missing on Windows noetic (#383)

---
 patch/ros-noetic-moveit-ros-planning.win.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/patch/ros-noetic-moveit-ros-planning.win.patch b/patch/ros-noetic-moveit-ros-planning.win.patch
index 454d5f770..5691ffe65 100644
--- 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

From f67aa0b73349a694fe40e729998723bb63da5971 Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Sat, 19 Aug 2023 07:33:11 +1000
Subject: [PATCH 6/9] Delete CONTRIBUTING.md

---
 CONTRIBUTING.md | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 5413eafef..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Contributing
-
-Many thanks for taking the time to read this and for contributing to RoboStack!
-
-This project is in early stages and we are looking for contributors to help it grow. 
-The developers are on [gitter](https://gitter.im/RoboStack/Lobby) where we discuss steps forward.
-
-We welcome all kinds of contribution -- code or non-code -- and value them
-highly. We pledge to treat everyones contribution fairly and with respect and
-we are here to help awesome pull requests over the finish line.
-
-Please note we have a code of conduct, and follow it in all your interactions with the project.
-
-We follow the [NumFOCUS code of conduct](https://numfocus.org/code-of-conduct).
-
-
-# Adding new packages via pull requests
-You can open a pull request that will get build automatically in our CI.
-
-An example can be found [here](https://github.com/RoboStack/ros-noetic/pull/44). Simply add the required packages to the `vinca_*.yaml` files, where the * indicates the desired platform (linux_64, osx, win or linux_aarch64). Ideally, try to add packages to all of these platforms.
-
-Sometimes, it may be required to patch the packages. An example of how to do so can be found in [this PR](https://github.com/RoboStack/ros-noetic/pull/32).
-
-
-# Testing changes locally
-
-1. Clone this repo: `git clone https://github.com/RoboStack/ros-noetic.git`
-2. `cd ros-noetic`
-3. `conda env create -f env/robostackenv.yaml `
-4. Make a symbolic link between your platform's yaml and `vinca.yaml`. Examples
-* `ln -s vinca_linux_64.yaml vinca.yaml` 
-* `ln -s vinca_osx.yaml vinca.yaml`
-* `mklink vinca.yaml vinca_win.yaml`
-5. Modify your platform's yaml as you please, e.g. add new packages to be built.
-6. Run vinca to generate the recipe by executing `vinca --multiple`
-7. Move to the `recipes` folder to find the recipes that need to be (re)build: `cd recipes`. Note that at least one package needs to be (re)build for folder to show up.
-8. Build the recipes from within the `recipes` folder using boa: `boa build . -m ../.ci_support/conda_forge_pinnings.yaml -m ../conda_build_config.yaml`
-
-# How does it work?
-- The `vinca.yaml` file specifies which packages should be built. 
-  - Add the desired package under `packages_select_by_deps`. This will automatically pull in all dependencies of that package, too.
-  - Note that all packages that are already build in one of the channels listed under `skip_existing` will be skipped. You can also add your local channel to that list by e.g. adding `/home/ubuntu/miniconda3/conda-bld/linux-64/repodata.json`. 
-  - If you want to manually skip packages, you can list them under `packages_skip_by_deps`.
-  - If you set `skip_all_deps` to `True`, you will only build packages listed under `packages_select_by_deps` but none of their dependencies.
-  - The `packages_remove_from_deps` list allows you to never build packages, even if they are listed as dependencies of other packages. We use it for e.g. the stage simulator which is not available in conda-forge, but is listed as one of the dependencies of the ros-simulator metapackage.
-  - If you want to manually rebuild a package that already exists, you need to comment out the channels listed under `skip_existing`. You probably want to set `skip_all_deps: true`, otherwise all dependencies will be rebuilt in this case.
-- If the package does not build successfully out of the box, you might need to patch it. To do so, create a new file `ros-noetic-$PACKAGENAME.patch` in the `patch` directory (replace `$PACKAGENAME$` with the name of the package, and replace any underscores with hyphens). You can also use platform specifiers to only apply the patch on a specific platform, e.g. `ros-noetic-$PACKAGENAME.win.patch`.
-- The `robostack.yaml` and `packages-ignore.yaml` files are the equivalent of the [rosdep.yaml](http://wiki.ros.org/rosdep/rosdep.yaml) and translate ROS dependencies into conda package names (or in the case of the dependencies listed in `packages-ignore.yaml` the dependencies are ignored by specifying an empty list).

From bf5e59714c2ee0c35ddb08822cd54b335796449d Mon Sep 17 00:00:00 2001
From: Griffin Tabor <tabor473@gmail.com>
Date: Tue, 29 Aug 2023 12:49:13 -0600
Subject: [PATCH 7/9] add realsense2-description (#388)

---
 vinca_linux_64.yaml      | 3 ++-
 vinca_linux_aarch64.yaml | 1 +
 vinca_osx.yaml           | 2 +-
 vinca_osx_arm64.yaml     | 1 +
 vinca_win.yaml           | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
index 19d712f4e..710a528db 100644
--- a/vinca_linux_64.yaml
+++ b/vinca_linux_64.yaml
@@ -54,6 +54,8 @@ packages_select_by_deps:
   - octomap-server
   - ackermann-msgs
   - fake-localization
+  - realsense2-description
+
   # - desktop
   # - desktop-full
   # # - pybind11_catkin  # Needs to be patched to use conda-forge's pybind11
@@ -172,7 +174,6 @@ packages_select_by_deps:
   # - turtlebot3-fake
   # - librealsense2
   # - realsense2_camera
-  # - realsense2-description
   # - ur-msgs
   # - rosdoc-lite
   # - ros_numpy
diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
index 6cd5ea410..5321d043c 100644
--- a/vinca_linux_aarch64.yaml
+++ b/vinca_linux_aarch64.yaml
@@ -43,6 +43,7 @@ packages_select_by_deps:
   - octomap-server
   - ackermann-msgs
   - fake-localization
+  - realsense2-description
 
   # - rqt-gui
   # - catkin
diff --git a/vinca_osx.yaml b/vinca_osx.yaml
index 785769a35..2c7a95675 100644
--- a/vinca_osx.yaml
+++ b/vinca_osx.yaml
@@ -35,6 +35,7 @@ packages_select_by_deps:
   - octomap-ros
   - ackermann-msgs
   - fake-localization
+  - realsense2-description
 
   # - rviz
   # - python-qt-binding
@@ -156,7 +157,6 @@ packages_select_by_deps:
   # - turtlebot3-fake
   # - librealsense2
   # - realsense2_camera
-  # - realsense2-description
   # - ur-msgs
   # - rosdoc-lite
   # - ros_numpy
diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
index 9b27837c4..8d0fb8d65 100644
--- a/vinca_osx_arm64.yaml
+++ b/vinca_osx_arm64.yaml
@@ -40,6 +40,7 @@ packages_select_by_deps:
   - octomap-ros
   - ackermann-msgs
   - fake-localization
+  - realsense2-description
 
   # - rviz
   # - python-qt-binding
diff --git a/vinca_win.yaml b/vinca_win.yaml
index 7006aa975..93c079cd1 100644
--- a/vinca_win.yaml
+++ b/vinca_win.yaml
@@ -41,7 +41,8 @@ packages_select_by_deps:
   - octomap-ros
   - ackermann-msgs
   - fake-localization
-  
+  - realsense2-description
+
   # - desktop
   # - rqt-gui
   # - catkin
@@ -130,7 +131,6 @@ packages_select_by_deps:
   # - niryo_one_simulation
 
   # - librealsense2
-  # - realsense2-description
   # - ur-msgs
   # - rosdoc-lite
 

From 2df9096aa82f1e399b143eb5d9d1f44a88d33c55 Mon Sep 17 00:00:00 2001
From: Griffin Tabor <tabor473@gmail.com>
Date: Wed, 30 Aug 2023 01:50:47 -0600
Subject: [PATCH 8/9] Blank commit (#389)

---
 vinca_win.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vinca_win.yaml b/vinca_win.yaml
index 93c079cd1..3106d637e 100644
--- a/vinca_win.yaml
+++ b/vinca_win.yaml
@@ -42,7 +42,7 @@ packages_select_by_deps:
   - ackermann-msgs
   - fake-localization
   - realsense2-description
-
+  
   # - desktop
   # - rqt-gui
   # - catkin

From 6640b9fb32bb07a38ea82c2bd8bb3f825ca78d5d Mon Sep 17 00:00:00 2001
From: Tobias Fischer <info@tobiasfischer.info>
Date: Sat, 9 Sep 2023 19:43:02 +1000
Subject: [PATCH 9/9] Add requested packages (#403)

---
 vinca_linux_64.yaml | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
index 710a528db..b51f1336b 100644
--- a/vinca_linux_64.yaml
+++ b/vinca_linux_64.yaml
@@ -37,24 +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
+  - 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
+  # - microstrain-inertial-driver
+  # - microstrain-inertial-msgs
+  # - usb-cam
+  # - octomap-ros
+  # - octomap-mapping
+  # - octomap-server
+  # - ackermann-msgs
+  # - fake-localization
+  # - realsense2-description
 
   # - desktop
   # - desktop-full