Skip to content

Commit

Permalink
Merge pull request #357 from Utaro-M/jaxon-replace-hand-sensor
Browse files Browse the repository at this point in the history 
[jvrc_models/JAXON_JVRC] replace hand Leptrino force sensor
  • Loading branch information
@kindsenior
kindsenior committed Jun 17, 2022
2 parents b495c00 + 291017e commit af5dfcb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 33 deletions.
16 changes: 5 additions & 11 deletions jvrc_models/JAXON_JVRC/JAXON_JVRCmain.wrl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,11 +718,8 @@ DEF JAXON_JVRC Humanoid {
momentsOfInertia [0.020752 -1.298590e-06 8.029880e-06 -1.298590e-06 0.0198 0.000501 8.029880e-06 0.000501 0.013089]
children [
Inline { url "LARM_LINK7_JVRC.wrl" }
# DEF lhsensor ForceSensor{
# translation 0 0 -0.069
# rotation 0.382683 -0.92388 -0 3.14159
DEF lhsensor ForceSensor{ ## 2019/07 wacoh
translation 0 0 -0.09
DEF lhsensor ForceSensor{ ##2022/05 leptrino
translation 0 0 -0.076
rotation 0 1 0 3.14159
sensorId 3
} #Sensor
Expand Down Expand Up @@ -1056,12 +1053,9 @@ DEF JAXON_JVRC Humanoid {
momentsOfInertia [0.020752 1.298590e-06 -8.029880e-06 1.298590e-06 0.0198 -0.000501 -8.029880e-06 -0.000501 0.013089]
children [
Inline { url "RARM_LINK7_JVRC.wrl" }
# DEF rhsensor ForceSensor{
# translation 0 0 -0.069
# rotation -0.382683 -0.92388 -0 3.14159
DEF rhsensor ForceSensor{ ## 2019/07 wacoh
translation 0 0 -0.09
rotation 0 1 0 3.14159
DEF rhsensor ForceSensor{ ##2022/05 leptrino
translation 0 0 -0.076
rotation 1 0 0 3.14159
sensorId 2
} #Sensor
]
Expand Down
16 changes: 5 additions & 11 deletions jvrc_models/JAXON_JVRC/JAXON_JVRCmain_hrpsys.wrl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -718,11 +718,8 @@ DEF JAXON_JVRC Humanoid {
momentsOfInertia [0.020752 -1.298590e-06 8.029880e-06 -1.298590e-06 0.0198 0.000501 8.029880e-06 0.000501 0.013089]
children [
Inline { url "LARM_LINK7_JVRC.wrl" }
# DEF lhsensor ForceSensor{
# translation 0 0 -0.069
# rotation 0.382683 -0.92388 -0 3.14159
DEF lhsensor ForceSensor{ ## 2019/07 wacoh
translation 0 0 -0.09
DEF lhsensor ForceSensor{ ##2022/05 leptrino
translation 0 0 -0.076
rotation 0 1 0 3.14159
sensorId 3
} #Sensor
Expand Down Expand Up @@ -1057,12 +1054,9 @@ DEF JAXON_JVRC Humanoid {
momentsOfInertia [0.020752 1.298590e-06 -8.029880e-06 1.298590e-06 0.0198 -0.000501 -8.029880e-06 -0.000501 0.013089]
children [
Inline { url "RARM_LINK7_JVRC.wrl" }
# DEF rhsensor ForceSensor{
# translation 0 0 -0.069
# rotation -0.382683 -0.92388 -0 3.14159
DEF rhsensor ForceSensor{ ## 2019/07 wacoh
translation 0 0 -0.09
rotation 0 1 0 3.14159
DEF rhsensor ForceSensor{ ##2022/05 leptrino
translation 0 0 -0.076
rotation 1 0 0 3.14159
sensorId 2
} #Sensor
]
Expand Down
16 changes: 5 additions & 11 deletions jvrc_models/JAXON_JVRC/JAXON_JVRCmain_hrpsys_bush.wrl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,11 +795,8 @@ DEF JAXON_JVRC Humanoid {
# Inline { url "../models/checkerboard.wrl" }
# ]
#}
# DEF lhsensor ForceSensor{
# translation 0 0 -0.069
# rotation 0.382683 -0.92388 -0 3.14159
DEF lhsensor ForceSensor{ ## 2019/07 wacoh
translation 0 0 -0.09
DEF lhsensor ForceSensor{ ##2022/05 leptrino
translation 0 0 -0.076
rotation 0 1 0 3.14159
sensorId 3
} #Sensor
Expand Down Expand Up @@ -1172,12 +1169,9 @@ DEF JAXON_JVRC Humanoid {
# Inline { url "../models/checkerboard.wrl" }
# ]
#}
# DEF rhsensor ForceSensor{
# translation 0 0 -0.069
# rotation -0.382683 -0.92388 -0 3.14159
DEF rhsensor ForceSensor{ ## 2019/07 wacoh
translation 0 0 -0.09
rotation 0 1 0 3.14159
DEF rhsensor ForceSensor{ ##2022/05 leptrino
translation 0 0 -0.076
rotation 1 0 0 3.14159
sensorId 2
} #Sensor
]
Expand Down

0 comments on commit af5dfcb

Please sign in to comment.