Skip to content

Commit 065bf7d

Browse files
authored
Use hpp headers from geometry2 (#1467)
* Use hpp headers from geometry2 geometry2 recently changed their headers to use a .hpp instead of .h file ending. This commit adapts includes from geometry2 to that. * Add semi-binary-testing workflows for kilted and rolling It happened too often recently, that things outside our upstream workspaces got changed and all pipelines were red until the breaking change was merged to main. This should help verifying these situations.
1 parent f30f0e6 commit 065bf7d

File tree

4 files changed

+50
-6
lines changed

4 files changed

+50
-6
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Kilted Semi Binary Build Testing
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- main
7+
push:
8+
branches:
9+
- main
10+
schedule:
11+
# Run every morning to detect flakiness and broken dependencies
12+
- cron: '13 4 * * *'
13+
14+
jobs:
15+
kilted_semi_testing:
16+
uses: ./.github/workflows/reusable_ici.yml
17+
with:
18+
ros_distro: kilted
19+
ros_repo: testing
20+
upstream_workspace: Universal_Robots_ROS2_Driver.kilted.repos
21+
ref_for_scheduled_build: main
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Rolling Semi Binary Build Testing
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- main
7+
push:
8+
branches:
9+
- main
10+
schedule:
11+
# Run every morning to detect flakiness and broken dependencies
12+
- cron: '13 4 * * *'
13+
14+
jobs:
15+
rolling_semi_testing:
16+
uses: ./.github/workflows/reusable_ici.yml
17+
with:
18+
ros_distro: rolling
19+
ros_repo: testing
20+
upstream_workspace: Universal_Robots_ROS2_Driver.rolling.repos
21+
ref_for_scheduled_build: main

ur_calibration/src/calibration_correction.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
#include <memory>
4848
#include <string>
4949

50-
#include "ur_client_library/comm/parser.h"
5150
#include "ur_client_library/comm/pipeline.h"
5251
#include "ur_client_library/comm/producer.h"
5352
#include "ur_client_library/comm/stream.h"
@@ -57,8 +56,6 @@
5756
#include "ur_robot_driver/urcl_log_handler.hpp"
5857

5958
#include "rclcpp/exceptions/exceptions.hpp"
60-
#include "sensor_msgs/msg/joint_state.hpp"
61-
#include "tf2_ros/transform_listener.h"
6259

6360
namespace fs = std::filesystem;
6461

ur_controllers/include/ur_controllers/force_mode_controller.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@
3535
//----------------------------------------------------------------------
3636

3737
#pragma once
38-
#include <tf2_ros/buffer.h>
39-
#include <tf2_ros/transform_listener.h>
4038
#include <array>
4139
#include <memory>
4240

4341
#include <controller_interface/controller_interface.hpp>
4442
#include <geometry_msgs/msg/pose_stamped.hpp>
45-
#include <realtime_tools/realtime_buffer.hpp>
4643
#include <rclcpp/rclcpp.hpp>
44+
#include <realtime_tools/realtime_buffer.hpp>
4745
#include <std_srvs/srv/trigger.hpp>
46+
#if __has_include(<tf2_ros/buffer.hpp>)
47+
#include <tf2_ros/buffer.hpp>
48+
#include <tf2_ros/transform_listener.hpp>
49+
#else
50+
#include <tf2_ros/buffer.h>
51+
#include <tf2_ros/transform_listener.h>
52+
#endif
4853
#include <ur_msgs/srv/set_force_mode.hpp>
4954

5055
#include "ur_controllers/force_mode_controller_parameters.hpp"

0 commit comments

Comments
 (0)