Cleaned up comments

This commit is contained in:
Jackie Kay jacquelinekay1 2014-09-30 14:24:46 -07:00
parent b4c7d20c75
commit aa54581221
14 changed files with 20 additions and 39 deletions

View File

@ -9,7 +9,6 @@
r = d/2.0 r = d/2.0
# Inertia # Inertia
# TODO: measure mass of objects
mass = 0.0011 mass = 0.0011
ixx = 2.0*mass*r**2/5.0 ixx = 2.0*mass*r**2/5.0
iyy = 2.0*mass*r**2/5.0 iyy = 2.0*mass*r**2/5.0

View File

@ -9,7 +9,6 @@
r = d/2 r = d/2
# Inertia # Inertia
# TODO: measure mass of objects
mass = 0.1467 mass = 0.1467
ixx = 2.0*mass*r**2/5.0 ixx = 2.0*mass*r**2/5.0
iyy = 2.0*mass*r**2/5.0 iyy = 2.0*mass*r**2/5.0

View File

@ -9,7 +9,6 @@
r = d/2 r = d/2
# Inertia # Inertia
# TODO: measure mass of objects
mass = 0.0062 mass = 0.0062
ixx = 2.0*mass*r**2/5.0 ixx = 2.0*mass*r**2/5.0
iyy = 2.0*mass*r**2/5.0 iyy = 2.0*mass*r**2/5.0

View File

@ -10,7 +10,6 @@
r = d/2.0 r = d/2.0
# Inertia # Inertia
# TODO: weigh object and get mass
mass = 0.0121 mass = 0.0121
ixx = mass/12.0 * 3*(r**2 + h**2 ) ixx = mass/12.0 * 3*(r**2 + h**2 )
iyy = mass/12.0 * 3*(r**2 + h**2 ) iyy = mass/12.0 * 3*(r**2 + h**2 )
@ -34,10 +33,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> <%= r %> </radius> <radius> <%= r %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -46,7 +44,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= r %> </radius> <radius> <%= r %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -17,10 +17,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> 0.0033 </radius> <radius> 0.0033 </radius>
<height> 0.062 </height> <length> 0.062 </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -29,7 +28,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> 0.0033 </radius> <radius> 0.0033 </radius>
<height> 0.062 </height> <length> 0.062 </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -13,7 +13,6 @@
a = d2/2.0 a = d2/2.0
# Inertia # Inertia
# TODO: weigh object and get mass
# http://www.wolframalpha.com/input/?i=conical+frustum+moment+of+inertia+tensor+of+solid # http://www.wolframalpha.com/input/?i=conical+frustum+moment+of+inertia+tensor+of+solid
#Need to calculate moment if bottom of frustum is closed #Need to calculate moment if bottom of frustum is closed
@ -43,7 +42,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= b %> </radius> <radius> <%= b %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -52,7 +51,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= b %> </radius> <radius> <%= b %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -9,7 +9,6 @@
dz = 0.01 dz = 0.01
# Inertia # Inertia
# TODO: weigh object and get mass
mass = 0.0628 mass = 0.0628
ixx = mass/12.0 * (dy**2 + dz**2) ixx = mass/12.0 * (dy**2 + dz**2)
iyy = mass/12.0 * (dz**2 + dx**2) iyy = mass/12.0 * (dz**2 + dx**2)

View File

@ -13,7 +13,6 @@
r2 = d2/2.0 r2 = d2/2.0
# Inertia # Inertia
# TODO: weigh object and get mass
mass = 0.0354 mass = 0.0354
ixx = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 ) ixx = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 )
iyy = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 ) iyy = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 )
@ -37,10 +36,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> <%= r2 %> </radius> <radius> <%= r2 %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -49,7 +47,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= r2 %> </radius> <radius> <%= r2 %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -17,10 +17,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> 0.0125 </radius> <radius> 0.0125 </radius>
<height> 0.1145 </height> <length> 0.1145 </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -29,7 +28,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> 0.0125 </radius> <radius> 0.0125 </radius>
<height> 0.1145 </height> <length> 0.1145 </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -13,7 +13,6 @@
r2 = d2/2.0 r2 = d2/2.0
# Inertia # Inertia
# TODO: weigh object and get mass
mass = 0.0048 mass = 0.0048
ixx = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 ) ixx = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 )
iyy = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 ) iyy = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 )
@ -37,10 +36,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> <%= r2 %> </radius> <radius> <%= r2 %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -49,7 +47,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= r2 %> </radius> <radius> <%= r2 %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -13,7 +13,6 @@
r2 = d2/2.0 r2 = d2/2.0
# Inertia # Inertia
# TODO: weigh object and get mass
mass = 0.0122 mass = 0.0122
ixx = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 ) ixx = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 )
iyy = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 ) iyy = mass/12.0 * ( 3*(r1**2 + r2**2) + h**2 )
@ -37,10 +36,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a washer
<cylinder> <cylinder>
<radius> <%= r2 %> </radius> <radius> <%= r2 %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -49,7 +47,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= r2 %> </radius> <radius> <%= r2 %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -17,10 +17,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a washer
<cylinder> <cylinder>
<radius> 0.0175 </radius> <radius> 0.0175 </radius>
<height> 0.002 </height> <length> 0.002 </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -29,7 +28,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> 0.0175 </radius> <radius> 0.0175 </radius>
<height> 0.002 </height> <length> 0.002 </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -10,7 +10,6 @@
r = d/2.0 r = d/2.0
# Inertia # Inertia
# TODO: weigh object and get mass
mass = 0.0175 mass = 0.0175
ixx = mass/12.0 * 3*(r**2 + h**2 ) ixx = mass/12.0 * 3*(r**2 + h**2 )
iyy = mass/12.0 * 3*(r**2 + h**2 ) iyy = mass/12.0 * 3*(r**2 + h**2 )
@ -34,10 +33,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> <%= r %> </radius> <radius> <%= r %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -46,7 +44,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> <%= r %> </radius> <radius> <%= r %> </radius>
<height> <%= h %> </height> <length> <%= h %> </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>

View File

@ -17,10 +17,9 @@
<collision name="collision"> <collision name="collision">
<geometry> <geometry>
#TODO: replace with mesh of a tube
<cylinder> <cylinder>
<radius> 0.00975 </radius> <radius> 0.00975 </radius>
<height> 0.08 </height> <length> 0.08 </length>
</cylinder> </cylinder>
</geometry> </geometry>
</collision> </collision>
@ -29,7 +28,7 @@
<geometry> <geometry>
<cylinder> <cylinder>
<radius> 0.00975 </radius> <radius> 0.00975 </radius>
<height> 0.08 </height> <length> 0.08 </length>
</cylinder> </cylinder>
</geometry> </geometry>
<material> <material>