summaryrefslogtreecommitdiff
path: root/host/simu/robots/aquajim/link/bag.py
diff options
context:
space:
mode:
authorNicolas Schodet2012-03-21 00:46:03 +0100
committerNicolas Schodet2012-03-21 18:56:51 +0100
commit1e7c8a8a9811c45091e6c471482086113f059f40 (patch)
treed7faa80dd162799c394ec23925cc53b6dbff008e /host/simu/robots/aquajim/link/bag.py
parent0feb542a8cf7630a5d442387727414f5251aad83 (diff)
parentdcb79f383269440ec2c5a54b6d7792fbb0110d5a (diff)
Merge branch 'master' into efrei-robotique
Conflicts: digital/mimot/src/dirty/aux.c digital/mimot/src/dirty/aux.h digital/mimot/src/dirty/contacts.h digital/mimot/src/dirty/main.c digital/mimot/src/dirty/models.host.c digital/mimot/src/dirty/twi_proto.c digital/mimot/tools/mimot/init.py
Diffstat (limited to 'host/simu/robots/aquajim/link/bag.py')
-rw-r--r--host/simu/robots/aquajim/link/bag.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/simu/robots/aquajim/link/bag.py b/host/simu/robots/aquajim/link/bag.py
index 3cb9e1b2..f0f96b9d 100644
--- a/host/simu/robots/aquajim/link/bag.py
+++ b/host/simu/robots/aquajim/link/bag.py
@@ -27,7 +27,7 @@ import asserv.mex
class Bag:
- def __init__ (self, node):
- self.asserv = asserv.mex.Mex (node)
- self.io = io.mex.Mex (node)
+ def __init__ (self, node, instance = 'robot0'):
+ self.asserv = asserv.mex.Mex (node, '%s:asserv0' % instance)
+ self.io = io.mex.Mex (node, '%s:io0' % instance)