summaryrefslogtreecommitdiff
path: root/digital/asserv/tools/write_eeprom.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/write_eeprom.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/write_eeprom.py')
-rw-r--r--digital/asserv/tools/write_eeprom.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/digital/asserv/tools/write_eeprom.py b/digital/asserv/tools/write_eeprom.py
index b6b9abd9..09a727ea 100644
--- a/digital/asserv/tools/write_eeprom.py
+++ b/digital/asserv/tools/write_eeprom.py
@@ -2,15 +2,8 @@ import sys
import asserv
import asserv.init
-import proto.popen_io
-import serial
+from utils.init_proto import init_proto
-if sys.argv[1] == '!':
- io = proto.popen_io.PopenIO (sys.argv[2:])
- init = asserv.init.host
-else:
- io = serial.Serial (sys.argv[1])
- init = asserv.init.target
-a = asserv.Proto (io, **init)
+a = init_proto (None, asserv.Proto, asserv.init)
a.write_eeprom ()
a.close ()