summaryrefslogtreecommitdiff
path: root/host/simu/robots/giboulee/model
diff options
context:
space:
mode:
authorNicolas Schodet2009-04-30 23:59:34 +0200
committerNicolas Schodet2009-04-30 23:59:34 +0200
commit5039808c1c648f3aedf81e9e5fc2762d38c4d171 (patch)
treee97c208423af0d0293c042560d1408e364cb2566 /host/simu/robots/giboulee/model
parent44d514491bcfaf34d207dc5e172349bea0f4d7b7 (diff)
* digital/io/tools, host/simu:
- added distance sensors and obstacles.
Diffstat (limited to 'host/simu/robots/giboulee/model')
-rw-r--r--host/simu/robots/giboulee/model/bag.py16
1 files changed, 15 insertions, 1 deletions
diff --git a/host/simu/robots/giboulee/model/bag.py b/host/simu/robots/giboulee/model/bag.py
index fadccabe..03f85d4e 100644
--- a/host/simu/robots/giboulee/model/bag.py
+++ b/host/simu/robots/giboulee/model/bag.py
@@ -24,15 +24,29 @@
"""Giboulee bag of models."""
from simu.model.switch import Switch
from simu.model.position import Position
+from simu.model.distance_sensor_sharps import DistanceSensorSharps
from simu.robots.giboulee.model.arm import Arm
from simu.robots.giboulee.model.sorter import Sorter
+from math import pi
class Bag:
- def __init__ (self, link_bag):
+ def __init__ (self, scheduler, table, link_bag):
self.jack = Switch (link_bag.io.jack)
self.color_switch = Switch (link_bag.io.color_switch)
self.position = Position (link_bag.asserv.position)
self.arm = Arm (link_bag.asserv.aux[0])
self.sorter = Sorter (link_bag.io.servo[0:5], link_bag.io.servo[5])
+ self.distance_sensor = [
+ DistanceSensorSharps (link_bag.io.adc[0], scheduler, table,
+ (150, 127), 0, (self.position, )),
+ DistanceSensorSharps (link_bag.io.adc[1], scheduler, table,
+ (150, 0), 0, (self.position, )),
+ DistanceSensorSharps (link_bag.io.adc[2], scheduler, table,
+ (150, -127), 0, (self.position, )),
+ DistanceSensorSharps (link_bag.io.adc[3], scheduler, table,
+ (-70, 100), pi, (self.position, )),
+ DistanceSensorSharps (link_bag.io.adc[4], scheduler, table,
+ (-70, -100), pi, (self.position, )),
+ ]