Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve premature controller initialization #213

Merged
merged 5 commits into from
Nov 5, 2018
Merged

Resolve premature controller initialization #213

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35001e6
Avoid updating ros_control controllers on pipeline timeout
miguelprada Oct 16, 2018
0110e88
Revert "Avoid updating ros_control controllers on pipeline timeout"
miguelprada Oct 23, 2018
c599a2f
Do not update controller_manager until RTPackets have been received
miguelprada Oct 23, 2018
0edc606
Mark handles as initialized after actually doing it rather than just …
miguelprada Oct 23, 2018
7af6a28
Improve readability
miguelprada Nov 5, 2018
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
1 change: 1 addition & 0 deletions include/ur_modern_driver/ros/controller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class ROSController : private hardware_interface::RobotHW, public URRTPacketCons
ros::NodeHandle nh_;
ros::Time lastUpdate_;
controller_manager::ControllerManager controller_;
bool state_initialized_;
miguelprada marked this conversation as resolved.
Show resolved Hide resolved

// state interfaces
JointInterface joint_interface_;
Expand Down
5 changes: 4 additions & 1 deletion src/ros/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
ROSController::ROSController(URCommander& commander, TrajectoryFollower& follower,
std::vector<std::string>& joint_names, double max_vel_change, std::string tcp_link)
: controller_(this, nh_)
, state_initialized_(false)
miguelprada marked this conversation as resolved.
Show resolved Hide resolved
, joint_interface_(joint_names)
, wrench_interface_(tcp_link)
, position_interface_(follower, joint_interface_, joint_names)
Expand Down Expand Up @@ -81,6 +82,7 @@ void ROSController::read(RTShared& packet)
{
joint_interface_.update(packet);
wrench_interface_.update(packet);
state_initialized_ = true;
miguelprada marked this conversation as resolved.
Show resolved Hide resolved
}

bool ROSController::update()
Expand Down Expand Up @@ -111,7 +113,8 @@ bool ROSController::update()

void ROSController::onTimeout()
{
update();
if (state_initialized_)
miguelprada marked this conversation as resolved.
Show resolved Hide resolved
update();
}

void ROSController::onRobotStateChange(RobotState state)
Expand Down