Skip to content

Commit

Permalink
Merge pull request poppy-project#33 from poppy-project/v1.0.2
Browse files Browse the repository at this point in the history
V1.0.2
  • Loading branch information
matthieu-lapeyre committed May 31, 2016
2 parents f322143 + 70e3755 commit 1bc6bb9
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 16 deletions.
25 changes: 12 additions & 13 deletions hardware/doc/BOM.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 3D printing

Last full release: https://github.com/poppy-project/Poppy-Humanoid/releases/
Last full release: https://github.com/poppy-project/Poppy-Humanoid/releases/ ==> *STL_3D_printed_parts.zip*

### lower_limbs:
- 2x leg *(white polished polyamid)*
Expand Down Expand Up @@ -78,19 +78,19 @@ Last full release: https://github.com/poppy-project/Poppy-Humanoid/releases/
## Robotis

### Actuators Dynamixel
- 19 x MX-28AT
- 4 x MX-64AT
- 2 x AX-12A
- 19 x MX-28AT
- 4 x MX-64AT
- 2 x AX-12A

### Parts
- 19x HN07-N101 set
- 12x HN07-i101 Set
- 4x HN05-N102 Set
- 4x HN05-i101 Set

### Visserie:
- 1x Wrench Bolt M2*3 (200 pcs)
- 1x Wrench Bolt M2.5*4 (200 pcs)
### Fastenings:
- 1x Wrench Bolt M2*3 (200 pcs)
- 1x Wrench Bolt M2.5*4 (200 pcs)
- 1x Wrench Bolt M2.5*6 (200 pcs)
- 1x Wrench Bolt M2.5*8 (200 pcs)
- 1x BIOLOID Bolt Nut Set BNS-10
Expand All @@ -102,7 +102,6 @@ Last full release: https://github.com/poppy-project/Poppy-Humanoid/releases/
- 1x SMPS 12V 5A PS-10
- 3x BIOLOID 3P Extension PCB


- 1x Robot Cable-3P 60mm 10pcs
- 1x Robot Cable-3P 100mm 10pcs
- 1x Robot Cable-3P 140mm 10pcs
Expand All @@ -122,11 +121,11 @@ Custom:
- 1x http://www.leroymerlin.fr/v3/p/produits/lot-de-6-mini-pinces-dexter-e148011
- 1x http://www.leroymerlin.fr/v3/p/produits/set-de-micro-vissage-de-precision-mixte-dexter-e140690
- 1x http://www.leroymerlin.fr/v3/p/produits/set-de-micro-vissage-de-precision-mixte-tivoly-11501570026-e59080
- 2x frein fillet http://fr.farnell.com/jsp/search/productdetail.jsp?SKU=1370152
- 3x clé allen 1.5 mm
- 2x clé allen 2 mm
- 1x clé allen 2.5mm
- scotch blanc http://fr.farnell.com/jsp/search/productdetail.jsp?SKU=1825466
- 2x threadlock http://fr.farnell.com/jsp/search/productdetail.jsp?SKU=1370152
- 3x Allen wrench 1.5 mm
- 2x Allen wrench 2 mm
- 1x Allen wrench 2.5mm
- scotch white http://fr.farnell.com/jsp/search/productdetail.jsp?SKU=1825466


[1]: http://www.hardkernel.com/main/products/prdt_info.php?g_code=G138745696275
Expand Down
2 changes: 1 addition & 1 deletion hardware/head
Submodule head updated 63 files
+3 −2 .gitattributes
+1 −1 .gitmodules
+79 −0 doc/BOM.md
+136 −0 doc/head_assembly_instructions.md
+38 −0 doc/head_back_U3.md
+47 −0 doc/head_back_xu4.md
+3 −0 doc/img/assembly/U3-head-assembly-1.jpg
+3 −0 doc/img/assembly/U3-head-assembly-10.jpg
+3 −0 doc/img/assembly/U3-head-assembly-11.jpg
+3 −0 doc/img/assembly/U3-head-assembly-2.jpg
+3 −0 doc/img/assembly/U3-head-assembly-3.jpg
+3 −0 doc/img/assembly/U3-head-assembly-4.jpg
+3 −0 doc/img/assembly/U3-head-assembly-5.jpg
+3 −0 doc/img/assembly/U3-head-assembly-6.jpg
+3 −0 doc/img/assembly/U3-head-assembly-7.jpg
+3 −0 doc/img/assembly/U3-head-assembly-8.jpg
+3 −0 doc/img/assembly/U3-head-assembly-9.jpg
+3 −0 doc/img/assembly/U3-hub-1.jpg
+3 −0 doc/img/assembly/U3-hub-2.jpg
+3 −0 doc/img/assembly/U3-u3-1.jpg
+3 −0 doc/img/assembly/U3-u3-2.jpg
+3 −0 doc/img/assembly/XU4-audio-amp-1.jpg
+3 −0 doc/img/assembly/XU4-audio-amp-2.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-0.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-1.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-2.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-3.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-4.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-5.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-6.jpg
+3 −0 doc/img/assembly/XU4-head-assembly-7.jpg
+3 −0 doc/img/assembly/XU4-hub-1.jpg
+3 −0 doc/img/assembly/XU4-hub-2.jpg
+3 −0 doc/img/assembly/XU4-xu4-1.jpg
+3 −0 doc/img/assembly/XU4-xu4-2.jpg
+3 −0 doc/img/assembly/XU4-xu4-3.jpg
+3 −0 doc/img/assembly/audio_parts.jpg
+3 −0 doc/img/assembly/camera_support_nuts.jpg
+3 −0 doc/img/assembly/diff_U3-XU4.jpg
+3 −0 doc/img/assembly/head_back_U3_nuts.jpg
+3 −0 doc/img/assembly/head_back_motor_assembled.jpg
+3 −0 doc/img/assembly/head_back_motor_parts.jpg
+3 −0 doc/img/assembly/head_back_motor_step_2.jpg
+3 −0 doc/img/assembly/head_face_all_parts.jpg
+3 −0 doc/img/assembly/head_face_assembled_audio.jpg
+3 −0 doc/img/assembly/head_face_assembled_back.jpg
+3 −0 doc/img/assembly/head_face_assembled_camera_back.jpg
+3 −0 doc/img/assembly/head_face_assembled_camera_front.jpg
+3 −0 doc/img/assembly/head_face_assembled_front.jpg
+3 −0 doc/img/assembly/head_face_assembly_step_2.jpg
+3 −0 doc/img/assembly/head_face_audio_step_2.jpg
+3 −0 doc/img/assembly/head_face_camera_parts.jpg
+3 −0 doc/img/assembly/head_face_camera_support_parts.jpg
+3 −0 doc/img/assembly/head_face_screen_assembly.jpg
+3 −0 doc/img/assembly/head_face_step_2.jpg
+3 −0 doc/img/assembly/head_front_nuts.jpg
+3 −0 doc/img/assembly/head_motor_nuts.jpg
+0 −0 doc/soldering.md
+0 −0 doc/wiring.md
+1 −1 embedded_components/computer
+ head.SLDASM
+ parts/head_back.sldprt
+ parts/head_design.SLDPRT
8 changes: 8 additions & 0 deletions release_notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Release Notes

## Poppy Humanoid 1.0.2
- official support for Odroid XU4
- updated documentation

## Poppy Humanoid 1.0.0
- support for Odroid U3
4 changes: 2 additions & 2 deletions software/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def version():
version=version(),
packages=find_packages(),

install_requires=['poppy-creature >= 1.6.0',
'pypot >= 2.7.0'],
install_requires=['poppy-creature >= 1.8',
'pypot >= 2.11'],

setup_requires=['setuptools_git >= 0.3', ],

Expand Down

0 comments on commit 1bc6bb9

Please sign in to comment.