summaryrefslogtreecommitdiff
path: root/host/simu/robots/aquajim/model/sorter.py
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-08 16:15:06 +0200
committerNicolas Schodet2011-05-08 16:15:06 +0200
commit0feb542a8cf7630a5d442387727414f5251aad83 (patch)
tree02092fbede27ef619ee63466f671513a889fb2ea /host/simu/robots/aquajim/model/sorter.py
parent4cd9c4458eaa49c269171145f4bc2a184948eae1 (diff)
parentd385a9eacb2e8580239f101f96356f7ed216dd97 (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/counter_ext.avr.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'host/simu/robots/aquajim/model/sorter.py')
-rw-r--r--host/simu/robots/aquajim/model/sorter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/simu/robots/aquajim/model/sorter.py b/host/simu/robots/aquajim/model/sorter.py
index e7b69761..93ff5e2a 100644
--- a/host/simu/robots/aquajim/model/sorter.py
+++ b/host/simu/robots/aquajim/model/sorter.py
@@ -58,8 +58,8 @@ class Sorter (Observable):
for i in self.into:
if i.pos is None:
return None
- m.rotate (i.angle)
m.translate (i.pos)
+ m.rotate (i.angle)
return m.apply (pos)
def __arm_motor_notified (self):