PYROS-IRAP / pyros

Commit eeb2b80bb62a16762371c4adc9d382b5aebff47c

Authored by Etienne Pallier
1 parent fba59912
Exists in dev

Nouvelle classe "Cmd" pour les commandes (v3)

Showing 1 changed file with 9 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/device_controller/concrete_component/gemini/gemini_controller.py
  Diff comments   View file @eeb2b80
... ... @@ -376,15 +376,15 @@ class DC_Gemini(DeviceController):
376 376 get_time = Cmd('get_time', 'GL', final_simul_response='10:20:36')
377 377 set_time = Cmd('set_time', 'SL')
378 378  
379   - GEN2NAT_CMDS_GENERAL_obj = [
  379 + GEN2NAT_CMDS_GENERAL_obj = Gen2NatCmds([
380 380 get_ack,
381 381 # General commands for the Gemini controller
382 382 get_date,
383 383 set_date,
384 384 get_time,
385 385 set_time,
386   - ]
387   - GEN2NAT_CMDS_GENERAL_obj = Gen2NatCmds(GEN2NAT_CMDS_GENERAL_obj).get_as_dict()
  386 + ]).get_as_dict()
  387 + #GEN2NAT_CMDS_GENERAL_obj = Gen2NatCmds(GEN2NAT_CMDS_GENERAL_obj).get_as_dict()
388 388  
389 389 '''
390 390 my_cmds.add_cmds(
... ... @@ -466,7 +466,7 @@ class DC_Gemini(DeviceController):
466 466 params = {'{+-}<dd>{*°}<mm># | :Sd{+- }<dd>{*°:}<mm>:<ss>#' : 'TODO'},
467 467 )
468 468  
469   - GEN2NAT_CMDS_MOUNT_obj = [
  469 + GEN2NAT_CMDS_MOUNT_obj = Gen2NatCmds([
470 470  
471 471 # GET & SET commands
472 472  
... ... @@ -495,7 +495,7 @@ class DC_Gemini(DeviceController):
495 495  
496 496 Cmd('get_vel', 'Gv', 'T'),
497 497 #"get_maxvel": ['Gv'],
498   -
  498 +
499 499 # DO commands
500 500 # defined in abstract class:
501 501 #'do_init': ['do_init'],
... ... @@ -521,8 +521,8 @@ class DC_Gemini(DeviceController):
521 521 Cmd('do_movewest', 'Mw'),
522 522 Cmd('do_moveeast', 'Me'),
523 523 Cmd('do_stop', 'Q'),
524   - ]
525   - GEN2NAT_CMDS_MOUNT_obj = Gen2NatCmds(GEN2NAT_CMDS_MOUNT_obj).get_as_dict()
  524 + ]).get_as_dict()
  525 + #GEN2NAT_CMDS_MOUNT_obj = Gen2NatCmds(GEN2NAT_CMDS_MOUNT_obj).get_as_dict()
526 526  
527 527  
528 528 GEN2NAT_CMDS_MOUNT_dict = {
... ... @@ -597,9 +597,10 @@ class DC_Gemini(DeviceController):
597 597 GEN2NAT_CMDS_obj = Gen2NatCmds()
598 598 GEN2NAT_CMDS_obj.add_cmds(GEN2NAT_CMDS_GENERAL_obj)
599 599 GEN2NAT_CMDS_obj.add_cmds('DC_Mount', GEN2NAT_CMDS_MOUNT_obj)
  600 + GEN2NAT_CMDS_obj = GEN2NAT_CMDS_obj.get_as_dict()
600 601  
601 602 GEN2NAT_CMDS = GEN2NAT_CMDS_dict
602   - GEN2NAT_CMDS = GEN2NAT_CMDS_obj.get_as_dict()
  603 + GEN2NAT_CMDS = GEN2NAT_CMDS_obj
603 604  
604 605 # Utilisation, affichage
605 606 #mes_commandes.add_cmd(get_ack)
... ...