Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
00a64add
Commit
00a64add
authored
7 years ago
by
Rohan Budhiraja
Browse files
Options
Downloads
Patches
Plain Diff
[wip/sot-dynamic-pinocchio-v3][PATCH] fix getFrameJacobian
parent
02f52e3d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
sot-dynamic-pinocchio-v3/Makefile
+1
-2
1 addition, 2 deletions
sot-dynamic-pinocchio-v3/Makefile
sot-dynamic-pinocchio-v3/distinfo
+1
-0
1 addition, 0 deletions
sot-dynamic-pinocchio-v3/distinfo
sot-dynamic-pinocchio-v3/patches/patch-ab
+32
-0
32 additions, 0 deletions
sot-dynamic-pinocchio-v3/patches/patch-ab
with
34 additions
and
2 deletions
sot-dynamic-pinocchio-v3/Makefile
+
1
−
2
View file @
00a64add
...
...
@@ -5,7 +5,7 @@
VERSION
=
3.1.6
PKGNAME
=
sot-dynamic-pinocchio-v3-
${
VERSION
}
DISTNAME
=
sot-dynamic-pinocchio-v3-
${
VERSION
}
PKGREVISION
=
1
PKGREVISION
=
2
MASTER_SITES
=
${
MASTER_SITE_OPENROBOTS:
=
sot-dynamic-pinocchio-v3/
}
MASTER_REPOSITORY
=
${
MASTER_REPOSITORY_GITHUB
}
stack-of-tasks/sot-dynamic-pinocchio/
...
...
@@ -16,7 +16,6 @@ MAINTAINER= gepetto@laas.fr
CATEGORIES
=
wip
LICENSE
=
gnu-lgpl-v3
COMMENT
=
Create entities to compute a robot dynamics properties using pinocchio
PKGREVISION
=
1
# parallel builds would consume all memory because of the g++ process size
...
...
This diff is collapsed.
Click to expand it.
sot-dynamic-pinocchio-v3/distinfo
+
1
−
0
View file @
00a64add
...
...
@@ -2,3 +2,4 @@ SHA1 (sot-dynamic-pinocchio-v3-3.1.6.tar.gz) = a58a44cfae8f134f46518d44e841ff891
RMD160 (sot-dynamic-pinocchio-v3-3.1.6.tar.gz) = c3f6f311bf39d04bfcc398be17a2f9f974007ab1
Size (sot-dynamic-pinocchio-v3-3.1.6.tar.gz) = 938662 bytes
SHA1 (patch-aa) = f95e1c092c6e3e4cb06e809adb87728948ea3120
SHA1 (patch-ab) = a566e552df7201a08730907b8b7a66603585053b
This diff is collapsed.
Click to expand it.
sot-dynamic-pinocchio-v3/patches/patch-ab
0 → 100644
+
32
−
0
View file @
00a64add
diff --git src/sot-dynamic-pinocchio.cpp src/sot-dynamic-pinocchio.cpp
index 123580d..b968699 100644
--- src/sot-dynamic-pinocchio.cpp
+++ src/sot-dynamic-pinocchio.cpp
@@ -745,8 +745,8 @@
computeGenericJacobian(const bool isFrame, const int jointId, dg::Matrix& res,co
//Computes Jacobian in world coordinates.
if(isFrame){
- se3::framesForwardKinematics(*m_model,*m_data);
- se3::getFrameJacobian(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
+ se3::getJacobian<se3::WORLD>(*m_model,*m_data,
+ m_model->frames[(se3::Model::Index)jointId].parent,tmp);
}
else
se3::getJacobian<se3::WORLD>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
@@ -768,6 +768,7 @@
computeGenericEndeffJacobian(const bool isFrame, const int jointId,dg::Matrix& r
//TODO: Find a way to remove tmp object
se3::Data::Matrix6x tmp = Eigen::MatrixXd::Zero(6,m_model->nv);
//std::string temp;
+ //Computes Jacobian in end-eff coordinates.
if(isFrame){
se3::framesForwardKinematics(*m_model,*m_data);
se3::getFrameJacobian(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
@@ -777,7 +778,7 @@
computeGenericEndeffJacobian(const bool isFrame, const int jointId,dg::Matrix& r
}
else {
//temp = m_model->getJointName((se3::Model::Index)jointId);
- se3::getJacobian<se3::WORLD>
+ se3::getJacobian<se3::LOCAL>
(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
sotDEBUG(25) << "EndEffJacobian for "
<< m_model->getJointName((se3::Model::Index)jointId)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment