From d66908d11eef8952309a0b690195110f5be36195 Mon Sep 17 00:00:00 2001 From: Tibo42 Date: Fri, 1 Dec 2017 15:01:39 +0100 Subject: [PATCH] Update poppy_ergo_jr.py --- software/poppy_ergo_jr/poppy_ergo_jr.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/software/poppy_ergo_jr/poppy_ergo_jr.py b/software/poppy_ergo_jr/poppy_ergo_jr.py index d6084fb..aaaa284 100644 --- a/software/poppy_ergo_jr/poppy_ergo_jr.py +++ b/software/poppy_ergo_jr/poppy_ergo_jr.py @@ -12,6 +12,9 @@ SafePowerUp) +from .primitives.demo import (Tinsel, Tetu, Poule) + + class PoppyErgoJr(AbstractPoppyCreature): @classmethod def setup(cls, robot): @@ -36,6 +39,10 @@ def setup(cls, robot): if not robot.simulated and hasattr(robot, 'marker_detector'): robot.attach_primitive(TrackingFeedback(robot, 25.), 'tracking_feedback') + + robot.attach_primitive(Tinsel(robot), 'tinsel') + robot.attach_primitive(Tetu(robot), 'tetu') + robot.attach_primitive(Poule(robot), 'poule') for m in robot.motors: m.pid = (4, 2, 0) @@ -45,4 +52,6 @@ def setup(cls, robot): if not robot.simulated and hasattr(robot, 'face_tracking'): robot.attach_primitive(FaceTracking(robot, 10, robot.face_detector), - 'face_tracking') + 'face_tracking + +