Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
impedance_controller
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
IPK_AUT
Converging
impedance_controller
Commits
cddfcba7
Commit
cddfcba7
authored
2 months ago
by
jeo65286
Browse files
Options
Downloads
Patches
Plain Diff
Edit mjcf files: change sites
parent
074cf202
No related branches found
Branches containing commit
No related tags found
1 merge request
!2
Resolve "Simulator implementation"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
model/fr3_hand.xml
+4
-4
4 additions, 4 deletions
model/fr3_hand.xml
model/scene.xml
+9
-9
9 additions, 9 deletions
model/scene.xml
src/main.cc
+1
-1
1 addition, 1 deletion
src/main.cc
with
14 additions
and
14 deletions
model/fr3_hand.xml
+
4
−
4
View file @
cddfcba7
...
@@ -167,19 +167,19 @@
...
@@ -167,19 +167,19 @@
<geom
mesh=
"link7_2"
material=
"white"
class=
"visual"
/>
<geom
mesh=
"link7_2"
material=
"white"
class=
"visual"
/>
<geom
mesh=
"link7_3"
material=
"black"
class=
"visual"
/>
<geom
mesh=
"link7_3"
material=
"black"
class=
"visual"
/>
<geom
name=
"fr3_link7_collision"
class=
"collision"
mesh=
"link7_coll"
/>
<geom
name=
"fr3_link7_collision"
class=
"collision"
mesh=
"link7_coll"
/>
<site
name=
"joint7_site"
pos=
"0 0 0"
size=
"0.03"
rgba=
"0 0.9 0.9 0.5"
/>
<!--
<site name="joint7_site" pos="0 0 0" size="0.03" rgba="0 0.9 0.9 0.5"/>
-->
<site
name=
"
attachment
_site"
pos=
"0 0 0.107"
size=
"0.03"
rgba=
"0.9 0
.9
0 0.5"
/>
<site
name=
"
flange
_site"
pos=
"0 0 0.107"
size=
"0.03"
rgba=
"0.9 0 0 0.5"
/>
<!-- Add Hand & Finger Body -->
<!-- Add Hand & Finger Body -->
<!-- <body name="hand" pos="0 0 0.107" quat="0.9238795 0 0 -0.3826834"> -->
<body
name=
"hand"
pos=
"0 0 0.107"
quat=
"0.9238795 0 0 -0.3826834"
>
<body
name=
"hand"
pos=
"0 0 0.107"
quat=
"0.9238795 0 0 -0.3826834"
>
<inertial
mass=
"0.73"
pos=
"-0.01 0 0.03"
diaginertia=
"0.001 0.0025 0.0017"
/>
<inertial
mass=
"0.73"
pos=
"-0.01 0 0.03"
diaginertia=
"0.001 0.0025 0.0017"
/>
<site
name =
"hand_site"
type=
"sphere"
pos=
"-0.01 0 0.03"
size=
"0.03"
rgba=
"0 0.9 0 1.0"
/>
<site
name =
"tcp_site"
type=
"sphere"
pos=
"0 0 0.1034"
size=
"0.03"
rgba=
"0 0 0.9 0.5"
/>
<geom
mesh=
"hand_0"
material=
"off_white"
class=
"visual"
/>
<geom
mesh=
"hand_0"
material=
"off_white"
class=
"visual"
/>
<geom
mesh=
"hand_1"
material=
"black"
class=
"visual"
/>
<geom
mesh=
"hand_1"
material=
"black"
class=
"visual"
/>
<geom
mesh=
"hand_2"
material=
"black"
class=
"visual"
/>
<geom
mesh=
"hand_2"
material=
"black"
class=
"visual"
/>
<geom
mesh=
"hand_3"
material=
"white"
class=
"visual"
/>
<geom
mesh=
"hand_3"
material=
"white"
class=
"visual"
/>
<geom
mesh=
"hand_4"
material=
"off_white"
class=
"visual"
/>
<geom
mesh=
"hand_4"
material=
"off_white"
class=
"visual"
/>
<geom
mesh=
"hand_c"
class=
"collision"
/>
<geom
mesh=
"hand_c"
class=
"collision"
/>
<site
name =
"end_effector"
type=
"sphere"
pos=
"0 0 0.1"
size=
"0.03"
rgba=
"0.9 0 0.9 0.5"
/>
<body
name=
"left_finger"
pos=
"0 0 0.0584"
>
<body
name=
"left_finger"
pos=
"0 0 0.0584"
>
<inertial
mass=
"0.015"
pos=
"0 0 0"
diaginertia=
"2.375e-6 2.375e-6 7.5e-7"
/>
<inertial
mass=
"0.015"
pos=
"0 0 0"
diaginertia=
"2.375e-6 2.375e-6 7.5e-7"
/>
<joint
name=
"finger_joint1"
class=
"finger"
/>
<joint
name=
"finger_joint1"
class=
"finger"
/>
...
...
This diff is collapsed.
Click to expand it.
model/scene.xml
+
9
−
9
View file @
cddfcba7
...
@@ -38,14 +38,14 @@
...
@@ -38,14 +38,14 @@
<jointvel
name=
"joint6_vel"
joint=
"fr3_joint6"
noise=
"50e-9"
/>
<jointvel
name=
"joint6_vel"
joint=
"fr3_joint6"
noise=
"50e-9"
/>
<jointvel
name=
"joint7_vel"
joint=
"fr3_joint7"
noise=
"50e-9"
/>
<jointvel
name=
"joint7_vel"
joint=
"fr3_joint7"
noise=
"50e-9"
/>
<framepos
name=
"ee_pos"
objtype=
"site"
objname=
"
attachment
_site"
/>
<!-- 14, 15, 16 -->
<framepos
name=
"ee_pos"
objtype=
"site"
objname=
"
tcp
_site"
/>
<!-- 14, 15, 16 -->
<framequat
name=
"ee_quat"
objtype=
"site"
objname=
"
attachment
_site"
/>
<!-- 17, 18, 19, 20 -->
<framequat
name=
"ee_quat"
objtype=
"site"
objname=
"
tcp
_site"
/>
<!-- 17, 18, 19, 20 -->
<framelinvel
name=
"ee_linvel"
objtype=
"site"
objname=
"
attachment
_site"
/>
<!-- 21, 22, 23 -->
<framelinvel
name=
"ee_linvel"
objtype=
"site"
objname=
"
tcp
_site"
/>
<!-- 21, 22, 23 -->
<frameangvel
name=
"ee_angvel"
objtype=
"site"
objname=
"
attachment
_site"
/>
<!-- 24, 25, 26 -->
<frameangvel
name=
"ee_angvel"
objtype=
"site"
objname=
"
tcp
_site"
/>
<!-- 24, 25, 26 -->
<framelinacc
name=
"ee_linacc"
objtype=
"site"
objname=
"
attachment
_site"
/>
<!-- 27, 28, 29 -->
<framelinacc
name=
"ee_linacc"
objtype=
"site"
objname=
"
tcp
_site"
/>
<!-- 27, 28, 29 -->
<frameangacc
name=
"ee_angacc"
objtype=
"site"
objname=
"
attachment
_site"
/>
<!-- 30, 31, 32 -->
<frameangacc
name=
"ee_angacc"
objtype=
"site"
objname=
"
tcp
_site"
/>
<!-- 30, 31, 32 -->
<force
site=
"
e
nd_
effector
"
name=
"
ee
_force"
noise=
"0"
/>
<!-- 33,34,35 -->
<force
site=
"
ha
nd_
site
"
name=
"
hand
_force"
noise=
"0"
/>
<!-- 33,34,35 -->
<torque
site=
"
e
nd_
effector
"
name=
"
ee
_torque"
noise=
"0"
/>
<!-- 36,37,38 -->
<torque
site=
"
ha
nd_
site
"
name=
"
hand
_torque"
noise=
"0"
/>
<!-- 36,37,38 -->
</sensor>
</sensor>
</mujoco>
</mujoco>
This diff is collapsed.
Click to expand it.
src/main.cc
+
1
−
1
View file @
cddfcba7
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
#include
"ros1_mujoco_interface.hpp"
#include
"ros1_mujoco_interface.hpp"
std
::
shared_ptr
<
MuJoCoRosOneInterface
::
MuJoCoControlCommand
>
joint_cmd_ptr
;
std
::
shared_ptr
<
MuJoCoRosOneInterface
::
MuJoCoControlCommand
>
joint_cmd_ptr
;
std
::
shared_ptr
<
MuJoCoRosOneInterface
::
MuJoCoGuiCommand
>
gui_cmd_ptr
;
std
::
shared_ptr
<
MuJoCoRosOneInterface
::
MuJoCoGuiCommand
>
gui_cmd_ptr
;
bool
is_perturb_on
=
tru
e
;
bool
is_perturb_on
=
fals
e
;
#define MUJOCO_PLUGIN_DIR "mujoco_plugin"
#define MUJOCO_PLUGIN_DIR "mujoco_plugin"
...
...
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