Skip to content

Commit

Permalink
Merge branch '40-reorg-and-l8'
Browse files Browse the repository at this point in the history
  • Loading branch information
jgvictores committed Apr 30, 2019
2 parents a833796 + d51036c commit 4a2431a
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 46 deletions.
4 changes: 4 additions & 0 deletions csv/deprecated/dh-transformations.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Name,Transformation
H_hip_neck,RotX(90)
H_hip_leftArm,TrasZ(l5) * RotZ(-90) * TrasX(l1)
H_hip_rightArm,TrasZ(-l5) * RotZ(-90) * TrasX(l1)
File renamed without changes.
3 changes: 3 additions & 0 deletions csv/dh-fetch.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Link,θ,D,A,α
1,-90,0,0,90
2,0,lf,0,0
4 changes: 4 additions & 0 deletions csv/dh-head-transformations.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Name,Transformation
H_head_rgb,TrasZ(l3) * RotZ(-90) * RotX(-90) * TrasX(-l14)
H_head_depth,TrasZ(l3) * RotZ(-90) * RotX(-90) * TrasX(-l14-l15)
H_head_flea,TrasZ(l3+l4) * RotZ(-90) * RotX(-90)
9 changes: 0 additions & 9 deletions csv/dh-transformations.csv

This file was deleted.

37 changes: 19 additions & 18 deletions csv/lengths.csv
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
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,
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,90
l9,92
l10,330
l11,300
l12,123.005
l13,146
l14,18
l15,26
l16,17.5
lf,97.5
63 changes: 44 additions & 19 deletions tables.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,56 +14,81 @@ Can be found at [Motores: motores](#motores-motores)

## DH Parameters

### Useful transformations
Some not required, redundant or may be derived from from existing `dh-root-*.csv` contents (below).
- Github: [dh-transformations.csv](csv/dh-transformations.csv)
- Gitbook: {% includeCsv src="csv/dh-transformations.csv", useHeader="true" %}{% endincludeCsv %}
### Group: head

### trunk (root to hip)
This is the original `trunk`, but the three variants (for `head`, `rightArm`, `leftArm`; respectively, below) may be more useful.
- Github: [dh-trunk.csv](csv/dh-trunk.csv)
- Gitbook: {% includeCsv src="csv/dh-trunk.csv", useHeader="true" %}{% endincludeCsv %}

### trunk for head (root to neck)
#### trunk for head (root to neck)
- Github: [dh-root-head.csv](csv/dh-root-head.csv)
- Gitbook: {% includeCsv src="csv/dh-root-head.csv", useHeader="true" %}{% endincludeCsv %}

### head
#### head
- Github: [dh-head.csv](csv/dh-head.csv)
- Gitbook: {% includeCsv src="csv/dh-head.csv", useHeader="true" %}{% endincludeCsv %}

### trunk for rightArm (root to rightArm)
#### head additional transformations
- Github: [dh-head-transformations.csv](csv/dh-head-transformations.csv)
- Gitbook: {% includeCsv src="csv/dh-head-transformations.csv", useHeader="true" %}{% endincludeCsv %}

### Group: rightArm

#### trunk for rightArm (root to rightArm)
- Github: [dh-root-rightArm.csv](csv/dh-root-rightArm.csv)
- Gitbook: {% includeCsv src="csv/dh-root-rightArm.csv", useHeader="true" %}{% endincludeCsv %}

### rightArm
#### rightArm
- Github: [dh-rightArm.csv](csv/dh-rightArm.csv)
- Gitbook: {% includeCsv src="csv/dh-rightArm.csv", useHeader="true" %}{% endincludeCsv %}

### trunk for leftArm (root to leftArm)
#### fetch
- Github: [dh-fetch.csv](csv/dh-fetch.csv)
- Gitbook: {% includeCsv src="csv/dh-fetch.csv", useHeader="true" %}{% endincludeCsv %}

### Group: leftArm

#### trunk for leftArm (root to leftArm)
- Github: [dh-root-leftArm.csv](csv/dh-root-leftArm.csv)
- Gitbook: {% includeCsv src="csv/dh-root-leftArm.csv", useHeader="true" %}{% endincludeCsv %}

### leftArm
#### leftArm
- Github: [dh-leftArm.csv](csv/dh-leftArm.csv)
- Gitbook: {% includeCsv src="csv/dh-leftArm.csv", useHeader="true" %}{% endincludeCsv %}

### root to rightLeg
#### fetch
- Github: [dh-fetch.csv](csv/dh-fetch.csv)
- Gitbook: {% includeCsv src="csv/dh-fetch.csv", useHeader="true" %}{% endincludeCsv %}

### Group: rightLeg

#### root to rightLeg
- Github: [dh-root-rightLeg.csv](csv/dh-root-rightLeg.csv)
- Gitbook: {% includeCsv src="csv/dh-root-rightLeg.csv", useHeader="true" %}{% endincludeCsv %}

### rightLeg
#### rightLeg
- Github: [dh-rightLeg.csv](csv/dh-rightLeg.csv)
- Gitbook: {% includeCsv src="csv/dh-rightLeg.csv", useHeader="true" %}{% endincludeCsv %}

### root to leftLeg
### Group: leftLeg

#### root to leftLeg
- Github: [dh-root-leftLeg.csv](csv/dh-root-leftLeg.csv)
- Gitbook: {% includeCsv src="csv/dh-root-leftLeg.csv", useHeader="true" %}{% endincludeCsv %}

### leftLeg
#### leftLeg
- Github: [dh-leftLeg.csv](csv/dh-leftLeg.csv)
- Gitbook: {% includeCsv src="csv/dh-leftLeg.csv", useHeader="true" %}{% endincludeCsv %}

### Group: Deprecated transformations
The below are not required at time of writing, and may become outdated with time.

#### Deprecated trunk (root to hip)
This is the original `trunk`, but the three variants (for `head`, `rightArm`, `leftArm`; respectively, above) seem to be more useful.
- Github: [deprecated/dh-trunk.csv](csv/deprecated/dh-trunk.csv)
- Gitbook: {% includeCsv src="csv/deprecated/dh-trunk.csv", useHeader="true" %}{% endincludeCsv %}

#### Deprecated additional transformations
Some not required, redundant or may be derived from from existing `dh-root-*.csv` contents (above).
- Github: [deprecated/dh-transformations.csv](csv/deprecated/dh-transformations.csv)
- Gitbook: {% includeCsv src="csv/deprecated/dh-transformations.csv", useHeader="true" %}{% endincludeCsv %}

## Link Lengths
- Github: [lengths.csv](csv/lengths.csv)
- Gitbook: {% includeCsv src="csv/lengths.csv", useHeader="true" %}{% endincludeCsv %}
Expand Down

0 comments on commit 4a2431a

Please sign in to comment.