Merge branch '54-reorg', #54

roboticslab-uc3m · Apr 7, 2019 · f895b9a · f895b9a
2 parents 29d5185 + b3dccef
commit f895b9a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 33 deletions.
diff --git a/csv/bom.csv b/csv/bom.csv
@@ -0,0 +1,15 @@
+Device,Brand,Model,YARP device,Desciption/Comments
+EC Motor,Maxon,F400108/F411815,,"F400108 -> wrists joints and axial legs
+F411815 -> the rest"
+Motor Driver,Technosoft,iPOS 3602/3604/4808,TechnosoftIpos,"3602 -> front wrist
+3604 -> all except legs and trunk
+4808 -> legs and trunk"
+Relative Encoder,CUI Inc,AMT 203-V,TechnosoftIpos,
+Absolute Encoder,CUI Inc,AMT 203-V,CuiAbsolute,Uses PIC18F2580
+Force-Torque Sensor,JR3,50M31A3-125-DH,Jr3,"50M31A3-125-DH -> wrist
+((( unknown ))) -> ankle"
+Inertial Sensor,XSENS,MTi-28A53G35,xsensmtx,"Product ID: MTi-28A53G35
+Device ID: 00305355"
+RGBD Sensor,ASUS,XtionPRO Live,OpenNI2Server,RGB and Depth Sensor
+RGB Camera,Point Grey,Flea3 FL3-U3-88S2C-C,AravisGigE,USB3
+Fetch Hand,Lacquey,Fetch Hand,LacqueyFetch,Three finger underactuated
diff --git a/csv/lengths.csv b/csv/lengths.csv
@@ -0,0 +1,18 @@
+lengths,distance [mm],
+l0,193.2,
+l1,305,
+l2,162.5,
+l3,59.742,
+l4,37.508,
+l5,346.92,
+l6,329.01,
+l7,202,
+l8,187.496,"Con F/T, a 2 cm debajo chapa final mano."
+l9,92,
+l10,330,
+l11,300,
+l12,123.005,
+l13,146,
+l14,18,
+l15,26,
+l16,17.5,
diff --git a/tables.md b/tables.md
@@ -13,43 +13,16 @@ Can be found at [Motores: motores](#motores-motores)
 
 ## DH Parameter Table
 
-- Github: [dh-table.csv](/csv/dh-table.csv)
-- Gitbook: {% includeCsv src="../csv/dh-table.csv", useHeader="true" %}{% endincludeCsv %}
+- Github: [dh-table.csv](csv/dh-table.csv)
+- Gitbook: {% includeCsv src="csv/dh-table.csv", useHeader="true" %}{% endincludeCsv %}
 
 ## Link Lengths
-| lengths | distance [mm] | |
-| ------------ | ------------ | ------------ |
-| l0 | 193.2| |	
-| l1 | 305| |	
-| l2 | 162.5 | | 	
-| l3 | 59.742 | | 	
-| l4 | 37.508 | | 	
-| l5 | 346.92 | |	
-| l6 | 329.01 | |	
-| l7 | 202 | |	
-| l8 | 187.496 | Con F/T, a 2 cm debajo chapa final mano.|
-| l9 | 92 | 	
-| l10 | 330 | | 	
-| l11 | 300 | | 	
-| l12 | 123.005 | | 	
-| l13 | 146 | | 	
-| l14 | 18| | 	
-| l15 | 26 | | 	
-| l16 | 17.5 | | 	
+- Github: [lengths.csv](csv/lengths.csv)
+- Gitbook: {% includeCsv src="csv/lengths.csv", useHeader="true" %}{% endincludeCsv %}
 
 # Bill of materials (BOM)
-
-Device | Brand | Model | YARP device | Desciption/Comments
----|---|---|---|---
-EC Motor|Maxon|F400108/F411815||F400108 -> wrists joints and axial legs<br/> F411815 -> the rest
-Motor Driver|Technosoft|iPOS 3602/3604/4808|TechnosoftIpos|3602 -> front wrist<br/>3604 -> all except legs and trunk<br/>4808 -> legs and trunk
-Relative Encoder|CUI Inc|AMT 203-V|TechnosoftIpos|
-Absolute Encoder|CUI Inc|AMT 203-V|CuiAbsolute|Uses PIC18F2580
-Force-Torque Sensor|JR3|50M31A3-125-DH|Jr3|50M31A3-125-DH -> wrist<br/>((( unknown ))) -> ankle
-Inertial Sensor|XSENS|MTi-28A53G35|xsensmtx|Product ID: MTi-28A53G35<br/> Device ID: 00305355<br/>
-RGBD Sensor|ASUS|XtionPRO Live|OpenNI2Server|RGB and Depth Sensor
-RGB Camera|Point Grey|Flea3 FL3-U3-88S2C-C|AravisGigE|USB3
-Fetch Hand|Lacquey|Fetch Hand|LacqueyFetch|Three finger underactuated
+- Github: [bom.csv](csv/bom.csv)
+- Gitbook: {% includeCsv src="csv/bom.csv", useHeader="true" %}{% endincludeCsv %}
 
 ## Motores: motores
 - Github: [motores-motores.csv](csv/motores-motores.csv)