Skip to content
GitLab
Menu
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-talos
Commits
66bf3885
Unverified
Commit
66bf3885
authored
Mar 04, 2019
by
Guilhem Saurel
Committed by
GitHub
Mar 04, 2019
Browse files
Merge pull request #3 from nim65s/topic/pinocchio_v2
Breaking: Pinocchio v2.0.0
parents
e5d7cac4
2cf8147d
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
66bf3885
...
...
@@ -40,7 +40,7 @@ SETUP_PROJECT()
# Search for dependencies.
ADD_REQUIRED_DEPENDENCY
(
"pinocchio"
)
ADD_REQUIRED_DEPENDENCY
(
"pinocchio
>= 2.0.0
"
)
ADD_REQUIRED_DEPENDENCY
(
"dynamic-graph >= 3.0.0"
)
ADD_REQUIRED_DEPENDENCY
(
"sot-core >= 3.0.0"
)
...
...
@@ -94,16 +94,16 @@ IF(TALOS_DATA_FOUND)
${
PROJECT_BINARY_DIR
}
/tests/
${
py_filename
}
.py
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/share/
${
PROJECT_NAME
}
/tests
)
)
ENDFOREACH
(
py_filename
)
# Install python files starting the application
FOREACH
(
py_filename test-simple-seq-play
)
INSTALL
(
FILES
${
PROJECT_SOURCE_DIR
}
/tests/
${
py_filename
}
.py
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/share/
${
PROJECT_NAME
}
/tests
)
)
ENDFOREACH
(
py_filename
)
ENDIF
(
PYRENE_MOTIONS_FOUND
)
...
...
src/dynamic_graph/sot/talos/talos.py
View file @
66bf3885
...
...
@@ -87,7 +87,8 @@ class Talos(AbstractHumanoidRobot):
from
pinocchio.robot_wrapper
import
RobotWrapper
import
pinocchio
as
se3
from
dynamic_graph.sot.dynamics_pinocchio
import
fromSotToPinocchio
pinocchioRobot
=
RobotWrapper
(
urdfPath
,
urdfDir
,
se3
.
JointModelFreeFlyer
())
pinocchioRobot
=
RobotWrapper
()
pinocchioRobot
.
initFromURDF
(
urdfPath
,
urdfDir
,
se3
.
JointModelFreeFlyer
())
self
.
pinocchioModel
=
pinocchioRobot
.
model
self
.
pinocchioData
=
pinocchioRobot
.
data
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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