From 1f44b3e3e347e55708a138f7629bec53fceaea2b Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 29 May 2024 10:38:00 +1000 Subject: [PATCH 1/5] Add moveit-servo --- vinca_osx_arm64.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml index f75416528..7c7c5892e 100644 --- a/vinca_osx_arm64.yaml +++ b/vinca_osx_arm64.yaml @@ -79,6 +79,7 @@ packages_select_by_deps: - desktop - perception - moveit + - moveit-servo # - eigenpy # needs manual build - turtlebot3 - turtlebot3-simulations From eaaa0503efe649aaa4fda575306a00b841c9b7b4 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 29 May 2024 10:38:31 +1000 Subject: [PATCH 2/5] Add moveit-servo to win-64 --- vinca_win.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/vinca_win.yaml b/vinca_win.yaml index 560cda43e..52126a7f6 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -63,6 +63,7 @@ packages_select_by_deps: - fcl - desktop_full - moveit + - moveit-servo - kdl-parser-py - imu-tools - rqt-controller-manager From f721c83d5a1920b43c29c933445caff57d3840b1 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 4 Jul 2024 09:43:58 +1000 Subject: [PATCH 3/5] No spnav on Win --- robostack.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/robostack.yaml b/robostack.yaml index cea766c73..d7e1fe368 100644 --- a/robostack.yaml +++ b/robostack.yaml @@ -398,7 +398,10 @@ libreadline-dev: libsndfile1-dev: robostack: [libsndfile] libspnav-dev: - robostack: [libspnav] + robostack: + linux: [libspnav] + osx: [libspnav] + win64: [] libsqlite3-dev: robostack: [sqlite 3.*] libssl-dev: @@ -890,7 +893,10 @@ sdl2: socat: robostack: [socat] spacenavd: - robostack: [libspnav] + robostack: + linux: [libspnav] + osx: [libspnav] + win64: [] spdlog: robostack: [spdlog] sshpass: From 12967166ac78e55bf5798da80777661b8a260340 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 4 Jul 2024 09:44:32 +1000 Subject: [PATCH 4/5] No spnav on Win --- conda.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conda.yaml b/conda.yaml index dcaf5de43..1216e0693 100644 --- a/conda.yaml +++ b/conda.yaml @@ -400,7 +400,10 @@ libreadline-dev: libsndfile1-dev: conda: [libsndfile] libspnav-dev: - conda: [libspnav] + conda: + linux: [libspnav] + osx: [libspnav] + win64: [] libsqlite3-dev: conda: [sqlite 3.*] libssl-dev: @@ -875,7 +878,10 @@ sdl2: socat: conda: [socat] spacenavd: - conda: [libspnav] + conda: + linux: [libspnav] + osx: [libspnav] + win64: [] spdlog: conda: [spdlog] sshpass: From cbb053ae66ed5d3fa6b80d9e9a850b59c4e0d235 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 4 Jul 2024 10:21:09 +1000 Subject: [PATCH 5/5] No moveit-servo on Win --- vinca_win.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/vinca_win.yaml b/vinca_win.yaml index 52126a7f6..560cda43e 100644 --- a/vinca_win.yaml +++ b/vinca_win.yaml @@ -63,7 +63,6 @@ packages_select_by_deps: - fcl - desktop_full - moveit - - moveit-servo - kdl-parser-py - imu-tools - rqt-controller-manager