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

Jump to bottom

Fix gazebo joint collision check bug #227

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix gazebo joint collision check bug #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90dde7f
fix(franka_gazebo): add gravity component to joint collision checking
rickstaa Feb 22, 2022
e0ffbf3
refactor: updates CHANGELOG.md
rickstaa Mar 18, 2022
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Requires `libfranka` >= 0.8.0
* `franka_description`: `<xacro:franka_robot/>` macro now supports to customize the `parent` frame and its `xyz` + `rpy` offset
* `franka_hw`: Fix the bug where the previous controller is still running after switching the controller. ([#326](https://github.com/frankaemika/franka_ros/issues/326))
* `franka_gazebo`: Add `set_franka_model_configuration` service.
* `franka_gazebo`: Fix joint collision checking by adding the gravity component to the total torque calculation.

## 0.10.1 - 2022-09-15

Expand Down
4 changes: 2 additions & 2 deletions franka_gazebo/src/joint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ double Joint::getLinkMass() const {
}

bool Joint::isInCollision() const {
rickstaa marked this conversation as resolved.
Show resolved Hide resolved
return std::abs(this->effort - this->command) > this->collision_threshold;
return std::abs(this->effort - this->command + this->gravity) > this->collision_threshold;
}

bool Joint::isInContact() const {
return std::abs(this->effort - this->command) > this->contact_threshold;
return std::abs(this->effort - this->command + this->gravity) > this->contact_threshold;
}

void Joint::setJointPosition(const double joint_position) {
Expand Down
Loading