Skip to content

Commit

Permalink
Merge pull request poppy-project#67 from poppy-project/fix-gitbook-ci
Browse files Browse the repository at this point in the history
Delete git include of bom to fix gitbook ci
  • Loading branch information
show0k committed Jun 3, 2016
2 parents c265e3f + bce767d commit 398addc
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ before_install:
script:
- set +e
- export PATH=$PATH:$HOME/calibre-bin/calibre
- gitbook build ./
- gitbook pdf ./
- gitbook build -d ./
- gitbook pdf -d ./
- cd _book/ && http-server -p 8081 -s &
- blc http://localhost:8081/en/index.html -ro --exclude *.local* --exclude *192.168* --exclude *.127.0.0.1 --user-agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.86 Safari/537.36" --get | tee contributing/checked_links.txt
- grep -e 'BROKEN' -e 'Getting links from' -e 'Error' contributing/checked_links.txt
Expand Down
1 change: 0 additions & 1 deletion book.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"ga",
"language-picker",
"retina",
"numbered-headings",
"copy-code-button",
"todo",
"youtube"
Expand Down
43 changes: 41 additions & 2 deletions en/assembly-guides/ergo-jr/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,47 @@ At the end of the process, you should have a working Poppy Ergo Jr, ready to mov

We recommend you to follow carefully the instructions. Even if the Ergo Jr can be easily disassembled, it is always disappointing to need to start from scratch again because you forget to configure the motors, a wire is missing, or a motor is reversed.

<!-- BOM from poppy-ergo-jr git repo -->
{% include "git+https://github.com/poppy-project/poppy-ergo-jr.git/doc/bom.md" %}
<!-- Should be updated from https://github.com/poppy-project/poppy-ergo-jr/blob/master/doc/bom.md -->
## Bill of materials

Here you will find the complete list of material (BOM) needed to build a Poppy Ergo Jr.

## Poppy's material
- 1x [Pixl board](https://github.com/poppy-project/pixl) *(electronic board to control XL320 motors)*
- 1x [disk_support.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/disk_support.stl) (using laser cutting) the 2D plan can be found [here](https://github.com/poppy-project/poppy-ergo-jr/tree/master/hardware/laser_cutting). *You can also 3D print the base but it will take a lot of time*
- the 3D printed parts [STL here](https://github.com/poppy-project/poppy-ergo-jr/tree/master/hardware/STL)
- 1x [base.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/base.stl)
- 3x [horn2horn.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/horn2horn.stl)
- 3x [side2side.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/side2side.stl)
- 1x [long_U.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/long_U.stl)
- 1x [short_U.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/short_U.stl)
- 1x [support_camera.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/support_camera.stl)
- the different tools
- 1x [lamp.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/tools/lamp.stl)
- 1x [gripper-fixation.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/tools/gripper-fixation.stl)
- 1x [gripper-fixed_part.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/tools/gripper-fixed_part.stl)
- 1x [gripper-rotative_part.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/tools/gripper-rotative_part.stl)
- 1x [pen-holder.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/tools/pen-holder.stl)
- 1x [pen-screw.stl](https://github.com/poppy-project/poppy-ergo-jr/blob/master/hardware/STL/tools/pen-screw.stl)

## Robotis parts
- 6x Robotis dynamixel motors XL-320
- 1x set of OLLO rivets (about 70 colored and 4 grey)
- 1x OLLO TOOL

## Screw
- 4x M2.5x6mm screw (for fixing the Raspberry Pi on the base)
- 4x M2x5mm screw (for fixing the camera)
- 4x M2 nuts (fixing camera)
- 1x Standoff Male/Female M2.5 10mm

## Various electronics
- 1x Raspberry Pi 2
- 1x micro SD 8Go
- 1x Rasperry Pi camera
- 1x AC power 7.5V 2A with a 2.1 x 5.5 x 9.5 jack connector ([this one](http://fr.rs-online.com/web/p/alimentations-enfichables/7262814/?searchTerm=ECP-15-7.5E&relevancy-data=636F3D3226696E3D4931384E4B6E6F776E41734D504E266C753D6672266D6D3D6D61746368616C6C7061727469616C26706D3D5E5B5C707B4C7D5C707B4E647D2D2C2F255C2E5D2B2426706F3D313326736E3D592673743D4D414E5F504152545F4E554D4245522677633D424F5448267573743D4543502D31352D372E354526&sra=p) for instance).
- Short ethernet cable


<!--
TODO: assembly web interface
Expand Down

0 comments on commit 398addc

Please sign in to comment.