summaryrefslogtreecommitdiff
path: root/digital/asserv/tools/inter_asserv.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 /digital/asserv/tools/inter_asserv.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 'digital/asserv/tools/inter_asserv.py')
-rw-r--r--digital/asserv/tools/inter_asserv.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/digital/asserv/tools/inter_asserv.py b/digital/asserv/tools/inter_asserv.py
index f2c74a5c..82a92c32 100644
--- a/digital/asserv/tools/inter_asserv.py
+++ b/digital/asserv/tools/inter_asserv.py
@@ -26,8 +26,7 @@ import math
import asserv
import asserv.init
-import proto.popen_io
-import serial
+from utils.init_proto import init_proto
from inter.inter import Inter
from Tkinter import *
@@ -35,15 +34,9 @@ from Tkinter import *
class InterAsserv (Inter):
"""Inter, communicating with the asserv board."""
- def __init__ (self, argv):
+ def __init__ (self):
# Asserv.
- if argv[0] == '!':
- io = proto.popen_io.PopenIO (argv[1:])
- i = asserv.init.host
- else:
- io = serial.Serial (argv[0])
- i = asserv.init.target
- self.a = asserv.Proto (io, **i)
+ self.a = init_proto ('giboulee', asserv.Proto, asserv.init)
self.a.async = True
# Inter.
Inter.__init__ (self)
@@ -128,8 +121,7 @@ class InterAsserv (Inter):
self.a.ftw (self.backwardVar.get ())
if __name__ == '__main__':
- import sys
- app = InterAsserv (sys.argv[1:])
+ app = InterAsserv ()
try:
app.mainloop ()
finally: