summaryrefslogtreecommitdiff
path: root/digital/asserv/tools/inter_asserv.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 /digital/asserv/tools/inter_asserv.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 'digital/asserv/tools/inter_asserv.py')
-rw-r--r--digital/asserv/tools/inter_asserv.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/digital/asserv/tools/inter_asserv.py b/digital/asserv/tools/inter_asserv.py
index 82a92c32..72e31f60 100644
--- a/digital/asserv/tools/inter_asserv.py
+++ b/digital/asserv/tools/inter_asserv.py
@@ -43,7 +43,7 @@ class InterAsserv (Inter):
self.tk.createfilehandler (self.a, READABLE, self.read)
self.timeout ()
# Query position.
- self.a.register_pos ()
+ self.a.register_pos (interval = 225 / 20)
self.a.position.register (self.pos)
def createWidgets (self):