Skip to content

Commit

Permalink
Merge branch '32-csv', #32
Browse files Browse the repository at this point in the history
  • Loading branch information
jgvictores committed Apr 5, 2019
2 parents 253c719 + 3f7b624 commit c8c3fc1
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 53 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ doc/doxygen_sqlite3.db

## gitbook generated
/_book/
/node_modules/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ It is useful to serve on `localhost` to modify the website and see changes local

1. From the root of the project, run the following command (which is universal for all [Gitbook (legacy)](https://github.com/GitbookIO/gitbook)-based projects):
```bash
gitbook serve # command builds and serves
gitbook serve # command builds and serves; for the plugin, before first run please: gitbook install
```

2. You can now browse the site at the default location: http://127.0.0.1:4000
Expand Down
10 changes: 3 additions & 7 deletions appendix/a-teo-diagrams.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,12 @@
| <img alt="DH" src="../assets/Directions.png" width="300" /> |

## Joint Limits

- Joint limits:
- View: [Comma separated vector (.csv)](../assets/motores-motores.csv)
- Original: [LibreOffice Calc (.ods)](../assets/editable/motores.ods)
Can be found at [Motores: motores](/motores.md#motores-motores)

## DH Parameter Table

- DH Parameter Table:
- View: [Markdown (.md)](../assets/dh-table.md)
- Original: [LibreOffice Calc (.ods)](../assets/editable/dh-table.ods)
- Github: [dh-table.csv](/assets/dh-table.csv)
- Gitbook: {% includeCsv src="../assets/dh-table.csv", useHeader="true" %}{% endincludeCsv %}

## DH Coordinate Systems Drawing

Expand Down
37 changes: 37 additions & 0 deletions assets/dh-table.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Limb,Link,θ,D,A,α
Left leg,1,q7,0,0,90
,2,-90+q8,0,0,-90
,3,q9,0,-l10,0
,4,q10,-l16,-l11,0
,5,q11,0,0,-90
,6,q12,0,-l12,0
Right leg,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
Right arm,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
Left arm,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
Trunk,1,q13,l0,0,-90
,2,q14,0,0,0
Head,1,q27,0,0,90
,2,q28,0,0,-90
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),,,,
39 changes: 0 additions & 39 deletions assets/dh-table.md

This file was deleted.

Binary file removed assets/dh-table.png
Binary file not shown.
Binary file removed assets/editable/dh-table.ods
Binary file not shown.
Binary file removed assets/editable/motores.ods
Binary file not shown.
3 changes: 2 additions & 1 deletion book.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"structure": {
"readme": "README-gitbook.md"
}
},
"plugins": ["include-csv"]
}
27 changes: 22 additions & 5 deletions motores.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
# Motores
Original with formulas: [LibreOffice Calc (.ods)](assets/src/motores.ods)
- View: [motores-motores.csv](assets/motores-motores.csv)
- View: [motores-protecciones-brazos.csv](assets/motores-protecciones-brazos.csv)
- View: [motores-protecciones-piernas.csv](assets/motores-protecciones-piernas.csv)
- View: [motores-transmision.csv](assets/motores-transmision.csv)
Editable source origin with formulas: [LibreOffice Calc (.ods)](assets/src/motores.ods)

* [Motores: motores](#motores-motores)
* [Motores: protecciones-brazos](#motores-protecciones-brazos)
* [Motores: protecciones-piernas](#motores-protecciones-piernas)
* [Motores: transmision](#motores-transmision)

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

## Motores: protecciones-brazos
- Github: [motores-protecciones-brazos.csv](assets/motores-protecciones-brazos.csv)
- Gitbook: {% includeCsv src="assets/motores-protecciones-brazos.csv", useHeader="true" %}{% endincludeCsv %}

## Motores: protecciones-piernas
- Github: [motores-protecciones-piernas.csv](assets/motores-protecciones-piernas.csv)
- Gitbook: {% includeCsv src="assets/motores-protecciones-piernas.csv", useHeader="true" %}{% endincludeCsv %}

## Motores: transmision
- Github: [motores-transmision.csv](assets/motores-transmision.csv)
- Gitbook: {% includeCsv src="assets/motores-transmision.csv", useHeader="true" %}{% endincludeCsv %}

0 comments on commit c8c3fc1

Please sign in to comment.