summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
-rw-r--r--host/inter/__init__.py0
-rw-r--r--host/inter/inter_node.py6
-rw-r--r--host/inter/test/test_drawable.py4
-rw-r--r--host/mex/__init__.py (renamed from host/mex/mex/__init__.py)0
-rw-r--r--host/mex/hub.py (renamed from host/mex/mex/hub.py)1
-rw-r--r--host/mex/msg.py (renamed from host/mex/mex/msg.py)0
-rw-r--r--host/mex/node.py (renamed from host/mex/mex/node.py)1
-rw-r--r--host/mex/test/test.py4
-rw-r--r--host/proto/__init__.py1
-rw-r--r--host/proto/test/asserv.py4
-rw-r--r--host/proto/test/interactive.py2
-rw-r--r--host/utils/__init__.py0
-rw-r--r--host/utils/forked.py (renamed from host/mex/mex/forked.py)0
22 files changed, 37 insertions, 38 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
diff --git a/host/inter/__init__.py b/host/inter/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/host/inter/__init__.py
diff --git a/host/inter/inter_node.py b/host/inter/inter_node.py
index 8e51b953..96648c6f 100644
--- a/host/inter/inter_node.py
+++ b/host/inter/inter_node.py
@@ -24,7 +24,7 @@
"""Inter, coupled with a mex Node."""
if __name__ == '__main__':
import sys
- sys.path.append (sys.path[0] + '/../mex')
+ sys.path.append (sys.path[0] + '/..')
from inter import Inter, Obstacle
from dist_sensor import DistSensor
@@ -206,9 +206,9 @@ class InterNode (Inter):
if __name__ == '__main__':
import mex.hub
- import mex.forked
+ import utils.forked
h = mex.hub.Hub (min_clients = 1)
- fh = mex.forked.Forked (h.wait)
+ fh = utils.forked.Forked (h.wait)
try:
app = InterNode ()
app.mainloop()
diff --git a/host/inter/test/test_drawable.py b/host/inter/test/test_drawable.py
index 31200252..79948e12 100644
--- a/host/inter/test/test_drawable.py
+++ b/host/inter/test/test_drawable.py
@@ -1,7 +1,7 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
-from drawable import *
+from inter.drawable import *
from math import pi
class Test (Drawable):
diff --git a/host/mex/mex/__init__.py b/host/mex/__init__.py
index 17a462a3..17a462a3 100644
--- a/host/mex/mex/__init__.py
+++ b/host/mex/__init__.py
diff --git a/host/mex/mex/hub.py b/host/mex/hub.py
index a3dd785b..5ae88ba7 100644
--- a/host/mex/mex/hub.py
+++ b/host/mex/hub.py
@@ -24,7 +24,6 @@
"""mex Hub."""
import mex
from msg import Msg
-import msg
import socket, select
from struct import pack, unpack, calcsize
diff --git a/host/mex/mex/msg.py b/host/mex/msg.py
index 5399a3c9..5399a3c9 100644
--- a/host/mex/mex/msg.py
+++ b/host/mex/msg.py
diff --git a/host/mex/mex/node.py b/host/mex/node.py
index e54d1ba6..3307a4d7 100644
--- a/host/mex/mex/node.py
+++ b/host/mex/node.py
@@ -24,7 +24,6 @@
"""mex Node."""
import mex
from msg import Msg
-import msg
import socket
from struct import pack, unpack, calcsize
diff --git a/host/mex/test/test.py b/host/mex/test/test.py
index bdb705a2..c4382c2c 100644
--- a/host/mex/test/test.py
+++ b/host/mex/test/test.py
@@ -1,10 +1,10 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
from mex.hub import Hub
from mex.node import Node
from mex.msg import Msg
-from mex.forked import Forked
+from utils.forked import Forked
import select
def log (x):
diff --git a/host/proto/__init__.py b/host/proto/__init__.py
new file mode 100644
index 00000000..ef19037a
--- /dev/null
+++ b/host/proto/__init__.py
@@ -0,0 +1 @@
+from proto import Proto
diff --git a/host/proto/test/asserv.py b/host/proto/test/asserv.py
index 265f0815..1628c27d 100644
--- a/host/proto/test/asserv.py
+++ b/host/proto/test/asserv.py
@@ -1,8 +1,8 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
import proto
-from popen_io import PopenIO
+from proto.popen_io import PopenIO
import time, select, os
# Pass program name as argument.
diff --git a/host/proto/test/interactive.py b/host/proto/test/interactive.py
index f68dd121..a8251f6d 100644
--- a/host/proto/test/interactive.py
+++ b/host/proto/test/interactive.py
@@ -1,5 +1,5 @@
import sys
-sys.path.append (sys.path[0] + '/..')
+sys.path.append (sys.path[0] + '/../..')
import proto
from fio import IO
diff --git a/host/utils/__init__.py b/host/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/host/utils/__init__.py
diff --git a/host/mex/mex/forked.py b/host/utils/forked.py
index 9e72d7d3..9e72d7d3 100644
--- a/host/mex/mex/forked.py
+++ b/host/utils/forked.py