bugfix client et test Gemini (et ajout 2 scripts pour run facile)

2 nouveaux scripts shell: - GEMINI_test.sh - GEMINI_run_client.sh

bugfix client et test Gemini (et ajout 2 scripts pour run facile)
2 nouveaux scripts shell: - GEMINI_test.sh - GEMINI_run_client.sh
Etienne Pallier
1 parent bcf29d0f
Showing 8 changed files with 40 additions and 27 deletions Show diff stats
GEMINI_run_client.sh
test_gemini.sh -> GEMINI_test.sh
src/core/pyros_django/agent/AgentDeviceGemini.py
src/core/pyros_django/agent/AgentMultiRequester.py
src/device_controller/abstract_component/device_controller.py
src/device_controller/abstract_component/mount.py
src/device_controller/concrete_component/gemini/client_telescope_gemini_controller_run.py
src/device_controller/concrete_component/gemini/gemini_controller.py
@@ -0,0 +1,5 @@
+# add arg "local" to run with simulator ($1)
+
+cd src/device_controller/concrete_component/gemini/
+./client_telescope_gemini_controller_run.py $1
+cd -
@@ -151,8 +151,12 @@ class AgentDeviceGemini(AgentDevice):
         dev_time = str(res)
         time.sleep(1)
  
-        #cmd="get radec"
+        # For a dcc command, both methods work:
+        # - Guess wich dcc can exec this command
         cmd="get_radec"
+        # OR
+        # - I tell you explicitely which one it is : "Mount"
+        cmd="Mount.get_radec"
         res = self._device_ctrl.exec_cmd(cmd)
         self.printd("result is", str(res))
         if res.ok: print("OK")
@@ -167,8 +167,8 @@ class AgentMultiRequester(Agent):
  
     ]
  
-    TEST_COMMANDS_LIST = TEST_COMMANDS_LIST_SBIG_ONLY
     #TEST_COMMANDS_LIST = TEST_COMMANDS_LIST_GEMINI_AND_SBIG
+    TEST_COMMANDS_LIST = TEST_COMMANDS_LIST_SBIG_ONLY
  
  
  
@@ -11,6 +11,7 @@ To be used as a base class (interface) for any concrete socket client telescope 
 import copy
 import functools
 import logging
+import pprint
 import socket
 import sys
 import threading
@@ -660,14 +661,25 @@ class DeviceController():
     def has_native_cmd_for_generic(self, generic_cmd:DeviceCommand):
         return self._my_cmds.get_native_infos_for_generic_cmd(generic_cmd.name) not in [None, []]
  
-    # check if generic cmd exists (in dictionary)
+    # check if generic cmd exists
     def is_valid_generic_cmd(self, cmd:DeviceCommand):
         #print("_my_cmds", self._my_cmds)
+        # 1) If a DCC given, return search result in this DCC commands
+        if cmd.devtype: return self.get_dc_component_for_type(cmd.devtype).has_generic_command(cmd)
+        # 2) Search in my general commands
+        if self.has_generic_command(cmd): return True
+        # 3) Search in all my DCCs
+        for dcc in self._my_dc_components:
+            if dcc.has_generic_command(cmd): return True
+        # 4) not found
+        return False
+        '''
         ##if not cmd.devtype: return self._my_cmds.get(cmd.name) is not None
         if not cmd.devtype: return self.has_generic_command(cmd)
         if not self.has_dc_component_for_type(cmd.devtype): return False
         ##return self.get_dc_component_for_type(cmd.devtype)._my_cmds.get(cmd.name) is not None
         return self.get_dc_component_for_type(cmd.devtype).has_generic_command(cmd)
+        '''
  
     # check if generic cmd exists and is implemented as a native cmd (in dictionary)
     def is_implemented_generic_cmd(self, cmd:DeviceCommand):
@@ -728,12 +740,12 @@ class DeviceController():
         # GENERIC command (pyros grammar)
         #if generic_cmd is not False:
         if cmd.is_generic():
-            if not self.is_valid_generic_cmd(cmd): raise UnknownGenericCmdException(cmd.name)
             print("GENERIC COMMAND")
+            if not self.is_valid_generic_cmd(cmd): raise UnknownGenericCmdException(cmd.name)
             #return self.exec_generic_cmd(generic_cmd, args)
             try:
                 res = self.exec_generic_cmd(cmd.name, cmd.args, cmd.devtype)
-            except (DCCNotFoundException, UnimplementedGenericCmdException) as e:
+            except (UnimplementedGenericCmdException, DCCNotFoundException) as e:
                 print(f"EXCEPTION caught by {type(self).__name__} (from DC)", e)
                 raise
             return res
@@ -884,7 +896,10 @@ class DeviceController():
         #log_d("\n\nGENERIC Command to send is "+generic_cmd)
         print("\n\n(DC): GENERIC Command to execute is ", generic_cmd)
         ##print("(DC): My ("+type(self).__name__+") commands are:", self._gen2nat_cmds)
-        print("(DC): My ("+type(self).__name__+") commands are:", self._my_cmds.get())
+        #print("(DC): My ("+type(self).__name__+") commands are:", self._my_cmds.get())
+        #print("(DC): My ("+type(self).__name__+") commands are:", self._my_cmds.get())
+        print("(DC): My ("+type(self).__name__+") commands are:")
+        pprint.pprint(self._my_cmds.get())
  
         dcc, native_cmd_infos = self.get_dcc_and_native_cmd_for_generic(generic_cmd)
         print("native_cmd_infos", native_cmd_infos)
@@ -91,6 +91,7 @@ class DC_Mount(DeviceController):
         'set_ra': [],
         'get_dec': [],
         'set_dec': [],
+        #'get_radec': [get_radec],
         'get_radec': ['get_radec'],
         'set_radec': ['set_radec'],
  
@@ -98,10 +99,10 @@ class DC_Mount(DeviceController):
         'set_longitude': [],
         'get_latitude': [],
         'set_latitude': [],
-        
+
         'get_velocity': [],
         'set_velocity': [],
-        
+
         # DO commands:
         ##'do_init': ['do_init'],
         ##'do_park': [],
@@ -102,14 +102,14 @@ def main():
         # Do MANUAL mode execution
         while True:
  
-            tele_ctrl.print_available_commands()
+            tele_ctrl.print_available_cmds()
             #req = input("\n(EXPERT MODE) REQUEST TO SERVER [ex: '6' (ACK), ':GD#' (Get Dec), ':GR#' (Get RA)'], (ENTER to quit): ").strip()
             cmd = input("REQUEST TO SERVER (ENTER to quit): >>> ").strip()
             if not cmd: break
  
             #cmd = DeviceCommand(cmd)
             #res = tele_ctrl.execute_cmd(cmd.replace(' ', '_'))
-            res = tele_ctrl.execute_cmd(cmd)
+            res = tele_ctrl.exec_cmd(cmd)
             print("result is", str(res))
             if res.ok: print("OK")
             #print("result.txt is", res.txt)
@@ -223,19 +223,19 @@ class DC_Gemini(DeviceController):
         # Possible answers:
         # - B# while the initial startup message is being displayed (new in L4),
         # - b# while waiting for the selection of the Startup Mode,
-        # - S# during a Cold Start (new in L4), G# after completed startup
-        'get_ack': [Protocol.COMMAND6, 'G', 'B','b','S'], 
+        # - S# during a Cold Start (new in L4),
+        # - G# after completed startup
+        'get_ack': [Protocol.COMMAND6, 'G', 'B','b','S'],
  
         # General commands for the Gemini controller
         'get_date': ['GC', 'bidon'],
         'set_date': ['SC'],
         'get_time': ['GL'],
         'set_time': ['SL'],
-    }     
+    }
     MY_GEN2NAT_CMDS_MOUNT = {
  
         # GET & SET commands
-        ##'get_ack': [Protocol.COMMAND6, 'G', 'B','b','S'], # B# while the initial startup message is being displayed (new in L4), b# while waiting for the selection of the Startup Mode, S# during a Cold Start (new in L4), G# after completed startup.
  
         # RA-DEC (p109-110)
         #:Sr<hh>:<mm>.<m># or :Sr<hh>:<mm>:<ss>#
@@ -278,7 +278,7 @@ class DC_Gemini(DeviceController):
         'do_prec_refr': ['p3'],
  
         # for test only
-        'gem_only':[],
+        'gem_only': [],
  
         'do_move': ['MS', '0', '1Object below horizon.', '2No object selected.', '3Manual Control.', '4Position unreachable.', '5Not aligned.', '6Outside Limits.' ],    
         'do_movenorth': ['Mn'],
@@ -290,18 +290,6 @@ class DC_Gemini(DeviceController):
     MY_GEN2NAT_CMDS = {
         # My GENERAL commands
         **MY_GEN2NAT_CMDS_GENERAL,
-        '''
-        'get_ack': [Protocol.COMMAND6, 'G', 'B','b','S'], 
-        # B# while the initial startup message is being displayed (new in L4), 
-        # b# while waiting for the selection of the Startup Mode, 
-        # S# during a Cold Start (new in L4), G# after completed startup.
-
-        # General commands for the Gemini controller
-        'get_date': ['GC'],
-        'set_date': ['SC'],
-        'get_time': ['GL'],
-        'set_time': ['SL'],
-        '''
  
         # SPECIFIC commands for my DCCs
         'DC_Mount' : MY_GEN2NAT_CMDS_MOUNT