Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
U
ur_simple_control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marko Guberina
ur_simple_control
Commits
7579fb01
Commit
7579fb01
authored
6 months ago
by
m-guberina
Browse files
Options
Downloads
Patches
Plain Diff
fixed heron on python3.13
parent
308da5be
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
python/smc/robots/implementations/heron.py
+4
-1
4 additions, 1 deletion
python/smc/robots/implementations/heron.py
python/smc/robots/implementations/ur5e.py
+5
-2
5 additions, 2 deletions
python/smc/robots/implementations/ur5e.py
with
9 additions
and
3 deletions
python/smc/robots/implementations/heron.py
+
4
−
1
View file @
7579fb01
...
...
@@ -283,7 +283,9 @@ class RealHeronRobotManager(AbstractHeronRobotManager, AbstractRealRobotManager)
def
heron_approximation
():
# arm + gripper
model_arm
,
collision_model_arm
,
visual_model_arm
,
_
=
get_model
()
model_arm
,
collision_model_arm
,
visual_model_arm
,
_
=
get_model
(
with_gripper_joints
=
True
)
# mobile base as planar joint (there's probably a better
# option but whatever right now)
...
...
@@ -297,6 +299,7 @@ def heron_approximation():
1
,
pin
.
SE3
.
Identity
(),
)
model
=
pin
.
buildReducedModel
(
model
,
[
8
,
9
],
np
.
zeros
(
model
.
nq
))
data
=
model
.
createData
()
# fix gripper
...
...
This diff is collapsed.
Click to expand it.
python/smc/robots/implementations/ur5e.py
+
5
−
2
View file @
7579fb01
...
...
@@ -178,7 +178,9 @@ class RealUR5eRobotManager(AbstractUR5eRobotManager, AbstractRealRobotManager):
self
.
_rtde_control
.
endFreedriveMode
()
def
get_model
()
->
tuple
[
pin
.
Model
,
pin
.
GeometryModel
,
pin
.
GeometryModel
,
pin
.
Data
]:
def
get_model
(
with_gripper_joints
=
False
,
)
->
tuple
[
pin
.
Model
,
pin
.
GeometryModel
,
pin
.
GeometryModel
,
pin
.
Data
]:
urdf_path_relative
=
files
(
"
smc.robots.robot_descriptions.urdf
"
).
joinpath
(
"
ur5e_with_robotiq_hande_FIXED_PATHS.urdf
"
...
...
@@ -259,6 +261,7 @@ def get_model() -> tuple[pin.Model, pin.GeometryModel, pin.GeometryModel, pin.Da
model
.
jointPlacements
[
5
]
=
wrist_2_se3
model
.
jointPlacements
[
6
]
=
wrist_3_se3
# TODO: fix where the fingers end up by setting a better position here (or maybe not here idk)
if
not
with_gripper_joints
:
model
=
pin
.
buildReducedModel
(
model
,
[
7
,
8
],
np
.
zeros
(
model
.
nq
))
data
=
pin
.
Data
(
model
)
...
...
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