From 5532fb5e50d071be08e3c37404d1755748762d7c Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 29 Apr 2010 23:04:20 +0200 Subject: host/simu/robots/marcel: add actuator simulation, refs #131 --- host/simu/robots/marcel/model/bag.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'host/simu/robots/marcel/model/bag.py') diff --git a/host/simu/robots/marcel/model/bag.py b/host/simu/robots/marcel/model/bag.py index 5cf276de..ce8eaab4 100644 --- a/host/simu/robots/marcel/model/bag.py +++ b/host/simu/robots/marcel/model/bag.py @@ -24,6 +24,7 @@ """Marcel bag of models.""" from simu.model.switch import Switch from simu.model.position import Position +from simu.robots.marcel.model.loader import Loader from simu.model.distance_sensor_sensopart import DistanceSensorSensopart from math import pi @@ -34,6 +35,8 @@ class Bag: self.color_switch = Switch (link_bag.io.color_switch) self.contact = [ Switch (contact) for contact in link_bag.io.contact ] self.position = Position (link_bag.asserv.position) + self.loader = Loader (table, self.position, link_bag.mimot.aux[0], + link_bag.mimot.aux[1], link_bag.asserv.aux[0]) self.distance_sensor = [ DistanceSensorSensopart (link_bag.io.adc[0], scheduler, table, (30 - 20, 0), 0, (self.position, ), 2), -- cgit v1.2.3