Skip to content

Commit

Permalink
Merge branch '40-kinematics', update DH
Browse files Browse the repository at this point in the history
  • Loading branch information
jgvictores committed Apr 12, 2019
2 parents 2f93655 + d5f1538 commit 0c8c519
Show file tree
Hide file tree
Showing 13 changed files with 4,110 additions and 2,211 deletions.
4 changes: 2 additions & 2 deletions csv/dh-head.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Link,θ,D,A,α
1,q27,0,0,90
2,q28,0,0,-90
1,q27,l1+l2,0,-90
2,q28,0,0,90
12 changes: 6 additions & 6 deletions csv/dh-leftArm.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Link,θ,D,A,α
1,q21,0,0,90
2,90+q22,0,0,90
3,90+q23,l6,0,90
4,q24,0,0,-90
5,q25,l7,0,90
6,90+q26,0,l8,0
1,q21,0,0,-90
2,-90+q22,0,0,-90
3,-90+q23,-l6,0,-90
4,q24,0,0,90
5,q25,-l7,0,-90
6,-90+q26,0,-l8,0
2 changes: 1 addition & 1 deletion csv/dh-leftLeg.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Link,θ,D,A,α
1,q7,0,0,90
2,-90+q8,0,0,-90
2,90+q8,0,0,90
3,q9,0,-l10,0
4,q10,-l16,-l11,0
5,q11,0,0,-90
Expand Down
12 changes: 6 additions & 6 deletions csv/dh-rightArm.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Link,θ,D,A,α
1,q15,0,0,90
2,-90+q16,0,0,90
3,-90+q17,l6,0,90
4,q18,0,0,-90
5,q19,l7,0,90
6,90+q20,0,l8,0
1,q15,0,0,-90
2,-90+q16,0,0,-90
3,-90+q17,-l6,0,-90
4,q18,0,0,90
5,q19,-l7,0,-90
6,-90+q20,0,-l8,0
10 changes: 5 additions & 5 deletions csv/dh-rightLeg.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Link,θ,D,A,α
1,q6,0,0,-90
2,90+q5,0,0,-90
3,q4,0,l10,0
4,q3,l16,l11,0
1,q6,0,0,90
2,90+q5,0,0,90
3,q4,0,-l10,0
4,q3,l16,-l11,0
5,q2,0,0,-90
6,q1,0,l12,0
6,q1,0,-l12,0
3 changes: 3 additions & 0 deletions csv/dh-root-head.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Link,θ,D,A,α
1,q13,l0,0,-90
2,q14,0,0,90
3 changes: 3 additions & 0 deletions csv/dh-root-leftArm.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Link,θ,D,A,α
1,q13,l0,0,-90
2,-90+q14,l5,l1,0
2 changes: 2 additions & 0 deletions csv/dh-root-leftLeg.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Link,θ,D,A,α
1,90,-l9,l13,0
3 changes: 3 additions & 0 deletions csv/dh-root-rightArm.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Link,θ,D,A,α
1,q13,l0,0,-90
2,-90+q14,-l5,l1,0
2 changes: 2 additions & 0 deletions csv/dh-root-rightLeg.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Link,θ,D,A,α
1,90,-l9,-l13,0
16 changes: 8 additions & 8 deletions csv/dh-transformations.csv
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name,Transformation
H_head_rgb,TrasZ(-l14) * TrasY(l3) * RotY(90) * RotZ(180)
H_head_depth,TrasZ(-l14-l15) * TrasY(l3) * RotY(90) * RotZ(180)
H_head_flea,TrasY(l3+l4) * RotY(90) * RotZ(180)
H_hip_neck,RotX(90) * TrasZ(l1+l2)
H_hip_leftArm,TrasY(-l1) * TrasZ(l5) * RotZ(90)
H_hip_rightArm,TrasY(-l1) * TrasZ(-l5) * RotZ(-90) * RotX(180)
H_root_leftLeg,TrasY(l13) * TrasZ(-l9) * RotZ(90) * RotX(180)
H_root_rightLeg,TrasY(-l13) * TrasZ(-l9) * RotZ(-90)
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)
H_hip_neck,RotX(90)
H_hip_leftArm,TrasZ(l5) * RotZ(-90) * TrasX(l1)
H_hip_rightArm,TrasZ(-l5) * RotZ(-90) * TrasX(l1)
H_root_leftLeg,TrasZ(-l19) * RotZ(90) * TrasX(l13)
H_root_rightLeg,TrasZ(-l19) * RotZ(90) * TrasX(-l13)
Binary file modified fig/dh-drawing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0c8c519

Please sign in to comment.