PYROS-IRAP / pyros

Commit 483003c17260ba5ef37af806a7dec855ef261fef

Authored by Etienne Pallier
1 parent 9ee212a8
Exists in dev

Derniers renommages... (pour être bien consistant)

Showing 4 changed files with 23 additions and 23 deletions   Show diff stats
Inline Side-by-side
src/core/pyros_django/agent/AgentDeviceTelescopeGemini.py
  Diff comments   View file @483003c
... ... @@ -13,9 +13,9 @@ from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_f
13 13 sys.path.append("../../..")
14 14 ##from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
15 15  
16   -from devices_controller.devices_controller_concrete.device_controller_Gemini.device_simulator_telescope_gemini import DeviceSimulatorTelescopeGEMINI
  16 +from devices_controller.devices_controller_concrete.device_controller_Gemini.device_simulator_telescope_gemini import DeviceSimulatorTelescopeGemini
17 17  
18   -from devices_controller.devices_controller_concrete.device_controller_Gemini.device_controller_telescope_gemini import DeviceControllerTelescopeGEMINI
  18 +from devices_controller.devices_controller_concrete.device_controller_Gemini.device_controller_telescope_gemini import DeviceControllerTelescopeGemini
19 19 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
20 20  
21 21  
... ... @@ -66,9 +66,9 @@ class AgentDeviceTelescopeGemini(AgentDevice):
66 66 super().__init__(
67 67 config_filename,
68 68 RUN_IN_THREAD,
69   - device_controller=DeviceControllerTelescopeGEMINI,
  69 + device_controller=DeviceControllerTelescopeGemini,
70 70 host=self.HOST, port=self.PORT,
71   - device_simulator=DeviceSimulatorTelescopeGEMINI)
  71 + device_simulator=DeviceSimulatorTelescopeGemini)
72 72  
73 73 # Initialize the device table status
74 74 # If table is empty, create a default 1st row
... ... @@ -86,7 +86,7 @@ class AgentDeviceTelescopeGemini(AgentDevice):
86 86 # Port local AK 8085 = redirigé sur l’IP du tele 192.168.0.12 sur port 11110
87 87 ##HOST, PORT = "82.64.28.71", 11110
88 88 #HOST, PORT = "localhost", 11110
89   - ##self.tele_ctrl = TelescopeControllerGEMINI(HOST, PORT, True)
  89 + ##self.tele_ctrl = TelescopeControllerGemini(HOST, PORT, True)
90 90 ##self._log.print(f"init done for {name}")
91 91  
92 92  
... ... @@ -101,7 +101,7 @@ class AgentDeviceTelescopeGemini(AgentDevice):
101 101 #HOST, PORT = "localhost", 11110
102 102 #with get_SocketServer_UDP_TCP(HOST, PORT, "UDP") as myserver:
103 103 #with get_SocketServer_UDP_TCP(self.HOST, self.PORT, "UDP") as myserver: myserver.serve_forever()
104   - TelescopeGEMINISimulator.serve_forever(self.PORT)
  104 + TelescopeGeminiSimulator.serve_forever(self.PORT)
105 105 '''
106 106 myserver = get_SocketServer_UDP_TCP(self.HOST, self.PORT, "UDP")
107 107 myserver.serve_forever()
... ...
src/devices_controller/devices_controller_abstract_component/device_controller_telescope.py
  Diff comments   View file @483003c
... ... @@ -484,7 +484,7 @@ class DeviceControllerTelescope(DeviceControllerAbstract):
484 484 #if res != '1': raise UnexpectedCommandReturnCode(res)
485 485 if res.ko: raise UnexpectedCommandReturnCode(res)
486 486  
487   - # 3) MOVE (non blocking by default for GEMINI)
  487 + # 3) MOVE (non blocking by default for Gemini)
488 488 self.do_move()
489 489  
490 490 # 4) Test velocity until it is "Tracking"
... ...
src/devices_controller/devices_controller_concrete/device_controller_AK/device_controller_plc_ak.py
  Diff comments   View file @483003c
1 1 #!/usr/bin/env python3
2 2  
3   -"""Socket Client GEMINI Telescope implementation
4   -To be used as a concrete class to system control a GEMINI telescope
  3 +"""Socket Client Gemini Telescope implementation
  4 +To be used as a concrete class to system control a Gemini telescope
5 5 """
6 6  
7 7 # Standard library imports
... ... @@ -118,7 +118,7 @@ class DeviceControllerPLCAK(DeviceControllerPLC):
118 118  
119 119  
120 120 # @overwrite
121   - # GEMINI is using UDP
  121 + # Gemini is using UDP
122 122 def __init__(self, server_host:str="localhost", server_port:int=11110, DEBUG=False):
123 123 super().__init__(server_host, server_port, "TCP", 1024, DEBUG)
124 124  
... ... @@ -148,7 +148,7 @@ class DeviceControllerPLCAK(DeviceControllerPLC):
148 148 - TYPE3: 'b?#' (bC# = Cold Start, bW# = selecting Warm Start, bR# = selecting Warm Restart)
149 149  
150 150 :Examples:
151   - >>> tele = SocketClientTelescopeGEMINI("localhost", 11110, DEBUG=False)
  151 + >>> tele = SocketClientTelescopeGemini("localhost", 11110, DEBUG=False)
152 152 >>> tele.encapsulate_data_to_send(':GD#')
153 153 '00010000:GD#\x00'
154 154 >>> tele.encapsulate_data_to_send(':GR#')
... ... @@ -189,7 +189,7 @@ class DeviceControllerPLCAK(DeviceControllerPLC):
189 189 r"""
190 190 Extract useful data from received raw data
191 191  
192   - >>> tele = SocketClientTelescopeGEMINI("localhost", 11110, DEBUG=False)
  192 + >>> tele = SocketClientTelescopeGemini("localhost", 11110, DEBUG=False)
193 193 >>> tele.last_stamp = '00170000'
194 194 >>> tele.uncap_received_data(b'001700001\x00')
195 195 '1'
... ... @@ -224,7 +224,7 @@ if __name__ == "__main__":
224 224 exit()
225 225  
226 226 # Classic usage:
227   - #plc_client = SocketClient_GEMINI(HOST, PORT)
  227 + #plc_client = SocketClient_Gemini(HOST, PORT)
228 228 # More elegant usage, using "with":
229 229 with DeviceControllerPLCAK("localhost", 11110, DEBUG=False) as plc_client:
230 230  
... ...
src/devices_controller/devices_controller_concrete/device_controller_SBIG/device_controller_SBIG.py
  Diff comments   View file @483003c
1 1 #!/usr/bin/env python3
2 2  
3   -"""Socket Client GEMINI Telescope implementation
4   -To be used as a concrete class to system control a GEMINI telescope
  3 +"""Socket Client Gemini Telescope implementation
  4 +To be used as a concrete class to system control a Gemini telescope
5 5 """
6 6  
7 7 # Standard library imports
... ... @@ -47,8 +47,8 @@ COMMAND6_SIMPLE = '6'
47 47  
48 48  
49 49  
50   -##class SocketClientTelescopeGEMINI(SocketClientTelescopeAbstract):
51   -#class TelescopeControllerGEMINI(TelescopeControllerAbstract):
  50 +##class SocketClientTelescopeGemini(SocketClientTelescopeAbstract):
  51 +#class TelescopeControllerGemini(TelescopeControllerAbstract):
52 52 #class DeviceControllerSBIG(DeviceControllerAbstract):
53 53 class DeviceControllerSBIG(DeviceControllerDetectorSensor, DeviceControllerDetectorShutter, DeviceControllerFilterSelector):
54 54  
... ... @@ -136,7 +136,7 @@ class DeviceControllerSBIG(DeviceControllerDetectorSensor, DeviceControllerDetec
136 136  
137 137  
138 138 # @overwrite
139   - # GEMINI is using UDP
  139 + # Gemini is using UDP
140 140 def __init__(self, device_host:str="localhost", device_port:int=11110, DEBUG=False):
141 141 super().__init__(device_host, device_port, "SOCKET-UDP", 1024, DEBUG)
142 142  
... ... @@ -167,7 +167,7 @@ class DeviceControllerSBIG(DeviceControllerDetectorSensor, DeviceControllerDetec
167 167 - TYPE3: 'b?#' (bC# = Cold Start, bW# = selecting Warm Start, bR# = selecting Warm Restart)
168 168  
169 169 :Examples:
170   - >>> tele = TelescopeControllerGEMINI("localhost", 11110, DEBUG=False)
  170 + >>> tele = TelescopeControllerGemini("localhost", 11110, DEBUG=False)
171 171 >>> tele.encapsulate_data_to_send(':GD#')
172 172 '00010000:GD#\x00'
173 173 >>> tele.encapsulate_data_to_send(':GR#')
... ... @@ -217,7 +217,7 @@ class DeviceControllerSBIG(DeviceControllerDetectorSensor, DeviceControllerDetec
217 217 r"""
218 218 Extract useful data from received raw data
219 219  
220   - >>> tele = TelescopeControllerGEMINI("localhost", 11110, DEBUG=False)
  220 + >>> tele = TelescopeControllerGemini("localhost", 11110, DEBUG=False)
221 221 >>> tele.last_stamp = '00170000'
222 222 >>> tele.uncap_received_data('001700001#')
223 223 '1'
... ... @@ -263,10 +263,10 @@ if __name__ == "__main__":
263 263 exit()
264 264 """
265 265 # Classic usage:
266   - #tele_ctrl = SocketClient_GEMINI(HOST, PORT)
  266 + #tele_ctrl = SocketClient_Gemini(HOST, PORT)
267 267 # More elegant usage, using "with":
268   - ##with SocketClientTelescopeGEMINI("localhost", 11110, DEBUG=False) as tele_ctrl:
269   - with TelescopeControllerGEMINI("localhost", 11110, DEBUG=False) as tele_ctrl:
  268 + ##with SocketClientTelescopeGemini("localhost", 11110, DEBUG=False) as tele_ctrl:
  269 + with TelescopeControllerGemini("localhost", 11110, DEBUG=False) as tele_ctrl:
270 270  
271 271 # 0) CONNECT to server (only for TCP, does nothing for UDP)
272 272 tele_ctrl._connect_to_server()
... ...