Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
sot-torque-control
Commits
88979495
Unverified
Commit
88979495
authored
Jan 16, 2018
by
thomasfla
Committed by
GitHub
Jan 16, 2018
Browse files
Merge pull request #42 from cmastalli/devel
Removed metapod dependency
parents
e81344ae
72fc5319
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
88979495
...
...
@@ -23,7 +23,7 @@ INCLUDE(cmake/eigen.cmake)
INCLUDE
(
cmake/python.cmake
)
SET
(
PROJECT_NAME sot-torque-control
)
SET
(
PROJECT_DESCRIPTION
"Collection of dynamic-graph entities aim
ing
at
the
implement
ation of
torque control on
HRP-2
."
)
SET
(
PROJECT_DESCRIPTION
"Collection of dynamic-graph entities aim
ed
at implement
ing
torque control on
different robots
."
)
SET
(
PROJECT_URL
"https://github.com/stack-of-tasks/sot-torque-control"
)
SET
(
CUSTOM_HEADER_DIR
"sot/torque-control"
)
...
...
README.md
View file @
88979495
...
...
@@ -10,7 +10,6 @@ This project depends on:
*
dynamic-graph-python >= 3.0.0
*
sot-core >= 3.0.0
*
pinocchio >= 1.2
*
metapod
*
[
PinInvDyn
](
https://github.com/stack-of-tasks/invdyn
)
*
[
parametric-curves
](
https://github.com/stack-of-tasks/parametric-curves
)
...
...
include/sot/torque_control/force-torque-estimator.hh
deleted
100644 → 0
View file @
e81344ae
This diff is collapsed.
Click to expand it.
include/sot/torque_control/free-flyer-locator.hh
View file @
88979495
...
...
@@ -45,15 +45,6 @@
#include
<initializer_list>
#include
"boost/assign.hpp"
/* Metapod */
//~ #include <metapod/models/hrp2_14/hrp2_14.hh>
//~ #include <metapod/algos/rnea.hh>
//~ #include <metapod/algos/jac.hh>
//~ #include <metapod/tools/jcalc.hh>
//~ #include <metapod/tools/bcalc.hh>
//~ #include <metapod/tools/print.hh>
//~ #include <metapod/tools/initconf.hh>
/* Pinocchio */
#include
<pinocchio/multibody/model.hpp>
#include
<pinocchio/parsers/urdf.hpp>
...
...
src/admittance-controller.cpp
View file @
88979495
...
...
@@ -19,7 +19,6 @@
#include
<dynamic-graph/factory.h>
#include
<sot/torque_control/commands-helper.hh>
#include
<sot/torque_control/utils/metapod-helper.hh>
#include
<tsid/utils/stop-watch.hpp>
namespace
dynamicgraph
...
...
src/position-controller.cpp
View file @
88979495
...
...
@@ -19,7 +19,6 @@
#include
<dynamic-graph/factory.h>
#include
<sot/torque_control/commands-helper.hh>
//#include <sot/torque_control/utils/metapod-helper.hh>
#include
<sot/torque_control/utils/stop-watch.hh>
namespace
dynamicgraph
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment