From 86644789c372f141cfe5fa91f7c12a947de7b822 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 17 May 2009 22:20:46 +0200 Subject: * digital/io/tools, host/simu: - added contact simulation. --- host/simu/robots/aquajim/model/bag.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'host/simu/robots/aquajim/model/bag.py') diff --git a/host/simu/robots/aquajim/model/bag.py b/host/simu/robots/aquajim/model/bag.py index 929d240a..ba854af5 100644 --- a/host/simu/robots/aquajim/model/bag.py +++ b/host/simu/robots/aquajim/model/bag.py @@ -39,8 +39,11 @@ class Bag: self.elevator_door = MotorBasic (link_bag.io.pwm[0], scheduler, 2 * pi, 0, pi / 2) self.sorter = Sorter (table, link_bag.asserv.aux[0], - link_bag.asserv.aux[1], link_bag.io.servo[0:2], - self.elevator_door, (self.position, )) + link_bag.io.contact[2], + link_bag.io.servo[0:2], link_bag.io.contact[0], + link_bag.asserv.aux[1], self.elevator_door, + link_bag.io.contact[1], + (self.position,)) self.distance_sensor = [ DistanceSensorSharps (link_bag.io.adc[0], scheduler, table, (50, 130), 0, (self.position, )), -- cgit v1.2.3