Skip to content

Commit 09cedfb

Browse files
author
Felix Exner (fexner)
authored
Revert "Add passthrough interfaces for joints (#1121)" (#1151)
This reverts commit 3068607.
1 parent 980d2f6 commit 09cedfb

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,6 @@ class URPositionHardwareInterface : public hardware_interface::SystemInterface
197197
double get_robot_software_version_bugfix_;
198198
double get_robot_software_version_build_;
199199

200-
// Passthrough trajectory controller interface values
201-
urcl::vector6d_t passthrough_trajectory_positions_;
202-
urcl::vector6d_t passthrough_trajectory_velocities_;
203-
urcl::vector6d_t passthrough_trajectory_accelerations_;
204-
205200
// payload stuff
206201
urcl::vector3d_t payload_center_of_gravity_;
207202
double payload_mass_;

ur_robot_driver/src/hardware_interface.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ URPositionHardwareInterface::on_init(const hardware_interface::HardwareInfo& sys
9696
system_interface_initialized_ = 0.0;
9797

9898
for (const hardware_interface::ComponentInfo& joint : info_.joints) {
99-
if (joint.command_interfaces.size() != 5) {
99+
if (joint.command_interfaces.size() != 2) {
100100
RCLCPP_FATAL(rclcpp::get_logger("URPositionHardwareInterface"),
101-
"Joint '%s' has %zu command interfaces found. 5 expected.", joint.name.c_str(),
101+
"Joint '%s' has %zu command interfaces found. 2 expected.", joint.name.c_str(),
102102
joint.command_interfaces.size());
103103
return hardware_interface::CallbackReturn::ERROR;
104104
}
@@ -256,15 +256,6 @@ std::vector<hardware_interface::CommandInterface> URPositionHardwareInterface::e
256256

257257
command_interfaces.emplace_back(hardware_interface::CommandInterface(
258258
info_.joints[i].name, hardware_interface::HW_IF_VELOCITY, &urcl_velocity_commands_[i]));
259-
260-
command_interfaces.emplace_back(hardware_interface::CommandInterface(info_.joints[i].name, "passthrough_position",
261-
&passthrough_trajectory_positions_[i]));
262-
263-
command_interfaces.emplace_back(hardware_interface::CommandInterface(info_.joints[i].name, "passthrough_velocity",
264-
&passthrough_trajectory_velocities_[i]));
265-
266-
command_interfaces.emplace_back(hardware_interface::CommandInterface(
267-
info_.joints[i].name, "passthrough_acceleration", &passthrough_trajectory_accelerations_[i]));
268259
}
269260
// Obtain the tf_prefix from the urdf so that we can have the general interface multiple times
270261
// NOTE using the tf_prefix at this point is some kind of workaround. One should actually go through the list of gpio

0 commit comments

Comments
 (0)