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

Merge 6.9.2 to master (6.10.0) #1404

Merged
merged 1 commit into from
Aug 17, 2019
Merged

Merge 6.9.2 to master (6.10.0) #1404

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
2 changes: 1 addition & 1 deletion .ci/travis/docs_versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DART 6
v6.9.1
v6.9.2
v6.8.5
v6.7.3
v6.6.2
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
* Replaced M_PI with dart::math::constantsd::pi(): [#1367](https://github.com/dartsim/dart/pull/1367)
* Enabled octomap support on macOS: [#1078](https://github.com/dartsim/dart/pull/1078)

### [DART 6.9.2 (2019-08-16)](https://github.com/dartsim/dart/milestone/60?closed=1)

* Dynamics

* Allowed constraint force mixing > 1: [#1371](https://github.com/dartsim/dart/pull/1371)

### [DART 6.9.1 (2019-06-06)](https://github.com/dartsim/dart/milestone/59?closed=1)

* Collision
Expand Down
7 changes: 0 additions & 7 deletions dart/constraint/ContactConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,6 @@ void ContactConstraint::setConstraintForceMixing(double cfm)
<< "It is set to 1e-9." << std::endl;
mConstraintForceMixing = 1e-9;
}
if (cfm > 1.0)
{
dtwarn << "Constraint force mixing parameter[" << cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0." << std::endl;
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = cfm;
}
Expand Down
7 changes: 0 additions & 7 deletions dart/constraint/JointConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,6 @@ void JointConstraint::setConstraintForceMixing(double _cfm)
<< "It is set to 1e-9." << std::endl;
mConstraintForceMixing = 1e-9;
}
if (_cfm > 1.0)
{
dtwarn << "Constraint force mixing parameter[" << _cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0." << std::endl;
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = _cfm;
}
Expand Down
7 changes: 0 additions & 7 deletions dart/constraint/JointCoulombFrictionConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,6 @@ void JointCoulombFrictionConstraint::setConstraintForceMixing(double _cfm)
<< "It is set to 1e-9." << std::endl;
mConstraintForceMixing = 1e-9;
}
if (_cfm > 1.0)
{
dtwarn << "Constraint force mixing parameter[" << _cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0." << std::endl;
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = _cfm;
}
Expand Down
7 changes: 0 additions & 7 deletions dart/constraint/JointLimitConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,6 @@ void JointLimitConstraint::setConstraintForceMixing(double _cfm)
<< "It is set to 1e-9." << std::endl;
mConstraintForceMixing = 1e-9;
}
if (_cfm > 1.0)
{
dtwarn << "Constraint force mixing parameter[" << _cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0." << std::endl;
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = _cfm;
}
Expand Down
8 changes: 0 additions & 8 deletions dart/constraint/MimicMotorConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,6 @@ void MimicMotorConstraint::setConstraintForceMixing(double cfm)
<< "It is set to 1e-9.\n";
mConstraintForceMixing = 1e-9;
}
if (cfm > 1.0)
{
dtwarn << "[MimicMotorConstraint::setConstraintForceMixing] "
<< "Constraint force mixing parameter[" << cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0.\n";
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = cfm;
}
Expand Down
8 changes: 0 additions & 8 deletions dart/constraint/ServoMotorConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@ void ServoMotorConstraint::setConstraintForceMixing(double cfm)
<< "It is set to 1e-9." << std::endl;
mConstraintForceMixing = 1e-9;
}
if (cfm > 1.0)
{
dtwarn << "[ServoMotorConstraint::setConstraintForceMixing] "
<< "Constraint force mixing parameter[" << cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0." << std::endl;
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = cfm;
}
Expand Down
7 changes: 0 additions & 7 deletions dart/constraint/SoftContactConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,6 @@ void SoftContactConstraint::setConstraintForceMixing(double _cfm)
<< "It is set to 1e-9." << std::endl;
mConstraintForceMixing = 1e-9;
}
if (_cfm > 1.0)
{
dtwarn << "Constraint force mixing parameter[" << _cfm
<< "] is greater than 1.0. "
<< "It is set to 1.0." << std::endl;
mConstraintForceMixing = 1.0;
}

mConstraintForceMixing = _cfm;
}
Expand Down