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
73df7bd6
Commit
73df7bd6
authored
7 years ago
by
Angel Santamaria-Navarro
Browse files
Options
Downloads
Patches
Plain Diff
cosmetics
parent
115259d3
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
FindKDL.cmake
+1
-1
1 addition, 1 deletion
FindKDL.cmake
src/common_obj.h
+2
-2
2 additions, 2 deletions
src/common_obj.h
src/uam_task_ctrl.cpp
+0
-5
0 additions, 5 deletions
src/uam_task_ctrl.cpp
src/uam_task_ctrl.h
+0
-2
0 additions, 2 deletions
src/uam_task_ctrl.h
with
3 additions
and
10 deletions
FindKDL.cmake
+
1
−
1
View file @
73df7bd6
...
...
@@ -2,7 +2,7 @@
MESSAGE
(
STATUS
"Detecting KDL: using orocos_kdl-config.cmake to locate files."
)
FIND_PATH
(
KDL_DIR orocos_kdl-config.cmake /usr/local/share/orocos_kdl
/cmake
)
FIND_PATH
(
KDL_DIR orocos_kdl-config.cmake /usr/local/share/orocos_kdl
)
INCLUDE
(
${
KDL_DIR
}
/orocos_kdl-config.cmake
)
...
...
This diff is collapsed.
Click to expand it.
src/common_obj.h
+
2
−
2
View file @
73df7bd6
...
...
@@ -52,7 +52,7 @@ class CArm{
unsigned
int
nj
;
// number of joints.
std
::
vector
<
CArmJoint
>
joint_info
;
// joints info.
Eigen
::
MatrixXd
jnt_pos
;
// Joint value.
boost
::
s
har
ed_ptr
<
KDL
::
ChainFkSolverPos_recursive
>
jnt_to_pose_solver
;
// chain solver.
boost
::
s
cop
ed_ptr
<
KDL
::
ChainFkSolverPos_recursive
>
jnt_to_pose_solver
;
// chain solver.
boost
::
scoped_ptr
<
KDL
::
ChainJntToJacSolver
>
jnt_to_jac_solver
;
// chain solver.
KDL
::
JntArray
jnt_pos_kdl
;
// Array of arm positions.
KDL
::
Jacobian
jacobian
;
// Jacobian.
...
...
@@ -151,4 +151,4 @@ class TaskJac{
}
// End of UAM namespace
#endif
\ No newline at end of file
#endif
This diff is collapsed.
Click to expand it.
src/uam_task_ctrl.cpp
+
0
−
5
View file @
73df7bd6
...
...
@@ -20,11 +20,6 @@ CHierarchTaskPCtrl::~CHierarchTaskPCtrl()
{
}
void
CHierarchTaskPCtrl
::
kktest
(
std
::
string
&
data
)
{
std
::
cout
<<
data
<<
std
::
endl
;
}
// Main public function
void
CHierarchTaskPCtrl
::
htpc
(
const
MatrixXd
&
quad_dist_obs
,
const
goal_obj
&
goal
,
...
...
This diff is collapsed.
Click to expand it.
src/uam_task_ctrl.h
+
0
−
2
View file @
73df7bd6
...
...
@@ -92,8 +92,6 @@ class CHierarchTaskPCtrl
UAM
::
CCtrlParams
&
CtrlParams
,
MatrixXd
&
robot_pos
,
MatrixXd
&
robot_vel
);
void
kktest
(
std
::
string
&
data
);
};
#endif
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