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

return false if connection timeout #33

Open
wants to merge 1 commit into
base: noetic-devel
Choose a base branch
from
Open

return false if connection timeout #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion bondcpp/src/bond.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ bool Bond::waitUntilFormed(ros::WallDuration timeout)

condition_.timed_wait(mutex_, boost::posix_time::milliseconds(wait_time.toSec() * 1000.0f));
}
return sm_.getState().getId() != SM::WaitingForSister.getId();
return sm_.getState().getId() != SM::WaitingForSister.getId() && \
sm_.getState().getId() != SM::Dead.getId();
}

bool Bond::waitUntilBroken(ros::Duration timeout)
Expand Down
3 changes: 2 additions & 1 deletion bondpy/python/bondpy/bondpy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ def wait_until_formed(self, timeout=None):
if self.deadline:
wait_duration = min(wait_duration, self.deadline.left().to_sec())
self.condition.wait(wait_duration)
return self.sm.getState().getName() != 'SM.WaitingForSister'
return self.sm.getState().getName() != 'SM.WaitingForSister' and \
self.sm.getState().getName() != 'SM.Dead'

## \brief Blocks until the bond is broken for at most 'duration'.
#
Expand Down