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
048595e4
Commit
048595e4
authored
8 years ago
by
Rohan Budhiraja
Browse files
Options
Downloads
Patches
Plain Diff
[wip/sot-romeo-v3] Update for pinocchio >=1.2.0
parent
0c2495ea
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-romeo-v3/Makefile
+1
-1
1 addition, 1 deletion
sot-romeo-v3/Makefile
sot-romeo-v3/distinfo
+1
-0
1 addition, 0 deletions
sot-romeo-v3/distinfo
sot-romeo-v3/patches/patch-ad
+51
-0
51 additions, 0 deletions
sot-romeo-v3/patches/patch-ad
with
53 additions
and
1 deletion
sot-romeo-v3/Makefile
+
1
−
1
View file @
048595e4
...
...
@@ -6,7 +6,7 @@
VERSION
=
2.0.0
DISTNAME
=
sot-romeo-v3-
${
VERSION
}
PKGNAME
=
sot-romeo-v3-
${
VERSION
}
PKGREVISION
=
1
PKGREVISION
=
2
CATEGORIES
=
wip
MASTER_SITES
=
${
MASTER_SITE_OPENROBOTS:
=
sot-romeo-v3/
}
...
...
This diff is collapsed.
Click to expand it.
sot-romeo-v3/distinfo
+
1
−
0
View file @
048595e4
...
...
@@ -4,3 +4,4 @@ Size (sot-romeo-v3-2.0.0.tar.gz) = 105021 bytes
SHA1 (patch-aa) = 0319ccbe6c1622c7708972f6fa4fde3e9361002c
SHA1 (patch-ab) = f9980b73a906658126092a370fe79eb41f08dbb4
SHA1 (patch-ac) = 655321720aa1e96b8d24f515ecd4b60233061802
SHA1 (patch-ad) = 839d787b1ffb62cdba5a6620dda07c3cedd0e9fb
This diff is collapsed.
Click to expand it.
sot-romeo-v3/patches/patch-ad
0 → 100644
+
51
−
0
View file @
048595e4
diff --git src/CMakeLists.txt src/CMakeLists.txt
index db40b6f..dc75a50 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -39,7 +39,7 @@
FUNCTION(COMPILE_PLUGIN NAME SOURCES ENTITIES)
ENDFUNCTION()
# Compile plug-ins.
-COMPILE_PLUGIN(dynamic-romeo dynamic-romeo.cpp DynamicRomeo)
+# COMPILE_PLUGIN(dynamic-romeo dynamic-romeo.cpp DynamicRomeo)
##
diff --git src/dynamic-romeo.cpp src/dynamic-romeo.cpp
index 9d9daa8..b419cfd 100644
--- src/dynamic-romeo.cpp
+++ src/dynamic-romeo.cpp
@@ -35,7 +35,6 @@
namespace dynamicgraph
: Dynamic (name)
{
sotDEBUGIN(15);
- DynamicRomeo::createRobot();
sotDEBUGOUT(15);
}
diff --git src/dynamic_graph/sot/romeo/robot.py src/dynamic_graph/sot/romeo/robot.py
index e9ea89f..9fce636 100644
--- src/dynamic_graph/sot/romeo/robot.py
+++ src/dynamic_graph/sot/romeo/robot.py
@@ -16,7 +16,7 @@
from dynamic_graph.sot.dynamics.humanoid_robot import AbstractHumanoidRobot
from dynamic_graph.ros import RosRobotModel
-
+import pinocchio as se3
from rospkg import RosPack
# Sot model for the romeo_small.urdf (with gripper, no fingers)
@@ -204,6 +204,12 @@
class Robot (AbstractHumanoidRobot):
self.dynamic = RosRobotModel("{0}_dynamic".format(name))
for i in self.jointMap:
self.dynamic.addJointMapping(i, self.jointMap[i])
+
+ self.pinocchioModel = se3.buildModelFromUrdf(self.urdfDir + self.urdfName,
+ se3.JointModelFreeFlyer())
+ self.pinocchioData = self.pinocchioModel.createData()
+ self.dynamic.setModel(self.pinocchioModel)
+ self.dynamic.setData(self.pinocchioData)
self.dynamic.loadUrdf(self.urdfDir + self.urdfName)
# complete feet position (TODO: move it into srdf file)
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