Merge pull request #46 from poppy-project/v1.0.0-rc3

WIP:  V1.0.0 rc3 integration

README.md

@@ -32,6 +32,19 @@ Documentation about Poppy Ergo Jr as every projects of the Poppy platform is loc
 
 * Once you have a ready-to-use Poppy Ergo, you can take a look at [code samples](https://github.com/poppy-project/poppy-ergo-jr/tree/master/software/samples) for ideas
 
+## Setup your Raspberry-Pi board
+
+Poppy Ergo-Jr is based on the [Raspberry-Pi 2 board](https://www.raspberrypi.org/products/raspberry-pi-2-model-b/). We provide our own [image](https://github.com/poppy-project/poppy-ergo-jr/releases/download/1.0.0-rc.2/poppy-ergo-jr.img.zip) (based on Raspbian) that can be directly copied to the SD-card. You can refer to the [documentation](http://docs.poppy-project.org/en/installation/burn-an-image-file.html) for more details. *Note that if you buy it as a kit from one of the reseller you will also get a pre-installed SD-card.*
+
+You can also use our setup script directly on a Raspberry-Pi based on Raspbian. **Be aware tough that it takes some time and some good knowledge of Linux.** We use the [Raspoppy scripts](https://github.com/poppy-project/raspoppy) to setup the Raspberry-Pi to match our needs (custom Python, setup serial communication, setup the web interface, a Poppy user...).
+
+It a two steps process:
+
+* Make sure you have enough space on the SD-card (at least 2GB). You can extand your partition if needed via:
+```sudo raspi-config --expand-rootfs``` You will need to reboot afterwards.
+* Run the raspoppy script: ```curl -L https://raw.githubusercontent.com/poppy-project/raspoppy/master/raspoppyfication.sh | bash -s "poppy-ergo-jr"```
+You can refer to the [documentation](http://docs.poppy-project.org/en/installation/install-a-poppy-board.html) for more details.
+
 ## Contributing
 
 You can share your experience, new design, ideas or questions on the [Poppy project forum](https://forum.poppy-project.org/).

doc/bom.md

@@ -10,7 +10,7 @@ Here you will find the complete list of material (BOM) needed to build a Poppy E
   - 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 [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)
@@ -24,9 +24,16 @@ Here you will find the complete list of material (BOM) needed to build a Poppy E
 - 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 8Go
+- 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

software/conda.recipe/meta.yaml

@@ -17,6 +17,7 @@ requirements:
     - setuptools
     - pypot >2.11
     - poppy-creature >=1.8
+    - hampy
 
   run:
     - python

software/poppy_ergo_jr/_version.py

@@ -1 +1 @@
-__version__ = '1.6.0'
+__version__ = '1.6.2'

software/poppy_ergo_jr/configuration/poppy_ergo_jr.json

@@ -95,7 +95,7 @@
     "marker_detector": {
       "type": "MarkerDetector",
       "cameras": ["camera"],
-      "freq": 10.0,
+      "freq": 1.0,
       "need_robot": true
     }
   }

software/poppy_ergo_jr/poppy_ergo_jr.py

@@ -4,7 +4,6 @@
 from poppy.creatures import AbstractPoppyCreature
 from poppy.creatures.ik import IKChain
 
-from .primitives.jump import Jump
 from .primitives.dance import Dance
 from .primitives.face_tracking import FaceTracking
 from .primitives.tracking_feedback import TrackingFeedback
@@ -28,7 +27,6 @@ def setup(cls, robot):
         robot.attach_primitive(SafePowerUp(robot), 'safe_power_up')
 
         robot.attach_primitive(Dance(robot), 'dance')
-        robot.attach_primitive(Jump(robot), 'jump')
 
         robot.attach_primitive(BasePosture(robot, 2.), 'base_posture')
         robot.attach_primitive(RestPosture(robot, 2.), 'rest_posture')