transition (7) vers new class Commande (Cmd)

Etienne Pallier
1 parent 52df9a16
Showing 3 changed files with 43 additions and 11 deletions Show diff stats
src/device_controller/abstract_component/device_controller.py
src/device_controller/abstract_component/mount.py
src/device_controller/concrete_component/gemini/gemini_controller.py
@@ -295,8 +295,11 @@ class Gen2NatCmds:
     #cmds = {}
  
     def __init__(self, cmds:dict={}):
-        self.GEN2NAT_CMDS = cmds
         #self.cmds = {}
+        self.GEN2NAT_CMDS = cmds
+        if isinstance(cmds, list):
+            self.GEN2NAT_CMDS = {}
+            self.add_cmds(cmds)
  
     def __str__(self)->str: return str(self.GEN2NAT_CMDS)
  
@@ -392,6 +395,9 @@ class Gen2NatCmds:
         return 'G'+ cmd[1]
     def get_simulated_answer_for_native_cmd(self, cmd:str)->str:
         for val in self.GEN2NAT_CMDS.values():
+            if isinstance(val, Cmd):
+                if val.native_name == cmd: return val.final_simul_response
+                continue
             if cmd in val:
                 # No native cmd defined
                 if cmd != val[0]: return None
@@ -413,6 +419,11 @@ class Gen2NatCmds:
                 return True
         # nothing set
         return False
+
+    def cmd_native_name_is(self, native_cmd_infos:Cmd, cmd:str):
+        if isinstance(native_cmd_infos, Cmd):
+            return cmd == native_cmd_infos.native_name
+        return cmd in native_cmd_infos and cmd == native_cmd_infos[0]
     '''
     #TODO: chercher dans les DCC !! (recursive)
     def is_valid_native_cmd(self, cmd:str)->bool:
@@ -429,8 +440,8 @@ class Gen2NatCmds:
         ##return cmd in self.GEN2NAT_CMDS.values()
         # More elaborated version
         for native_cmd_infos in self.GEN2NAT_CMDS.values():
-            if cmd in native_cmd_infos:
-                if cmd == native_cmd_infos[0]: return True
+            #if cmd in native_cmd_infos and cmd == native_cmd_infos[0]: return True
+            if self.cmd_native_name_is(native_cmd_infos, cmd): return True
         # no notive cmd found
         return False
     def print_available_cmds(self):
@@ -1246,6 +1257,16 @@ class DeviceController():
  
  
  
+    def cmd_get_native_name(self, native_cmd_infos:Cmd):
+        #if isinstance(native_cmd_infos, Cmd): return [native_cmd_infos.native_name, native_cmd_infos.final_simul_response]
+        if isinstance(native_cmd_infos, Cmd): return native_cmd_infos.native_name
+        return native_cmd_infos[0]
+
+    def cmd_get_simul_response(self, native_cmd_infos:Cmd):
+        if isinstance(native_cmd_infos, Cmd):
+            return native_cmd_infos.final_simul_response if native_cmd_infos.final_simul_response!='simulator response' else None
+        return native_cmd_infos[1] if len(native_cmd_infos)>1 else None
+            
     #def exec_generic_cmd(self, generic_cmd:DeviceCmd)->str:
     ##def exec_generic_cmd(self, generic_cmd:str, values_to_set:str=None, dcc_type:str=None)->str:
     def exec_generic_cmd(self, generic_cmd:str, values_to_set:str=None)->str:
@@ -1279,7 +1300,9 @@ class DeviceController():
             return dcc.exec_generic_cmd(generic_cmd, values_to_set)
         '''
         # Get corresponding native command:
-        native_cmd = native_cmd_infos[0]
+        #native_cmd = native_cmd_infos[0]
+        native_cmd = self.cmd_get_native_name(native_cmd_infos)
+        print("***** generic, native_cmd", generic_cmd, native_cmd)
         if not native_cmd: raise UnimplementedGenericCmdException(generic_cmd)
  
         # 2) MACRO-COMMAND or NORMAL NATIVE COMMAND ?
@@ -1314,8 +1337,14 @@ class DeviceController():
         # 2.b) NORMAL NATIVE COMMAND (ex: native_cmd == "GR")
         ##native_cmd = self.formated_cmd(native_cmd, values_to_set)
         native_cmd = dcc.formated_cmd(native_cmd, values_to_set)
+        awaited_res_if_ok = self.cmd_get_simul_response(native_cmd_infos)
+        '''
         awaited_res_if_ok = None
-        if len(native_cmd_infos) > 1: awaited_res_if_ok = native_cmd_infos[1]
+        if isinstance(native_cmd_infos, Cmd) and native_cmd_infos.final_simul_response!='simulator response':
+            awaited_res_if_ok = native_cmd_infos.final_simul_response
+        elif len(native_cmd_infos) > 1: 
+            awaited_res_if_ok = native_cmd_infos[1]
+        '''
         #native_res = self.exec_native_cmd(self.formated_cmd(native_cmd,value), awaited_res_ok)
         ##native_res = self.exec_native_cmd(native_cmd)
         try:
@@ -94,9 +94,8 @@ class DC_Mount(DeviceController):
         Cmd('set_ra'),
         Cmd('get_dec'),
         Cmd('set_dec'),
-        #'get_radec': [get_radec],
-        Cmd('get_radec'),
-        Cmd('set_radec'),
+        Cmd('get_radec', 'get_radec'),
+        Cmd('set_radec', 'set_radec'),
  
         Cmd('get_longitude'),
         Cmd('set_longitude'),
@@ -124,9 +123,11 @@ class DC_Mount(DeviceController):
         Cmd('do_warm_start'),
         Cmd('do_prec_refr'),
     ]
+    '''
     my_cmds2 = Gen2NatCmds()
     my_cmds2.add_cmds(GEN2NAT_CMDS_obj)
     '''
+    '''
     print("******************************")
     print("(MOUNT) Mes commandes")
     my_cmds2.print_mes_commandes()
@@ -176,7 +177,8 @@ class DC_Mount(DeviceController):
         'do_prec_refr': [],
     }
  
-    GEN2NAT_CMDS = my_cmds2.get_as_dict()
+    #GEN2NAT_CMDS = my_cmds2.get_as_dict()
+    GEN2NAT_CMDS = Gen2NatCmds(GEN2NAT_CMDS_obj).get_as_dict()
     GEN2NAT_CMDS = GEN2NAT_CMDS_dict
  
     #TODO: remplacer PROTOCOL par "SOCKET-TCP", "SOCKET-UDP", "SERIAL", ou "USB"
@@ -195,7 +197,7 @@ class DC_Mount(DeviceController):
         #printd("(mount 2) given cmds (before):", gen2nat_cmds)
         ##self._my_gen2nat_cmds = { **self.GEN2NAT_CMDS, **gen2nat_cmds }
         my_gen2nat_cmds = { **self.GEN2NAT_CMDS, **gen2nat_cmds }
-        #printd("(mount 3) my cmds (after):", self._my_gen2nat_cmds)
+        #print("(mount 3) my cmds (after):", my_gen2nat_cmds)
  
         ##super().__init__(device_host, device_port, channel, buffer_size, DEBUG, device_sim)
         super().__init__(device_host, device_port, channel, buffer_size, protoc=protoc, gen2nat_cmds=my_gen2nat_cmds, device_sim=device_sim)
@@ -574,6 +574,7 @@ class DC_Gemini(DeviceController):
         'do_stop': ['Q'],
     }
  
+    GEN2NAT_CMDS_MOUNT = Gen2NatCmds(GEN2NAT_CMDS_MOUNT_obj).get_as_dict()
     GEN2NAT_CMDS_MOUNT = GEN2NAT_CMDS_MOUNT_dict
  
     GEN2NAT_CMDS_dict = {
@@ -592,8 +593,8 @@ class DC_Gemini(DeviceController):
         GEN2NAT_CMDS_MOUNT_obj
     ]
     '''
-    GEN2NAT_CMDS = my_cmds.get_as_dict()
     GEN2NAT_CMDS = GEN2NAT_CMDS_dict
+    GEN2NAT_CMDS = my_cmds.get_as_dict()
  
     # Utilisation, affichage
     #mes_commandes.add_cmd(get_ack)