diff --git a/.gitignore b/.gitignore index f8befc9e0..ac0fb0cc2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,6 @@ log/ # ARIAC Logs /ariac_log/*/ +# New trials +/ariac_gazebo/config/trials/*.yaml + diff --git a/ariac_controllers/package.xml b/ariac_controllers/package.xml index 8f8b2450f..1937dee60 100644 --- a/ariac_controllers/package.xml +++ b/ariac_controllers/package.xml @@ -2,7 +2,7 @@ ariac_controllers - 2024.1.1 + 2024.2.0 ros2 controllers for ARIAC simulation Justin Albrecht NIST diff --git a/ariac_description/package.xml b/ariac_description/package.xml index 5a128e3b1..0310e0a04 100644 --- a/ariac_description/package.xml +++ b/ariac_description/package.xml @@ -2,7 +2,7 @@ ariac_description - 2024.1.1 + 2024.2.0 Package containing URDF descriptions for all robots in the ARIAC simulation justin NIST diff --git a/ariac_gazebo/package.xml b/ariac_gazebo/package.xml index d8f4302a7..ec4c279d8 100644 --- a/ariac_gazebo/package.xml +++ b/ariac_gazebo/package.xml @@ -2,7 +2,7 @@ ariac_gazebo - 2024.1.1 + 2024.2.0 ARIAC ROS2 port justin NIST diff --git a/ariac_gui/package.xml b/ariac_gui/package.xml index 7d9ac60a2..2401c81ed 100644 --- a/ariac_gui/package.xml +++ b/ariac_gui/package.xml @@ -2,7 +2,7 @@ ariac_gui - 2024.1.1 + 2024.2.0 GUI for creating trial configurations Joseph Fernandez NIST diff --git a/ariac_gui/setup.py b/ariac_gui/setup.py index f471c8503..363abe475 100644 --- a/ariac_gui/setup.py +++ b/ariac_gui/setup.py @@ -6,7 +6,7 @@ file_names = ['plus','assembly_station','agv','tray','light_icon','dark_icon']+[color+pType for color in PART_COLORS for pType in PART_TYPES]+[f'id_0{i}' for i in range(10)] setup( name=package_name, - version='2024.1.0', + version='2024.2.0', packages=[package_name], data_files=[ ('share/ament_index/resource_index/packages', diff --git a/ariac_moveit_config/package.xml b/ariac_moveit_config/package.xml index 33610d015..ec998e9a3 100644 --- a/ariac_moveit_config/package.xml +++ b/ariac_moveit_config/package.xml @@ -2,7 +2,7 @@ ariac_moveit_config - 2024.1.1 + 2024.2.0 An package with MoveIt2 configurations for ARIAC robots Justin Albrecht NIST diff --git a/ariac_msgs/msg/AdvancedLogicalCameraImage.msg b/ariac_msgs/msg/AdvancedLogicalCameraImage.msg index 42ad4715b..678aae7c4 100644 --- a/ariac_msgs/msg/AdvancedLogicalCameraImage.msg +++ b/ariac_msgs/msg/AdvancedLogicalCameraImage.msg @@ -1,3 +1,4 @@ +std_msgs/Header header ariac_msgs/PartPose[] part_poses ariac_msgs/KitTrayPose[] tray_poses geometry_msgs/Pose sensor_pose \ No newline at end of file diff --git a/ariac_msgs/msg/BasicLogicalCameraImage.msg b/ariac_msgs/msg/BasicLogicalCameraImage.msg index 878495ee3..630f9f245 100644 --- a/ariac_msgs/msg/BasicLogicalCameraImage.msg +++ b/ariac_msgs/msg/BasicLogicalCameraImage.msg @@ -1,3 +1,4 @@ +std_msgs/Header header geometry_msgs/Pose[] part_poses geometry_msgs/Pose[] tray_poses geometry_msgs/Pose sensor_pose \ No newline at end of file diff --git a/ariac_msgs/package.xml b/ariac_msgs/package.xml index 3eda3858a..978b63b82 100644 --- a/ariac_msgs/package.xml +++ b/ariac_msgs/package.xml @@ -2,7 +2,7 @@ ariac_msgs - 2024.1.1 + 2024.2.0 Interface definitions for ARIAC justin NIST diff --git a/ariac_plugins/package.xml b/ariac_plugins/package.xml index 1190be16c..b4ca9ad06 100644 --- a/ariac_plugins/package.xml +++ b/ariac_plugins/package.xml @@ -2,7 +2,7 @@ ariac_plugins - 2024.1.1 + 2024.2.0 Gazebo/ROS2 plugins for the ARAIC competition justin albrecht zeid kootbally diff --git a/ariac_sensors/package.xml b/ariac_sensors/package.xml index cd488b936..a56f174e3 100644 --- a/ariac_sensors/package.xml +++ b/ariac_sensors/package.xml @@ -2,7 +2,7 @@ ariac_sensors - 2024.1.1 + 2024.2.0 Gazebo plugins for the ARIAC sensors justin NIST diff --git a/ariac_sensors/src/ariac_logical_camera_plugin.cpp b/ariac_sensors/src/ariac_logical_camera_plugin.cpp index 97c10b2e6..1c28829c1 100644 --- a/ariac_sensors/src/ariac_logical_camera_plugin.cpp +++ b/ariac_sensors/src/ariac_logical_camera_plugin.cpp @@ -43,6 +43,7 @@ class AriacLogicalCameraPluginPrivate std::string camera_name_; std::string sensor_type_; + std::string frame_name_; std::map part_types_; std::map part_colors_; @@ -91,6 +92,8 @@ void AriacLogicalCameraPlugin::Load(gazebo::sensors::SensorPtr _sensor, sdf::Ele impl_->camera_name_ = _sdf->Get("camera_name"); impl_->sensor_type_ = _sdf->Get("sensor_type"); + impl_->frame_name_ = gazebo_ros::SensorFrameID(*_sensor, *_sdf); + if (impl_->sensor_type_ == "basic") { impl_->basic_pub_ = impl_->ros_node_->create_publisher( "ariac/sensors/" + impl_->camera_name_ + "/image", rclcpp::SensorDataQoS()); @@ -177,6 +180,9 @@ void AriacLogicalCameraPluginPrivate::OnUpdate() basic_image_msg_->tray_poses.push_back(tray.pose); } + basic_image_msg_->header.stamp = ros_node_->get_clock()->now(); + basic_image_msg_->header.frame_id = frame_name_; + basic_pub_->publish(*basic_image_msg_); } else if (sensor_type_ == "advanced") { @@ -185,6 +191,9 @@ void AriacLogicalCameraPluginPrivate::OnUpdate() advanced_image_msg_->part_poses = parts; advanced_image_msg_->tray_poses = trays; + advanced_image_msg_->header.stamp = ros_node_->get_clock()->now(); + advanced_image_msg_->header.frame_id = frame_name_; + advanced_pub_->publish(*advanced_image_msg_); } }