From: Walter Fetter Lages Date: Mon, 3 Jul 2023 04:41:58 +0000 (-0300) Subject: Add support to Gazebo Ignition. X-Git-Url: http://git.ece.ufrgs.br/?a=commitdiff_plain;h=ce4fffb510c62e001156c529de3f1e26ce0a7a8d;p=tatuira.git Add support to Gazebo Ignition. --- diff --git a/tatuira_bringup/launch/gazebo.launch.xml b/tatuira_bringup/launch/gazebo.launch.xml index 65345c6..bd04304 100644 --- a/tatuira_bringup/launch/gazebo.launch.xml +++ b/tatuira_bringup/launch/gazebo.launch.xml @@ -23,9 +23,10 @@ - + - + + @@ -33,7 +34,7 @@ - + @@ -41,6 +42,14 @@ + + + + + + + + diff --git a/tatuira_bringup/launch/gazebo8.launch.xml b/tatuira_bringup/launch/gazebo8.launch.xml index dc1f7f3..1433c21 100644 --- a/tatuira_bringup/launch/gazebo8.launch.xml +++ b/tatuira_bringup/launch/gazebo8.launch.xml @@ -23,6 +23,7 @@ + @@ -33,6 +34,7 @@ + @@ -44,9 +46,13 @@ + + + + diff --git a/tatuira_description/CMakeLists.txt b/tatuira_description/CMakeLists.txt index be4fc38..0189f25 100644 --- a/tatuira_description/CMakeLists.txt +++ b/tatuira_description/CMakeLists.txt @@ -27,4 +27,6 @@ if(BUILD_TESTING) ament_lint_auto_find_test_dependencies() endif() +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/env-hooks/${PROJECT_NAME}.dsv.in") + ament_package() diff --git a/tatuira_description/config/gz_bridge.yaml b/tatuira_description/config/gz_bridge.yaml new file mode 100644 index 0000000..ccc687c --- /dev/null +++ b/tatuira_description/config/gz_bridge.yaml @@ -0,0 +1,46 @@ +- ros_topic_name: "/clock" + gz_topic_name: "/clock" + ros_type_name: "rosgraph_msgs/msg/Clock" + gz_type_name: "ignition.msgs.Clock" +# subscriber_queue: 5 # Default 10 +# publisher_queue: 6 # Default 10 +# lazy: true # Default "false" + direction: GZ_TO_ROS # Default "BIDIRECTIONAL" - Bridge both directions + # "GZ_TO_ROS" - Bridge Ignition topic to ROS + # "ROS_TO_GZ" - Bridge ROS topic to Ignition + +- ros_topic_name: "/ground_truth" + gz_topic_name: "/model/tatuira/pose" + ros_type_name: "geometry_msgs/msg/PoseArray" + gz_type_name: "ignition.msgs.Pose_V" + direction: GZ_TO_ROS + +#- ros_topic_name: "/gnss/fix" +# gz_topic_name: "/gnss/fix" +# ros_type_name: "sensor_msgs/msg/NavSatFix" +# gz_type_name: "ignition.msgs.NavSat" +# direction: GZ_TO_ROS + +#- ros_topic_name: "/imu/data" +# gz_topic_name: "/imu/data" +# ros_type_name: "sensor_msgs/msg/Imu" +# gz_type_name: "ignition.msgs.IMU" +# direction: GZ_TO_ROS + +#- ros_topic_name: "/imu/mag" +# gz_topic_name: "/imu/mag" +# ros_type_name: "sensor_msgs/msg/MagneticField" +# gz_type_name: "ignition.msgs.Magnetometer" +# direction: GZ_TO_ROS + +- ros_topic_name: "/camera/camera_info" + gz_topic_name: "/camera/camera_info" + ros_type_name: "sensor_msgs/msg/CameraInfo" + gz_type_name: "ignition.msgs.CameraInfo" + direction: GZ_TO_ROS + +- ros_topic_name: "/camera/image_raw" + gz_topic_name: "/camera/image_raw" + ros_type_name: "sensor_msgs/msg/Image" + gz_type_name: "ignition.msgs.Image" + direction: GZ_TO_ROS diff --git a/tatuira_description/env-hooks/tatuira_description.dsv.in b/tatuira_description/env-hooks/tatuira_description.dsv.in new file mode 100644 index 0000000..30a6001 --- /dev/null +++ b/tatuira_description/env-hooks/tatuira_description.dsv.in @@ -0,0 +1,3 @@ +prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;share + +set-if-unset;MESA_GL_VERSION_OVERRIDE;3.3 diff --git a/tatuira_description/launch/ignition.launch.xml b/tatuira_description/launch/ignition.launch.xml new file mode 100644 index 0000000..c799c46 --- /dev/null +++ b/tatuira_description/launch/ignition.launch.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tatuira_description/urdf/d435.xacro b/tatuira_description/urdf/d435.xacro new file mode 100644 index 0000000..eda5179 --- /dev/null +++ b/tatuira_description/urdf/d435.xacro @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + trun + 15 + false + false + trigger + depth_camera + camera_link + + 1.309 + + 640 + 480 + R8G8B8 + + + + 0.05 + 10 + + + gaussian + 0.0 + 0.02 + + + + + + + 0.05 + + 0.0 + camera + camera_link + 0.05 + + + + /camera/image_raw:=/camera/color/image_raw + /camera/camera_info:=camera/color/camera_info + /camera/depth/image_raw:=/camera/depth/image_raw + /camera_depth/camera_info:=/camera/depth/camera_info + /camera/points:=camera/depth/points + + + + + + + + diff --git a/tatuira_description/urdf/gazebo_control.xacro b/tatuira_description/urdf/gazebo_control.xacro index 36399a9..6836671 100644 --- a/tatuira_description/urdf/gazebo_control.xacro +++ b/tatuira_description/urdf/gazebo_control.xacro @@ -1,11 +1,25 @@ + + + - - robot_description - robot_state_publisher - $(find tatuira_description)/config/controller_manager.yaml - + + + + robot_description + robot_state_publisher + $(find tatuira_description)/config/controller_manager.yaml + + + + + + robot_description + robot_state_publisher + $(find tatuira_description)/config/controller_manager.yaml + + diff --git a/tatuira_description/urdf/ground_truth.xacro b/tatuira_description/urdf/ground_truth.xacro new file mode 100644 index 0000000..271678a --- /dev/null +++ b/tatuira_description/urdf/ground_truth.xacro @@ -0,0 +1,39 @@ + + + + + + + + + + + 100.0 + origin_link + + odom:=ground_truth + + 0.0 + world + 0 0 0 + 0 0 ${pi/2} + + + + + + + true + false + false + false + false + true + true + 100 + false + 100 + + + + diff --git a/tatuira_description/urdf/ros2_control.xacro b/tatuira_description/urdf/ros2_control.xacro index 12128e5..ff6a85e 100644 --- a/tatuira_description/urdf/ros2_control.xacro +++ b/tatuira_description/urdf/ros2_control.xacro @@ -1,10 +1,22 @@ + + + - - gazebo_ros2_control/GazeboSystem - + + + + gazebo_ros2_control/GazeboSystem + + + + + + ign_ros2_control/IgnitionSystem + + diff --git a/tatuira_description/urdf/tatuira.urdf.xacro b/tatuira_description/urdf/tatuira.urdf.xacro index f783f6d..602e718 100644 --- a/tatuira_description/urdf/tatuira.urdf.xacro +++ b/tatuira_description/urdf/tatuira.urdf.xacro @@ -1,6 +1,9 @@ + + + @@ -73,83 +76,7 @@ - - - 100.0 - origin_link - - odom:=ground_truth - - 0.0 - world - 0 0 0 - 0 0 ${pi/2} - - - - - - - - - - - - - - - - - - - - 15 - - 1.309 - - 640 - 480 - R8G8B8 - - - 0.05 - 10 - - - gaussian - 0.0 - 0.02 - - - - - 0.05 - true - - 0.0 - camera - /camera/color/image_raw - /camera/color/camera_info - /camera/depth/image_raw - /camera/depth/camera_info - /camera/depth/points - plugin_camera_link - 0.175 - 10.0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - + + diff --git a/tatuira_ident/launch/gazebo.launch.xml b/tatuira_ident/launch/gazebo.launch.xml index b0053dc..fa23d35 100644 --- a/tatuira_ident/launch/gazebo.launch.xml +++ b/tatuira_ident/launch/gazebo.launch.xml @@ -23,12 +23,14 @@ + +