Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add moveit-visual-tools. #212

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions patch/ros-humble-pid-controller.patch
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
diff --git a/pid_controller/CMakeLists.txt b/pid_controller/CMakeLists.txt
index 15e903222a..6c9e00ef8b 100644
--- a/pid_controller/CMakeLists.txt
+++ b/pid_controller/CMakeLists.txt
@@ -45,7 +45,7 @@ ament_target_dependencies(pid_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
-target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER_BUILDING_DLL")
+target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER__VISIBILITY_BUILDING_DLL")
pluginlib_export_plugin_description_file(controller_interface pid_controller.xml)
diff --git a/pid_controller/include/pid_controller/pid_controller.hpp b/pid_controller/include/pid_controller/pid_controller.hpp
index f7b8cc4491..788f39f1ed 100644
--- a/pid_controller/include/pid_controller/pid_controller.hpp
+++ b/pid_controller/include/pid_controller/pid_controller.hpp
@@ -121,8 +121,10 @@ class PidController : public controller_interface::ChainableControllerInterface
std::unique_ptr<ControllerStatePublisher> state_publisher_;
// override methods from ChainableControllerInterface
+ PID_CONTROLLER__VISIBILITY_PUBLIC
std::vector<hardware_interface::CommandInterface> on_export_reference_interfaces() override;
+ PID_CONTROLLER__VISIBILITY_PUBLIC
bool on_set_chained_mode(bool chained_mode) override;
// internal methods
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81cbe6f00..d7798b579 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ ament_target_dependencies(pid_controller PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
-target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER_BUILDING_DLL")
+target_compile_definitions(pid_controller PRIVATE "PID_CONTROLLER__VISIBILITY_BUILDING_DLL")

pluginlib_export_plugin_description_file(controller_interface pid_controller.xml)

diff --git a/include/pid_controller/pid_controller.hpp b/include/pid_controller/pid_controller.hpp
index 105a91544..4919a739c 100644
--- a/include/pid_controller/pid_controller.hpp
+++ b/include/pid_controller/pid_controller.hpp
@@ -119,8 +119,10 @@ protected:
std::unique_ptr<ControllerStatePublisher> state_publisher_;

// override methods from ChainableControllerInterface
+ PID_CONTROLLER__VISIBILITY_PUBLIC
std::vector<hardware_interface::CommandInterface> on_export_reference_interfaces() override;

+ PID_CONTROLLER__VISIBILITY_PUBLIC
bool on_set_chained_mode(bool chained_mode) override;

// internal methods
3 changes: 2 additions & 1 deletion robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,8 @@ qt5-qmake:
robostack: [qt-main, REQUIRE_OPENGL]
qtbase5-dev:
robostack: [qt-main, REQUIRE_OPENGL]
rapidjson-dev:
robostack: [rapidjson]
roboticstoolbox-python:
robostack: [roboticstoolbox-python]
rsync:
Expand Down Expand Up @@ -955,4 +957,3 @@ zbar:
robostack: [zbar]
zlib:
robostack: [zlib]

3 changes: 3 additions & 0 deletions vinca_osx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ packages_remove_from_deps:
- rttest
# Not available for macOS and Windows!
- gripper_controllers
# unmet dependencies
- pid-controller

skip_existing:
# - https://conda.anaconda.org/robostack-humble/
Expand Down Expand Up @@ -102,6 +104,7 @@ packages_select_by_deps:
- moveit
- moveit_servo
- moveit-planners-chomp
- moveit-visual-tools

- gtsam

Expand Down
3 changes: 3 additions & 0 deletions vinca_osx_arm64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ packages_remove_from_deps:
- rttest
# Not available for macOS and Windows!
- gripper_controllers
# unmet dependencies
- pid-controller

skip_existing:
- https://conda.anaconda.org/robostack-staging/
Expand Down Expand Up @@ -92,6 +94,7 @@ packages_select_by_deps:

- moveit
- moveit-planners-chomp
- moveit-visual-tools

- gtsam

Expand Down
Loading