diff --git a/rbs_mill_assist/CMakeLists.txt b/rbs_mill_assist/CMakeLists.txt index 62423de..ce3bc50 100644 --- a/rbs_mill_assist/CMakeLists.txt +++ b/rbs_mill_assist/CMakeLists.txt @@ -16,6 +16,7 @@ DESTINATION share/${PROJECT_NAME}) add_subdirectory(src) add_subdirectory(scripts) add_subdirectory(bt) +add_subdirectory(utils) if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) diff --git a/rbs_mill_assist/utils/CMakeLists.txt b/rbs_mill_assist/utils/CMakeLists.txt new file mode 100644 index 0000000..e69de29 diff --git a/rbs_mill_assist/utils/include/ps_manager.hpp b/rbs_mill_assist/utils/include/ps_manager.hpp new file mode 100644 index 0000000..89c776f --- /dev/null +++ b/rbs_mill_assist/utils/include/ps_manager.hpp @@ -0,0 +1,27 @@ + +#include +#include +#include +#include +#include +#include +#include +// #include "rbs_mill_interfaces/msg/ + + +namespace rbs_mill_utils { + +class ObjectManager : public rclcpp::Node { + + public: + + ObjectManager(const rclcpp::NodeOptions options); + + private: + + void attachDetachCallback(); + +}; + + +} diff --git a/rbs_mill_assist/utils/src/ps_manager.cpp b/rbs_mill_assist/utils/src/ps_manager.cpp new file mode 100644 index 0000000..e69de29 diff --git a/rbs_mill_assist/world/inc/from_places.xacro b/rbs_mill_assist/world/inc/from_places.xacro index 323a60f..3eceda5 100644 --- a/rbs_mill_assist/world/inc/from_places.xacro +++ b/rbs_mill_assist/world/inc/from_places.xacro @@ -5,24 +5,46 @@ - - ${model["pose"]["position"]["x"]} - ${model["pose"]["position"]["y"]} - ${model["pose"]["position"]["z"]} - - - - - ${orientation['r']} - ${orientation['p']} - ${orientation['y']} + + + ${model["pose"]["position"]["x"]} + ${model["pose"]["position"]["y"]} + ${model["pose"]["position"]["z"]} + + + + + ${orientation['r']} + ${orientation['p']} + ${orientation['y']} + - - - - 0 0 0 - - + + + 0 0 0 + + + + + + ${model["pose"]["position"]["x"]} + ${model["pose"]["position"]["y"]} + ${model["pose"]["position"]["z"]} + + + + + ${orientation['r']} + ${orientation['p']} + ${orientation['y']} + + + + + 0 0 0 + + + diff --git a/rbs_mill_assist/world/inc/generate_shildiks.xacro b/rbs_mill_assist/world/inc/generate_shildiks.xacro index 2f271c8..fafb75f 100644 --- a/rbs_mill_assist/world/inc/generate_shildiks.xacro +++ b/rbs_mill_assist/world/inc/generate_shildiks.xacro @@ -6,26 +6,27 @@ + + + + + + ${slot["pose"]["position"]["x"]} ${slot["pose"]["position"]["y"]} ${slot["pose"]["position"]["z"] + z_offset} ${rpy} + + + + ${slot["pose"]["position"]["x"]} ${slot["pose"]["position"]["y"]} ${slot["pose"]["position"]["z"] + z_offset} ${rpy} + + - - - - ${slot["pose"]["position"]["x"]} ${slot["pose"]["position"]["y"]} ${slot["pose"]["position"]["z"] + z_offset} ${rpy} - + + - - ${slot["pose"]["position"]["x"]} ${slot["pose"]["position"]["y"]} ${slot["pose"]["position"]["z"] + z_offset} ${rpy} - - - - - diff --git a/rbs_mill_assist/world/world.sdf b/rbs_mill_assist/world/world.sdf new file mode 100644 index 0000000..d326853 --- /dev/null +++ b/rbs_mill_assist/world/world.sdf @@ -0,0 +1,46 @@ +1.0 1.0 1.0false0.0011.0gz-physics-dartsim-pluginogre2 + + + false0 0 10 0 0 00.8 0.8 0.8 10.2 0.2 0.2 110000.90.010.001-0.5 0.1 -0.9shildik5False + 0.0 0.066 0.01 0 0 0 + model://shildikshildik4False + 0.0 0.022 0.01 0 0 0 + model://shildikshildik3False + 0.0 -0.022 0.01 0 0 0 + model://shildikshildik2False + 0.0 -0.066 0.01 0 0 0 + model://shildikbunkerTrue + -0.31 + 0.25 + 0.0 + + + 0.0 + 0.0 + 1.57 + model://bunkerbunker_4_slotsTrue + -0.15 + 0.25 + 0.0 + + + 0.0 + 0.0 + 1.57 + model://bunker_4_slotsconductorTrue + 0.22 + -0.17 + 0.01 + + + 0 0 0 + model://conductorlaserTrue + 0.25 + -0.17 + 0.0 + + + 0.0 + 0.0 + 3.14159 + model://laser0 -0.93 0.42 0 0.4 1.8110 0 0 0 0 00.01 0.01 0.010 0 0 10 0 0 10 0 0 10 0 0 0 0 00.01 0.01 0.011.04719201080R8G8B80.13depth130true/rgbd_camera/imagetrue10 0 -0.40000000000000002 0 0 00 0 0 0 0 0104.708333333333333008.666666666666666108.041666666666666110000 0 0 0 0 01.2 0.69999999999999996 0.800000000000000041.01.00.000010.81e51e30 0 0 0 0 01.2 0.69999999999999996 0.800000000000000040.6 0.4 0.2 10.6 0.4 0.2 10.1 0.1 0.1 10 0 0 1false \ No newline at end of file diff --git a/rbs_mill_assist/world/world_macro.xacro b/rbs_mill_assist/world/world_macro.xacro index d7647d9..471b60f 100644 --- a/rbs_mill_assist/world/world_macro.xacro +++ b/rbs_mill_assist/world/world_macro.xacro @@ -24,7 +24,7 @@ - + + + + rbs_mill_interfaces + 0.0.0 + TODO: Package description + narenmak + Apache-2.0 + + ament_cmake + rosidl_default_generators + rosidl_default_runtime + rosidl_interface_packages + + geometry_msgs + + ament_lint_auto + ament_lint_common + + + ament_cmake + + diff --git a/rbs_mill_interfaces/srv/AttachDetachObject.srv b/rbs_mill_interfaces/srv/AttachDetachObject.srv new file mode 100644 index 0000000..e69de29 diff --git a/rbs_mill_interfaces/srv/GetGraspingPose.srv b/rbs_mill_interfaces/srv/GetGraspingPose.srv new file mode 100644 index 0000000..9e8c03e --- /dev/null +++ b/rbs_mill_interfaces/srv/GetGraspingPose.srv @@ -0,0 +1,8 @@ +string pose_name +string relative_to +string action_type +--- +rbs_mill_interfaces/GraspingPose grasp_poses +rbs_mill_interfaces/GraspingPose place_poses +bool ok +