diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0bae453c..26a5cf69 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,7 @@ Changelog * [BUGFIX]: LaserScan is not properly aligned with generated point cloud * address an issue where LaserScan appeared different on FW prior to 2.4 * [BUGFIX]: LaserScan does not work when using dual mode +* [BUGFIX]: ROS2 crashes when standby mode is set and then set to normal ouster_ros v0.12.0 ================== diff --git a/ouster-ros/package.xml b/ouster-ros/package.xml index 9b4f760b..cc6a0f7a 100644 --- a/ouster-ros/package.xml +++ b/ouster-ros/package.xml @@ -2,7 +2,7 @@ ouster_ros - 0.12.1 + 0.12.2 Ouster ROS2 driver ouster developers BSD diff --git a/ouster-ros/src/os_sensor_node.cpp b/ouster-ros/src/os_sensor_node.cpp index 3c76d6cf..8845c460 100644 --- a/ouster-ros/src/os_sensor_node.cpp +++ b/ouster-ros/src/os_sensor_node.cpp @@ -801,9 +801,9 @@ void OusterSensor::start_packet_processing_threads() { imu_packets_processing_thread_active = true; imu_packets_processing_thread = std::make_unique([this]() { while (imu_packets_processing_thread_active) { - imu_packets->read([this](const uint8_t* buffer) { - on_imu_packet_msg(buffer); - }); + imu_packets->read_timeout([this](const uint8_t* buffer) { + if (buffer != nullptr) on_imu_packet_msg(buffer); + }, 1s); } RCLCPP_DEBUG(get_logger(), "imu_packets_processing_thread done."); }); @@ -811,9 +811,9 @@ void OusterSensor::start_packet_processing_threads() { lidar_packets_processing_thread_active = true; lidar_packets_processing_thread = std::make_unique([this]() { while (lidar_packets_processing_thread_active) { - lidar_packets->read([this](const uint8_t* buffer) { - on_lidar_packet_msg(buffer); - }); + lidar_packets->read_timeout([this](const uint8_t* buffer) { + if (buffer != nullptr) on_lidar_packet_msg(buffer); + }, 1s); } RCLCPP_DEBUG(get_logger(), "lidar_packets_processing_thread done."); }); diff --git a/ouster-sensor-msgs/package.xml b/ouster-sensor-msgs/package.xml index 08cbc873..d2087191 100644 --- a/ouster-sensor-msgs/package.xml +++ b/ouster-sensor-msgs/package.xml @@ -2,7 +2,7 @@ ouster_sensor_msgs - 0.12.0 + 0.12.2 ouster_ros message and service definitions ouster developers BSD