Skip to content

Commit

Permalink
ambassador meeting changes
Browse files Browse the repository at this point in the history
- for reference launch files: table_dimensions reduced in z because of flipped z-axis #15
- changed models / kinematics for current setup
  • Loading branch information
simonflueckiger committed Mar 8, 2019
1 parent 8bec562 commit ba417ad
Show file tree
Hide file tree
Showing 5 changed files with 227 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<node name="feasibility_check" pkg="tub_feasibility_check" type="tub_feasibility_check" output="screen">
<param name="ifco_scene_graph_file" value="$(find tub_feasibility_check)/model/rlsg/prob-rbohand2-ifco.convex.xml" />
<param name="tabletop_scene_graph_file" value="$(find tub_feasibility_check)/model/rlsg/prob-pisaiit-tabletop.convex.xml" />
<param name="kinematics_file" value="$(find tub_feasibility_check)/model/rlkin/prob-rbohand2.xml"/>
<param name="kinematics_file" value="$(find tub_feasibility_check)/model/rlkin/prob-pisaiit.xml"/>
<param name="hide_window" type="bool" value="false" />
</node>
</launch>
Expand Down
16 changes: 16 additions & 0 deletions launch/disney_feasibility_check_reference_PisaIIT.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<launch>
<rosparam param="/feasibility_check/sample_count">200</rosparam>
<!--<rosparam param="/feasibility_check/table_dimensions">[0.3, 0.3, 0.181]</rosparam>-->
<!-- TODO: table_dimensions reduced in z because of flipped z-axis https://github.com/SoMa-Project/tub_feasibility_check/issues/15 -->
<!-- TODO: table_dimensions reduced in x and y to give the feasibility checker a higher chance of not colliding with the table -->
<rosparam param="/feasibility_check/table_dimensions">[0.2, 0.2, 0.001]</rosparam>
<node name="feasibility_check" pkg="tub_feasibility_check" type="tub_feasibility_check" output="screen">
<param name="ifco_scene_graph_file" value="$(find tub_feasibility_check)/model/rlsg/prob-rbohand2-ifco.convex.xml" />
<param name="tabletop_scene_graph_file" value="$(find tub_feasibility_check)/model/rlsg/prob-pisaiit-tabletop.convex.xml" />
<param name="kinematics_file" value="$(find tub_feasibility_check)/model/rlkin/prob-pisaiit.xml"/>
<param name="hide_window" type="bool" value="false" />
</node>
</launch>


174 changes: 174 additions & 0 deletions model/rlkin/prob-pisaiit.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
<?xml version="1.0" encoding="UTF-8"?>
<rlkin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="rlkin.xsd">
<kinematics>
<manufacturer>F and P</manufacturer>
<name>Prob2 + RBOHand2</name>
<world id="world">
<rotation>
<x>0</x>
<y>0</y>
<z>0</z>
</rotation>
<translation>
<x>0</x>
<y>0</y>
<z>0</z>
</translation>
</world>
<transform id="base">
<frame>
<a idref="world"/>
<b idref="link0"/>
</frame>
<rotation>
<x>0</x>
<y>0</y>
<z>0</z>
</rotation>
<translation>
<x>0</x>
<y>0</y>
<z>0</z>
</translation>
</transform>

<link id="link0">
<ignore/>
<ignore idref="link1"/>
</link>

<revolute id="joint0">
<frame>
<a idref="link0"/>
<b idref="link1"/>
</frame>
<dh>
<d>0.3625</d>
<theta>0</theta>
<a>0</a>
<alpha>-90</alpha>
</dh>
<max>169</max>
<min>-169</min>
</revolute>

<link id="link1">
<ignore idref="link0"/>
<ignore idref="link2"/>
</link>

<revolute id="joint1">
<frame>
<a idref="link1"/>
<b idref="link2"/>
</frame>
<dh>
<d>0.0</d>
<theta>-90</theta>
<a>0.29</a>
<alpha>0</alpha>
</dh>
<max>109</max>
<min>-109</min>
</revolute>

<link id="link2">
<ignore idref="link1"/>
<ignore idref="link3"/>
</link>

<revolute id="joint2">
<frame>
<a idref="link2"/>
<b idref="link3"/>
</frame>
<dh>
<d>0.</d>
<theta>90</theta>
<a>0.0</a>
<alpha>90</alpha>
</dh>
<max>114</max>
<min>-114</min>
</revolute>

<link id="link3">
<ignore idref="link1"/>
<ignore idref="link2"/>
<ignore idref="link4"/>
</link>

<revolute id="joint3">
<frame>
<a idref="link3"/>
<b idref="link4"/>
</frame>
<dh>
<d>0.31</d>
<theta>180</theta>
<a>0</a>
<alpha>90</alpha>
</dh>
<max>169</max>
<min>-169</min>
</revolute>
<link id="link4">
<ignore idref="link3"/>
<ignore idref="link5"/>
<ignore idref="link6"/>
</link>

<revolute id="joint4">
<frame>
<a idref="link4"/>
<b idref="link5"/>
</frame>
<dh>
<d>0.0</d>
<theta>0</theta>
<a>0</a>
<alpha>-90</alpha>
</dh>
<max>114</max>
<min>-114</min>
</revolute>
<link id="link5">
<ignore idref="link4"/>
<ignore idref="link6"/>
</link>
<revolute id="joint5">
<frame>
<a idref="link5"/>
<b idref="link6"/>
</frame>
<dh>
<d>0.129</d>
<theta>180</theta>
<a>0</a>
<alpha>0</alpha>
</dh>
<max>169</max>
<min>-169</min>
</revolute>
<link id="link6">
<ignore idref="link5"/>
</link>
<transform id="tool">
<frame>
<a idref="link6"/>
<b idref="tcp"/>
</frame>
<rotation>
<x>0</x>
<y>-90</y>
<z>180</z>
</rotation>
<translation>
<x>0.00</x>
<y>0</y>
<z>0.16</z>
</translation>
</transform>
<frame id="tcp"/>
</kinematics>
</rlkin>
10 changes: 5 additions & 5 deletions model/rlsg/prob.convex/pisa_iit.wrl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#VRML V2.0 utf8
Transform {
children [
Shape {
DEF sensor0 Shape {
appearance Appearance {
material Material {
ambientIntensity 1.000000
Expand Down Expand Up @@ -117,7 +117,7 @@ normalPerVertex TRUE
}
Transform {
children [
Shape {
DEF sensor2 Shape {
appearance Appearance {
material Material {
ambientIntensity 1.000000
Expand Down Expand Up @@ -170,7 +170,7 @@ normalPerVertex TRUE
}
Transform {
children [
Shape {
DEF sensor3 Shape {
appearance Appearance {
material Material {
ambientIntensity 1.000000
Expand Down Expand Up @@ -223,7 +223,7 @@ normalPerVertex TRUE
}
Transform {
children [
Shape {
DEF sensor4 Shape {
appearance Appearance {
material Material {
ambientIntensity 1.000000
Expand Down Expand Up @@ -276,7 +276,7 @@ normalPerVertex TRUE
}
Transform {
children [
Shape {
DEF sensor5 Shape {
appearance Appearance {
material Material {
ambientIntensity 1.000000
Expand Down
31 changes: 31 additions & 0 deletions model/rlsg/table.wrl
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#VRML V2.0 utf8

Transform
{
translation 0.0 0 -0.0
children
Transform
{
rotation 0 0 1 0
translation -0.0 0 0
children
[
DEF bottom Shape
{
appearance Appearance
{
material Material
{
diffuseColor 0 1 0.50000000
}
}
geometry Box
{
size 0.59500002 0.39500001 9.99999977e-3
}
}

]
}
}

0 comments on commit ba417ad

Please sign in to comment.