diff --git a/README.md b/README.md index 80f81e1..305bbbb 100644 --- a/README.md +++ b/README.md @@ -67,24 +67,22 @@ This software has been tested and validated with the following configurations : -------------------------------------------------------------------------------------------- ## LAST VERSION -Date: 14/06/2019 +Date: 17/06/2019 Author: E. Pallier (epallier@irap.omp.eu) -VERSION: 0.30.6 +VERSION: 0.30.7 Comment : -- Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ - -TODO (coming) : -- Restructuration du projet - phase 5 : /src/devices_controller/ => réorganisation interne : - - a) +- Restructuration du projet - phase 5a : /src/devices_controller/ => réorganisation interne 1/2 : - sortir /src/devices_controller/client/channel => /src/devices_controller/channel/ - sortir /src/devices_controller/client/devices_abstract/ => /src/devices_controller/devices_abstract/ - supprimer dossier client/ - rename channel/ => channels/ - rename devices_abstract/ => devices_controller_abstract_component/ - - b) + +TODO (coming) : +- Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 : - create folder devices_controller/devices_controller_concrete/ - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/ - rename server/ => device_simulator_common/ diff --git a/src/devices_controller/channels/client_channel_serial.py b/src/devices_controller/channels/client_channel_serial.py index 184ca55..73d493f 100755 --- a/src/devices_controller/channels/client_channel_serial.py +++ b/src/devices_controller/channels/client_channel_serial.py @@ -11,7 +11,7 @@ # None # Local application imports -from devices_controller.channel.client_channel import * +from devices_controller.channels.client_channel import * diff --git a/src/devices_controller/channels/client_channel_socket.py b/src/devices_controller/channels/client_channel_socket.py index 2d2ba4b..8b0d26c 100755 --- a/src/devices_controller/channels/client_channel_socket.py +++ b/src/devices_controller/channels/client_channel_socket.py @@ -12,7 +12,7 @@ import socket # None # Local application imports -from devices_controller.channel.client_channel import * +from devices_controller.channels.client_channel import * diff --git a/src/devices_controller/channels/client_channel_usb.py b/src/devices_controller/channels/client_channel_usb.py index 1f20877..623cca1 100755 --- a/src/devices_controller/channels/client_channel_usb.py +++ b/src/devices_controller/channels/client_channel_usb.py @@ -11,7 +11,7 @@ # None # Local application imports -from devices_controller.channel.client_channel import * +from devices_controller.channels.client_channel import * diff --git a/src/devices_controller/devices_controller_abstract_component/device_controller_abstract.py b/src/devices_controller/devices_controller_abstract_component/device_controller_abstract.py index 7a7ff39..2f00ab7 100755 --- a/src/devices_controller/devices_controller_abstract_component/device_controller_abstract.py +++ b/src/devices_controller/devices_controller_abstract_component/device_controller_abstract.py @@ -32,9 +32,9 @@ from devices_controller.logs import * #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract ##from src_socket.client.socket_client_abstract import * ##from src_device.client.client_channel import * -from devices_controller.channel.client_channel_socket import ClientChannelSocket -from devices_controller.channel.client_channel_serial import ClientChannelSerial -from devices_controller.channel.client_channel_usb import ClientChannelUSB +from devices_controller.channels.client_channel_socket import ClientChannelSocket +from devices_controller.channels.client_channel_serial import ClientChannelSerial +from devices_controller.channels.client_channel_usb import ClientChannelUSB diff --git a/src/devices_controller/devices_controller_abstract_component/telescope_controller_abstract.py b/src/devices_controller/devices_controller_abstract_component/telescope_controller_abstract.py index dfca600..e0371b7 100755 --- a/src/devices_controller/devices_controller_abstract_component/telescope_controller_abstract.py +++ b/src/devices_controller/devices_controller_abstract_component/telescope_controller_abstract.py @@ -28,7 +28,7 @@ import src.core.celme as celme #sys.path.append('../..') #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract ##from src_socket.client.socket_client_abstract import * -from devices_controller.devices_abstract.device_controller_abstract import * +from devices_controller.devices_controller_abstract_component.device_controller_abstract import * diff --git a/src/devices_controller/telescope_controller_gemini.py b/src/devices_controller/telescope_controller_gemini.py index 068d369..61b4463 100755 --- a/src/devices_controller/telescope_controller_gemini.py +++ b/src/devices_controller/telescope_controller_gemini.py @@ -17,7 +17,7 @@ import time sys.path.append('../..') #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract ##from src_socket.client.socket_client_telescope_abstract import * -from devices_controller.devices_abstract.telescope_controller_abstract import * +from devices_controller.devices_controller_abstract_component.telescope_controller_abstract import * # Default timeouts TIMEOUT_SEND = 10 -- libgit2 0.21.2