PYROS-IRAP / pyros

Commit 6d08d7d1cb4a1a40f46e1dae03d3a8b4062ec23d

Authored by Etienne Pallier
1 parent 707d8b19
Exists in dev

Restructuration 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/
Showing 7 changed files with 14 additions and 16 deletions   Show diff stats
Inline Side-by-side
README.md
  Diff comments   View file @6d08d7d
... ... @@ -67,24 +67,22 @@ This software has been tested and validated with the following configurations :
67 67 --------------------------------------------------------------------------------------------
68 68 ## LAST VERSION
69 69  
70   -Date: 14/06/2019
  70 +Date: 17/06/2019
71 71  
72 72 Author: E. Pallier (epallier@irap.omp.eu)
73 73  
74   -VERSION: 0.30.6
  74 +VERSION: 0.30.7
75 75  
76 76 Comment :
77   -- Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/
78   -
79   -TODO (coming) :
80   -- Restructuration du projet - phase 5 : /src/devices_controller/ => réorganisation interne :
81   - - a)
  77 +- Restructuration du projet - phase 5a : /src/devices_controller/ => réorganisation interne 1/2 :
82 78 - sortir /src/devices_controller/client/channel => /src/devices_controller/channel/
83 79 - sortir /src/devices_controller/client/devices_abstract/ => /src/devices_controller/devices_abstract/
84 80 - supprimer dossier client/
85 81 - rename channel/ => channels/
86 82 - rename devices_abstract/ => devices_controller_abstract_component/
87   - - b)
  83 +
  84 +TODO (coming) :
  85 +- Restructuration du projet - phase 5b : /src/devices_controller/ => réorganisation interne 2/2 :
88 86 - create folder devices_controller/devices_controller_concrete/
89 87 - migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/
90 88 - rename server/ => device_simulator_common/
... ...
src/devices_controller/channels/client_channel_serial.py
  Diff comments   View file @6d08d7d
... ... @@ -11,7 +11,7 @@
11 11 # None
12 12  
13 13 # Local application imports
14   -from devices_controller.channel.client_channel import *
  14 +from devices_controller.channels.client_channel import *
15 15  
16 16  
17 17  
... ...
src/devices_controller/channels/client_channel_socket.py
  Diff comments   View file @6d08d7d
... ... @@ -12,7 +12,7 @@ import socket
12 12 # None
13 13  
14 14 # Local application imports
15   -from devices_controller.channel.client_channel import *
  15 +from devices_controller.channels.client_channel import *
16 16  
17 17  
18 18  
... ...
src/devices_controller/channels/client_channel_usb.py
  Diff comments   View file @6d08d7d
... ... @@ -11,7 +11,7 @@
11 11 # None
12 12  
13 13 # Local application imports
14   -from devices_controller.channel.client_channel import *
  14 +from devices_controller.channels.client_channel import *
15 15  
16 16  
17 17  
... ...
src/devices_controller/devices_controller_abstract_component/device_controller_abstract.py
  Diff comments   View file @6d08d7d
... ... @@ -32,9 +32,9 @@ from devices_controller.logs import *
32 32 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
33 33 ##from src_socket.client.socket_client_abstract import *
34 34 ##from src_device.client.client_channel import *
35   -from devices_controller.channel.client_channel_socket import ClientChannelSocket
36   -from devices_controller.channel.client_channel_serial import ClientChannelSerial
37   -from devices_controller.channel.client_channel_usb import ClientChannelUSB
  35 +from devices_controller.channels.client_channel_socket import ClientChannelSocket
  36 +from devices_controller.channels.client_channel_serial import ClientChannelSerial
  37 +from devices_controller.channels.client_channel_usb import ClientChannelUSB
38 38  
39 39  
40 40  
... ...
src/devices_controller/devices_controller_abstract_component/telescope_controller_abstract.py
  Diff comments   View file @6d08d7d
... ... @@ -28,7 +28,7 @@ import src.core.celme as celme
28 28 #sys.path.append('../..')
29 29 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
30 30 ##from src_socket.client.socket_client_abstract import *
31   -from devices_controller.devices_abstract.device_controller_abstract import *
  31 +from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
32 32  
33 33  
34 34  
... ...
src/devices_controller/telescope_controller_gemini.py
  Diff comments   View file @6d08d7d
... ... @@ -17,7 +17,7 @@ import time
17 17 sys.path.append('../..')
18 18 #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract
19 19 ##from src_socket.client.socket_client_telescope_abstract import *
20   -from devices_controller.devices_abstract.telescope_controller_abstract import *
  20 +from devices_controller.devices_controller_abstract_component.telescope_controller_abstract import *
21 21  
22 22 # Default timeouts
23 23 TIMEOUT_SEND = 10
... ...