summaryrefslogtreecommitdiff
path: root/digital
diff options
context:
space:
mode:
authorNicolas Schodet2008-06-03 21:48:19 +0200
committerNicolas Schodet2008-06-03 21:48:19 +0200
commit6528ebfe4928a90c6e1cc67ca25b289b7ae93ffc (patch)
tree90c794d4d30af65b1f96b8934a7225eb03f580a3 /digital
parent384e257d56a053a7ef5f85dacf05632c24042ecd (diff)
* host, digital/asserv/tools, digital/avr/modules:
- cleaned up python scripts hierarchy.
Diffstat (limited to 'digital')
-rw-r--r--digital/asserv/tools/asserv/__init__.py1
-rw-r--r--digital/asserv/tools/asserv/asserv.py (renamed from digital/asserv/tools/asserv.py)0
-rw-r--r--digital/asserv/tools/asserv/init.py (renamed from digital/asserv/tools/init.py)0
-rw-r--r--digital/asserv/tools/inter_asserv.py15
-rw-r--r--digital/asserv/tools/step.py6
-rw-r--r--digital/asserv/tools/test_goto.py12
-rw-r--r--digital/asserv/tools/write_eeprom.py12
-rw-r--r--digital/avr/modules/host/test/test_mex.py2
-rw-r--r--digital/avr/modules/twi/test/test_twi_host.py4
9 files changed, 26 insertions, 26 deletions
diff --git a/digital/asserv/tools/asserv/__init__.py b/digital/asserv/tools/asserv/__init__.py
new file mode 100644
index 00000000..a498dc6b
--- /dev/null
+++ b/digital/asserv/tools/asserv/__init__.py
@@ -0,0 +1 @@
+from asserv import Asserv
diff --git a/digital/asserv/tools/asserv.py b/digital/asserv/tools/asserv/asserv.py
index 1f7c449b..1f7c449b 100644
--- a/digital/asserv/tools/asserv.py
+++ b/digital/asserv/tools/asserv/asserv.py
diff --git a/digital/asserv/tools/init.py b/digital/asserv/tools/asserv/init.py
index 42c34f5d..42c34f5d 100644
--- a/digital/asserv/tools/init.py
+++ b/digital/asserv/tools/asserv/init.py
diff --git a/digital/asserv/tools/inter_asserv.py b/digital/asserv/tools/inter_asserv.py
index 3edd9510..864be829 100644
--- a/digital/asserv/tools/inter_asserv.py
+++ b/digital/asserv/tools/inter_asserv.py
@@ -23,17 +23,16 @@
# }}}
"""Inter, communicating with the asserv board."""
import sys
-sys.path.append (sys.path[0] + '/../../../host/proto')
-sys.path.append (sys.path[0] + '/../../../host/inter')
+sys.path.append (sys.path[0] + '/../../../host')
from asserv import Asserv
-import init
-import popen_io
+import asserv.init
+import proto.popen_io
import serial
import math
-from inter import Inter
+from inter.inter import Inter
from Tkinter import *
@@ -43,11 +42,11 @@ class InterAsserv (Inter):
def __init__ (self, argv):
# Asserv.
if argv[0] == '!':
- io = popen_io.PopenIO (argv[1:])
- i = init.host
+ io = proto.popen_io.PopenIO (argv[1:])
+ i = asserv.init.host
else:
io = serial.Serial (argv[0])
- i = init.target
+ i = asserv.init.target
self.a = Asserv (io, **i)
self.a.async = True
self.a.register_pos (self.pos)
diff --git a/digital/asserv/tools/step.py b/digital/asserv/tools/step.py
index 5b87d5cd..b92311e5 100644
--- a/digital/asserv/tools/step.py
+++ b/digital/asserv/tools/step.py
@@ -1,14 +1,14 @@
import sys
-sys.path.append (sys.path[0] + '/../../../host/proto')
+sys.path.append (sys.path[0] + '/../../../host')
from asserv import Asserv
-import popen_io
+import proto.popen_io
import serial
import Gnuplot
def step (name, offset, kp, ki, kd, plots, **param):
if sys.argv[1] == '!':
- io = popen_io.PopenIO (sys.argv[2:])
+ io = proto.popen_io.PopenIO (sys.argv[2:])
else:
io = serial.Serial (sys.argv[1])
p = { name + 'kp': kp, name + 'ki': ki, name + 'kd': kd}
diff --git a/digital/asserv/tools/test_goto.py b/digital/asserv/tools/test_goto.py
index c2d27e9e..8def90af 100644
--- a/digital/asserv/tools/test_goto.py
+++ b/digital/asserv/tools/test_goto.py
@@ -1,18 +1,18 @@
import sys
-sys.path.append (sys.path[0] + '/../../../host/proto')
+sys.path.append (sys.path[0] + '/../../../host')
from asserv import Asserv
-import init
-import popen_io
+import asserv.init
+import proto.popen_io
import serial
import random
if sys.argv[1] == '!':
- io = popen_io.PopenIO (sys.argv[2:])
- init = init.host
+ io = proto.popen_io.PopenIO (sys.argv[2:])
+ init = asserv.init.host
else:
io = serial.Serial (sys.argv[1])
- init = init.target
+ init = asserv.init.target
a = Asserv (io, **init)
for i in xrange (10):
x = random.randrange (2000)
diff --git a/digital/asserv/tools/write_eeprom.py b/digital/asserv/tools/write_eeprom.py
index 6b7272c3..78e5cafb 100644
--- a/digital/asserv/tools/write_eeprom.py
+++ b/digital/asserv/tools/write_eeprom.py
@@ -1,17 +1,17 @@
import sys
-sys.path.append (sys.path[0] + '/../../../host/proto')
+sys.path.append (sys.path[0] + '/../../../host')
from asserv import Asserv
-import init
-import popen_io
+import asserv.init
+import proto.popen_io
import serial
if sys.argv[1] == '!':
- io = popen_io.PopenIO (sys.argv[2:])
- init = init.host
+ io = proto.popen_io.PopenIO (sys.argv[2:])
+ init = asserv.init.host
else:
io = serial.Serial (sys.argv[1])
- init = init.target
+ init = asserv.init.target
a = Asserv (io, **init)
a.write_eeprom ()
a.close ()
diff --git a/digital/avr/modules/host/test/test_mex.py b/digital/avr/modules/host/test/test_mex.py
index 7de5555d..64fc3a74 100644
--- a/digital/avr/modules/host/test/test_mex.py
+++ b/digital/avr/modules/host/test/test_mex.py
@@ -1,5 +1,5 @@
import sys
-sys.path.append (sys.path[0] + '/../../../../../host/mex')
+sys.path.append (sys.path[0] + '/../../../../../host')
from mex.hub import Hub
from mex.msg import Msg
diff --git a/digital/avr/modules/twi/test/test_twi_host.py b/digital/avr/modules/twi/test/test_twi_host.py
index 67942276..10b3e208 100644
--- a/digital/avr/modules/twi/test/test_twi_host.py
+++ b/digital/avr/modules/twi/test/test_twi_host.py
@@ -1,10 +1,10 @@
import sys
-sys.path.append (sys.path[0] + '/../../../../../host/mex')
+sys.path.append (sys.path[0] + '/../../../../../host')
from mex.hub import Hub
from mex.msg import Msg
from mex.node import Node
-from mex.forked import Forked
+from utils.forked import Forked
import os, signal, time