Skip to content
Open
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
5 changes: 5 additions & 0 deletions .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ jobs:
rm -rf /c/Strawberry
rm -rf "/c/Program Files (x86)/Windows Kits/10/Include/10.0.17763.0/"

- name: Disable git auto-maintenance in source caches
shell: bash -l {0}
run: |
git config --global maintenance.auto false

- name: Generate recipes
shell: bash -l {0}
run: |
Expand Down
8 changes: 4 additions & 4 deletions check_patches_clean_apply.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
-----

# From repository root
python .scripts/check_patches_clean_apply.py # prepare + run
python .scripts/check_patches_clean_apply.py --dry # prepare only
python .scripts/check_patches_clean_apply.py --dry --recipe ros-rolling-rviz2
python .scripts/check_patches_clean_apply.py --clean # delete output
python check_patches_clean_apply.py # prepare + run
python check_patches_clean_apply.py --dry # prepare only
python check_patches_clean_apply.py --dry --recipe ros-rolling-rviz2
python check_patches_clean_apply.py --clean # delete output

The script creates (or refreshes) a sibling folder named
*recipes_only_patch*. Every recipe that declares *patches:* gets a
Expand Down
7 changes: 7 additions & 0 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -294,3 +294,10 @@ rqt_mocap4r2_control:
remove_run: ["qt-main"]
zstd_point_cloud_transport:
add_host: ["ros-rolling-zstd-cmake-module", "zstd"]
mujoco_vendor:
add_host: ["libmujoco"]
roboplan_ros_examples:
# package.xml only declares ament_cmake_python, but CMakeLists.txt does
# find_package(ament_cmake REQUIRED) and build_type is ament_cmake.
# Fixed for roboplan_ros 0.7.0, so it can be removed when this releases.
add_host: ["ros-rolling-ament-cmake"]
Comment on lines +299 to +303

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

33 changes: 7 additions & 26 deletions patch/ros-rolling-ouster-ros.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5764b78..13249cc 100644
index ed34a38..93ee3fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,8 +83,18 @@ set(ouster_ros_library_deps
@@ -97,8 +97,18 @@ set(ouster_ros_library_deps
tf2_eigen
)

Expand All @@ -23,7 +23,7 @@ index 5764b78..13249cc 100644
)

target_link_libraries(ouster_ros_library
@@ -111,14 +121,14 @@ function(create_ros2_component
@@ -125,14 +135,14 @@ function(create_ros2_component
"OUSTER_ROS_BUILDING_DLL"
)

Expand All @@ -46,7 +46,7 @@ index 5764b78..13249cc 100644
${additional_dependencies}
)

@@ -132,7 +142,7 @@ endfunction()
@@ -146,7 +156,7 @@ endfunction()
# ==== os_sensor_component ====
create_ros2_component(os_sensor_component
"src/os_sensor_node_base.cpp;src/os_sensor_node.cpp"
Expand All @@ -55,7 +55,7 @@ index 5764b78..13249cc 100644
)
rclcpp_components_register_node(os_sensor_component
PLUGIN "ouster_ros::OusterSensor"
@@ -152,7 +162,7 @@ rclcpp_components_register_node(os_replay_component
@@ -166,7 +176,7 @@ rclcpp_components_register_node(os_replay_component
# ==== os_cloud_component ====
create_ros2_component(os_cloud_component
"src/os_processing_node_base.cpp;src/os_cloud_node.cpp"
Expand All @@ -64,7 +64,7 @@ index 5764b78..13249cc 100644
)
rclcpp_components_register_node(os_cloud_component
PLUGIN "ouster_ros::OusterCloud"
@@ -172,7 +182,7 @@ rclcpp_components_register_node(os_image_component
@@ -186,7 +196,7 @@ rclcpp_components_register_node(os_image_component
# ==== os_driver_component ====
create_ros2_component(os_driver_component
"src/os_sensor_node_base.cpp;src/os_sensor_node.cpp;src/os_driver_node.cpp"
Expand All @@ -73,7 +73,7 @@ index 5764b78..13249cc 100644
)
rclcpp_components_register_node(os_driver_component
PLUGIN "ouster_ros::OusterDriver"
@@ -203,9 +213,9 @@ if(BUILD_TESTING)
@@ -217,9 +227,9 @@ if(BUILD_TESTING)
test/point_transform_test.cpp
test/point_cloud_compose_test.cpp
)
Expand Down Expand Up @@ -107,25 +107,6 @@ index 7867e3a..6994f3d 100644
namespace ouster {
namespace sdk {
namespace core {
diff --git a/src/os_sensor_node.cpp b/src/os_sensor_node.cpp
index 8a73c8c..ea3efaf 100644
--- a/src/os_sensor_node.cpp
+++ b/src/os_sensor_node.cpp
@@ -1028,12 +1028,12 @@ void OusterSensor::stop_sensor_connection_thread() {
}

void OusterSensor::on_lidar_packet_msg(const LidarPacket&) {
- lidar_packet_msg.buf.swap(lidar_packet.buf);
+ static_cast<std::vector<uint8_t>&>(lidar_packet_msg.buf).swap(lidar_packet.buf);
lidar_packet_pub->publish(lidar_packet_msg);
}

void OusterSensor::on_imu_packet_msg(const ImuPacket&) {
- imu_packet_msg.buf.swap(imu_packet.buf);
+ static_cast<std::vector<uint8_t>&>(imu_packet_msg.buf).swap(imu_packet.buf);
imu_packet_pub->publish(imu_packet_msg);
}

diff --git a/src/os_static_transforms_broadcaster.h b/src/os_static_transforms_broadcaster.h
index 94d50eb..b1e05ce 100644
--- a/src/os_static_transforms_broadcaster.h
Expand Down
42 changes: 39 additions & 3 deletions pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ coal:
generate_dummy_package_with_run_deps:
dep_name: coal
max_pin: 'x.x.x'
override_version: '3.0.3'
override_version: '3.0.4'
compressed_depth_image_transport:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
console_bridge_vendor:
Expand Down Expand Up @@ -143,16 +143,48 @@ pinocchio:
dep_name: pinocchio
max_pin: 'x.x.x'
# the version on ros is outdated w.r.t. to the conda-forge one
override_version: '4.0.0'
override_version: '4.1.0'
proxsuite:
generate_dummy_package_with_run_deps:
dep_name: proxsuite
max_pin: 'x.x'
override_version: '0.7.2'
override_version: '0.7.3'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self/other reviewers: in general we try to avoid doing this for abi compat version, but as this is an header only library isn ot a problem.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be fine with proxsuite 0.7.2 as well, though, if it's better

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess if you install ros2-proxsuite 0.7.2 , you end up with proxsuite 0.7.3 being installed, as ros2-proxsuite has a proxsuite >=0.7.2,<0.8.0a0 dep on proxsuite, see https://prefix.dev/channels/robostack-rolling/packages/ros2-proxsuite (this derive from max_pin: 'x.x') used here.

pybind11_json_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR"
pybind11_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR"
roboplan:
generate_dummy_package_with_run_deps:
dep_name: roboplan-python
max_pin: 'x.x'
roboplan-oink:
generate_dummy_package_with_run_deps:
dep_name: roboplan-oink-python
max_pin: 'x.x'
roboplan_cartesian_planning:
generate_dummy_package_with_run_deps:
dep_name: roboplan-cartesian-planning-python
max_pin: 'x.x'
roboplan_example_models:
generate_dummy_package_with_run_deps:
dep_name: roboplan-example-models-python
max_pin: 'x.x'
roboplan_examples:
generate_dummy_package_with_run_deps:
dep_name: roboplan-examples-python
max_pin: 'x.x'
roboplan_rrt:
generate_dummy_package_with_run_deps:
dep_name: roboplan-rrt-python
max_pin: 'x.x'
roboplan_simple_ik:
generate_dummy_package_with_run_deps:
dep_name: roboplan-simple-ik-python
max_pin: 'x.x'
roboplan_toppra:
generate_dummy_package_with_run_deps:
dep_name: roboplan-toppra-python
max_pin: 'x.x'
robot_state_publisher:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
rosx_introspection:
Expand All @@ -165,6 +197,10 @@ spdlog_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
sqlite3_vendor:
additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK"
toppra:
generate_dummy_package_with_run_deps:
dep_name: toppra-python
max_pin: 'x.x'
ublox_gps:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
uncrustify_vendor:
Expand Down
2 changes: 2 additions & 0 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,8 @@ msgpack:
robostack: [msgpack-python]
muparser:
robostack: [muparser]
nanobind-dev:
robostack: [nanobind]
netpbm:
robostack:
linux-aarch64: []
Expand Down
20 changes: 20 additions & 0 deletions rosdistro_additional_recipes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,26 @@ mocap4r2_robot_gt_msgs:
url: https://github.com/MOCAP4ROS2-Project/mocap4r2.git
version: 0.0.7
additional_folder: mocap4r2_robot_gt/mocap4r2_robot_gt_msgs
roboplan_ros_cpp:
tag: release/rolling/roboplan_ros_cpp/0.6.1-1
url: https://github.com/ros2-gbp/roboplan_ros-release.git
version: 0.6.1
roboplan_ros_examples:
tag: release/rolling/roboplan_ros_examples/0.6.1-1
url: https://github.com/ros2-gbp/roboplan_ros-release.git
version: 0.6.1
roboplan_ros_franka:
tag: release/rolling/roboplan_ros_franka/0.6.1-1
url: https://github.com/ros2-gbp/roboplan_ros-release.git
version: 0.6.1
roboplan_ros_py:
tag: release/rolling/roboplan_ros_py/0.6.1-1
url: https://github.com/ros2-gbp/roboplan_ros-release.git
version: 0.6.1
roboplan_ros_visualization:
tag: release/rolling/roboplan_ros_visualization/0.6.1-1
url: https://github.com/ros2-gbp/roboplan_ros-release.git
version: 0.6.1
rqt_mocap4r2_control:
tag: 0.0.7
url: https://github.com/MOCAP4ROS2-Project/mocap4r2.git
Expand Down
Loading
Loading