From 5510571ed0a951b1da31330199a247875bc4d547 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Fri, 13 Apr 2012 20:51:00 +0200 Subject: digital/ai, host/simu: change beacon obstacle level --- host/simu/robots/aquajim/model/bag.py | 10 +++++----- host/simu/robots/giboulee/model/bag.py | 10 +++++----- host/simu/robots/guybrush/model/bag.py | 8 ++++---- host/simu/robots/marcel/model/bag.py | 8 ++++---- host/simu/robots/robospierre/model/bag.py | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'host/simu/robots') diff --git a/host/simu/robots/aquajim/model/bag.py b/host/simu/robots/aquajim/model/bag.py index ba854af5..65933c99 100644 --- a/host/simu/robots/aquajim/model/bag.py +++ b/host/simu/robots/aquajim/model/bag.py @@ -46,15 +46,15 @@ class Bag: (self.position,)) self.distance_sensor = [ DistanceSensorSharps (link_bag.io.adc[0], scheduler, table, - (50, 130), 0, (self.position, )), + (50, 130), 0, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[1], scheduler, table, - (50, -130), 0, (self.position, )), + (50, -130), 0, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[2], scheduler, table, - (50, 0), 0, (self.position, )), + (50, 0), 0, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[3], scheduler, table, - (0, 130), pi, (self.position, )), + (0, 130), pi, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[4], scheduler, table, - (0, -130), pi, (self.position, )), + (0, -130), pi, (self.position, ), 4), ] self.path = link_bag.io.path diff --git a/host/simu/robots/giboulee/model/bag.py b/host/simu/robots/giboulee/model/bag.py index 7b13c36c..19c9ea1d 100644 --- a/host/simu/robots/giboulee/model/bag.py +++ b/host/simu/robots/giboulee/model/bag.py @@ -39,15 +39,15 @@ class Bag: 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, )), + (150, 127), 0, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[1], scheduler, table, - (150, 0), 0, (self.position, )), + (150, 0), 0, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[2], scheduler, table, - (150, -127), 0, (self.position, )), + (150, -127), 0, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[3], scheduler, table, - (-70, 100), pi, (self.position, )), + (-70, 100), pi, (self.position, ), 4), DistanceSensorSharps (link_bag.io.adc[4], scheduler, table, - (-70, -100), pi, (self.position, )), + (-70, -100), pi, (self.position, ), 4), ] self.path = link_bag.io.path diff --git a/host/simu/robots/guybrush/model/bag.py b/host/simu/robots/guybrush/model/bag.py index 8e7250b2..6eeddeee 100644 --- a/host/simu/robots/guybrush/model/bag.py +++ b/host/simu/robots/guybrush/model/bag.py @@ -54,13 +54,13 @@ class Bag: 0., 30., 150., 75., 30.)) self.distance_sensor = [ DistanceSensorSensopart (link_bag.io_hub.adc[0], scheduler, table, - (20, 20), pi * 10 / 180, (self.position, ), 2), + (20, 20), pi * 10 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io_hub.adc[1], scheduler, table, - (20, -20), -pi * 10 / 180, (self.position, ), 2), + (20, -20), -pi * 10 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io_hub.adc[2], scheduler, table, - (-20, -20), pi + pi * 10 / 180, (self.position, ), 2), + (-20, -20), pi + pi * 10 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io_hub.adc[3], scheduler, table, - (-20, 20), pi - pi * 10 / 180, (self.position, ), 2), + (-20, 20), pi - pi * 10 / 180, (self.position, ), 5), ] self.path = link_bag.io_hub.path self.pos_report = link_bag.io_hub.pos_report diff --git a/host/simu/robots/marcel/model/bag.py b/host/simu/robots/marcel/model/bag.py index 000090d1..0f51b2ba 100644 --- a/host/simu/robots/marcel/model/bag.py +++ b/host/simu/robots/marcel/model/bag.py @@ -40,13 +40,13 @@ class Bag: link_bag.asserv.aux[1], link_bag.io.contact[0:2]) self.distance_sensor = [ DistanceSensorSensopart (link_bag.io.adc[0], scheduler, table, - (30 - 20, 0), 0, (self.position, ), 2), + (30 - 20, 0), 0, (self.position, ), 5), DistanceSensorSensopart (link_bag.io.adc[1], scheduler, table, - (20 - 20, 20), pi * 30 / 180, (self.position, ), 2), + (20 - 20, 20), pi * 30 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io.adc[2], scheduler, table, - (20 - 20, -20), -pi * 30 / 180, (self.position, ), 2), + (20 - 20, -20), -pi * 30 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io.adc[3], scheduler, table, - (-30 - 20, 0), pi, (self.position, ), 2), + (-30 - 20, 0), pi, (self.position, ), 5), ] link_bag.io.adc[4].value = 0 link_bag.io.adc[5].value = 0 diff --git a/host/simu/robots/robospierre/model/bag.py b/host/simu/robots/robospierre/model/bag.py index cedb3805..d25a4668 100644 --- a/host/simu/robots/robospierre/model/bag.py +++ b/host/simu/robots/robospierre/model/bag.py @@ -50,13 +50,13 @@ class Bag: self.contact[0:7], link_bag.io_hub.codebar) self.distance_sensor = [ DistanceSensorSensopart (link_bag.io_hub.adc[0], scheduler, table, - (20, 20), pi * 10 / 180, (self.position, ), 2), + (20, 20), pi * 10 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io_hub.adc[1], scheduler, table, - (20, -20), -pi * 10 / 180, (self.position, ), 2), + (20, -20), -pi * 10 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io_hub.adc[2], scheduler, table, - (-20, -20), pi + pi * 10 / 180, (self.position, ), 2), + (-20, -20), pi + pi * 10 / 180, (self.position, ), 5), DistanceSensorSensopart (link_bag.io_hub.adc[3], scheduler, table, - (-20, 20), pi - pi * 10 / 180, (self.position, ), 2), + (-20, 20), pi - pi * 10 / 180, (self.position, ), 5), ] self.path = link_bag.io_hub.path self.pos_report = link_bag.io_hub.pos_report -- cgit v1.2.3