Skip to content

Commit

Permalink
fix: Unexpected long delay when calling error recovery (#317)
Browse files Browse the repository at this point in the history
Locking of mutex in the busy loop causes long delay when calling error
recovery because executing error recovery requires the same mutex.
  • Loading branch information
Maverobot committed Apr 21, 2023
1 parent 7a4fcdb commit cf53956
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Requires `libfranka` >= 0.8.0
* `franka_gazebo`: Offer both `panda.launch` and `fr3.launch`.
* `franka_gazebo`: Fix velocity control by adding the missing effort.
* `franka_control`: Clear the error flag if the robot is in `kIdle` mode, i.e. ready to move.
* `franka_control`: Fix unexpected long delay when calling error recovery ([#317](https://github.com/frankaemika/franka_ros/issues/317))
* Fix a possible compilation error by sorting include directories by topological order ([#319](https://github.com/frankaemika/franka_ros/issues/319)).
* `franka_control`: Fix a bug where `error_recovery` actions recover future errors ([#316](https://github.com/frankaemika/franka_ros/issues/316)).

Expand Down
1 change: 1 addition & 0 deletions franka_control/src/franka_control_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ int main(int argc, char** argv) {
}
} catch (const std::logic_error& e) {
}
std::this_thread::yield();
} else {
std::this_thread::sleep_for(1ms);
}
Expand Down

0 comments on commit cf53956

Please sign in to comment.