Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
uam_task_ctrl
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
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Pep Martí Saumell
uam_task_ctrl
Commits
65441a48
Commit
65441a48
authored
8 years ago
by
roberto rossi
Browse files
Options
Downloads
Patches
Plain Diff
Corrected matrix JACEEPOS, from robot arm to translation
parent
88b136dd
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/tasks/eepos.cpp
+7
-5
7 additions, 5 deletions
src/tasks/eepos.cpp
with
7 additions
and
5 deletions
src/tasks/eepos.cpp
+
7
−
5
View file @
65441a48
...
...
@@ -111,8 +111,9 @@ void CTaskEEPOS::TaskErrorJac(const UAM::CHT& HT, UAM::CArm& arm, const Eigen::M
// Task Error ________________________________________________
// End-Effector Position Error
sigmaEEPOS
.
block
(
0
,
0
,
3
,
1
)
=
eepos_des
.
block
(
0
,
0
,
3
,
1
)
-
HT
.
cam_in_w
.
block
(
0
,
3
,
3
,
1
);
// End-Effector Orientation Error
sigmaEEPOS
.
block
(
3
,
0
,
3
,
1
)
=
eepos_des
.
block
(
3
,
0
,
3
,
1
)
-
RToEulerContinuous
(
HT
.
cam_in_w
.
block
(
0
,
0
,
3
,
3
),
eepos_des
.
block
(
3
,
0
,
3
,
1
));
...
...
@@ -151,8 +152,9 @@ void CTaskEEPOS::TaskErrorJac(const UAM::CHT& HT, UAM::CArm& arm, const Eigen::M
Eigen
::
MatrixXd
RRb_in_w
=
Eigen
::
MatrixXd
::
Zero
(
6
,
6
);
Eigen
::
Matrix3d
Rarmb_in_b
=
HT
.
armbase_in_baselink
.
block
(
0
,
0
,
3
,
3
);
Eigen
::
Matrix3d
Rl1_in_armb
=
HT
.
link1_in_armbase
.
block
(
0
,
0
,
3
,
3
);
RRb_in_w
.
block
(
0
,
0
,
3
,
3
)
=
Rb_in_w
*
Rarmb_in_b
*
Rl1_in_armb
;
RRb_in_w
.
block
(
3
,
3
,
3
,
3
)
=
RRb_in_w
.
block
(
0
,
0
,
3
,
3
);
RRb_in_w
.
block
(
0
,
0
,
3
,
3
)
=
Rb_in_w
;
RRb_in_w
.
block
(
3
,
3
,
3
,
3
)
=
Rb_in_w
*
Rarmb_in_b
*
Rl1_in_armb
;
JEEPOS_omw
.
block
(
0
,
6
,
6
,
arm
.
nj
)
=
RRb_in_w
*
ArmJac
;
Eigen
::
MatrixXd
omega2euldiff_in_w
=
Eigen
::
MatrixXd
::
Zero
(
6
,
6
);
...
...
@@ -163,8 +165,8 @@ void CTaskEEPOS::TaskErrorJac(const UAM::CHT& HT, UAM::CArm& arm, const Eigen::M
JEEPOS
.
block
(
0
,
6
,
6
,
arm
.
nj
)
=
omega2euldiff_in_w
*
JEEPOS_omw
.
block
(
0
,
6
,
6
,
arm
.
nj
);
// task jacobian pseudo inverse
JEEPOS_pseudo
=
UAM
::
CCommon_Fc
::
WeightInvJac
(
JEEPOS
,
vs_delta_gain
,
vs_alpha_min
,
sigmaEEPOS
.
block
(
0
,
0
,
3
,
1
).
norm
());
//
JEEPOS_pseudo = UAM::CCommon_Fc::WeightInvJac(JEEPOS,vs_delta_gain,vs_alpha_min,sigmaEEPOS.block(0,0,3,1).norm());
JEEPOS_pseudo
=
JEEPOS
.
transpose
();
// Return reduced Jacobians (without roll and pitch columns)
JEEPOS_reduced
=
Eigen
::
MatrixXd
::
Zero
(
6
,
4
+
arm
.
nj
);
JEEPOS_reduced
.
block
(
0
,
0
,
6
,
3
)
=
JEEPOS
.
block
(
0
,
0
,
6
,
3
);
...
...
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