ignore gps log

.gitignore

@@ -1,17 +1,10 @@
 __pycache__
 log
+/gps_log.txt
 
 .idea/*
 !.idea/runConfigurations
 
 *.json
 
-/Lib
-/Scripts
-/pyvenv.cfg
-/bin
-/lib
-/lib64
-/share
-
 /venv

config/hook_implementations.py

@@ -20,6 +20,74 @@ class EiveHookObject(TmTcHookBase):
     def get_service_op_code_dictionary(self) -> ServiceOpCodeDictT:
         from tmtccmd.config.globals import get_default_service_op_code_dict
         service_op_code_dict = get_default_service_op_code_dict()
+        get_eive_service_op_code_dict(service_op_code_dict=service_op_code_dict)
+        return service_op_code_dict
+
+    def get_json_config_file_path(self) -> str:
+        """The user can specify a path and filename for the JSON configuration file by overriding
+        this function.
+        :return:
+        """
+        return "config/tmtc_config.json"
+
+    def add_globals_pre_args_parsing(self, gui: bool = False):
+        from config.globals_config import set_globals_pre_args_parsing
+        set_globals_pre_args_parsing(gui=gui)
+
+    def add_globals_post_args_parsing(self, args: argparse.Namespace):
+        from config.globals_config import add_globals_post_args_parsing
+        add_globals_post_args_parsing(args=args, json_cfg_path=self.get_json_config_file_path())
+
+    def assign_communication_interface(self, com_if_key: str, tmtc_printer: TmTcPrinter) -> \
+            Union[CommunicationInterface, None]:
+        from tmtccmd.config.com_if import create_communication_interface_default
+        return create_communication_interface_default(
+            com_if_key=com_if_key, tmtc_printer=tmtc_printer,
+            json_cfg_path=self.get_json_config_file_path(), space_packet_id=0x0865
+        )
+
+    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
+        from config.custom_mode_op import custom_mode_operation
+        custom_mode_operation(mode=mode, tmtc_backend=tmtc_backend)
+
+    def pack_service_queue(self, service: int, op_code: str, service_queue: TcQueueT):
+        from pus_tc.tc_packer_hook import pack_service_queue_user
+        pack_service_queue_user(service=service, op_code=op_code, service_queue=service_queue)
+
+    def get_object_ids(self) -> Dict[bytes, list]:
+        from config.object_ids import get_object_ids
+        return get_object_ids()
+
+    @staticmethod
+    def handle_service_8_telemetry(
+            object_id: bytes, action_id: int, custom_data: bytearray
+    ) -> Tuple[list, list]:
+        from pus_tm.service_8_hook import user_analyze_service_8_data
+        return user_analyze_service_8_data(
+            object_id=object_id, action_id=action_id, custom_data=custom_data
+        )
+
+    @staticmethod
+    def handle_service_3_housekeeping(
+        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+    ) -> Tuple[list, list, bytearray, int]:
+        from pus_tm.hk_handling import handle_user_hk_packet
+        return handle_user_hk_packet(
+            object_id=object_id, set_id=set_id, hk_data=hk_data, service3_packet=service3_packet
+        )
+
+    @staticmethod
+    def handle_service_5_event(
+            object_id: bytes, event_id: int, param_1: int, param_2: int
+    ) -> str:
+        if object_id == RW1_ID:
+            if event_id == 1:
+                return ""
+        return ""
+
+
+def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
+    from pus_tc.pdu1 import Pdu1OpCodes
     op_code_dict = {
         'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
         'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
@@ -54,13 +122,17 @@ class EiveHookObject(TmTcHookBase):
 
     op_code_dict_srv_pdu1 = {
         "0": ("PDU1 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "1": ("PDU1: Turn star tracker on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.STAR_TRACKER_ON.value:
+            ("PDU1: Turn star tracker on", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "2": ("PDU1: Get switch state of star tracker", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "3": ("PDU1: Turn SUS nominal on", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "4": ("PDU1: Turn star tracker off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.STAR_TRACKER_OFF.value:
+            ("PDU1: Turn star tracker off", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "5": ("PDU1: Turn SUS nominal off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "6": ("PDU1: Turn ACS Side A on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.ACS_A_SIDE_ON.value:
-            "7": ("PDU1: Turn ACS Side A off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            ("PDU1: Turn ACS Side A on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.ACS_A_SIDE_OFF.value:
+            ("PDU1: Turn ACS Side A off", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_pdu1_tuple = ("PDU1 Device", op_code_dict_srv_pdu1)
 
@@ -150,8 +222,10 @@ class EiveHookObject(TmTcHookBase):
         "36": ("PLOC Supervisor: Read GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "37": ("PLOC Supervisor: Restart supervisor", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "38": ("PLOC Supervisor: Factory reset clear all", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "39": ("PLOC Supervisor: Factory reset clear mirror entries", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "39": ("PLOC Supervisor: Factory reset clear mirror entries",
-            "40": ("PLOC Supervisor: Factory reset clear circular entries", {OpCodeDictKeys.TIMEOUT: 2.0}),
+               {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "40": ("PLOC Supervisor: Factory reset clear circular entries",
+               {OpCodeDictKeys.TIMEOUT: 2.0}),
         "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
@@ -186,67 +260,5 @@ class EiveHookObject(TmTcHookBase):
     service_op_code_dict[CustomServiceList.PLOC_SUPV.value] = service_ploc_supv_tuple
     service_op_code_dict[CustomServiceList.PLOC_UPDATER.value] = service_ploc_updater_tuple
     service_op_code_dict[CustomServiceList.STAR_TRACKER.value] = service_star_tracker_tuple
-        service_op_code_dict[CustomServiceList.PLOC_MEMORY_DUMPER.value] = service_ploc_memory_dumper_tuple
+    service_op_code_dict[CustomServiceList.PLOC_MEMORY_DUMPER.value] = \
-        return service_op_code_dict
+        service_ploc_memory_dumper_tuple
-
-    def get_json_config_file_path(self) -> str:
-        """The user can specify a path and filename for the JSON configuration file by overriding
-        this function.
-        :return:
-        """
-        return "config/tmtc_config.json"
-
-    def add_globals_pre_args_parsing(self, gui: bool = False):
-        from config.globals_config import set_globals_pre_args_parsing
-        set_globals_pre_args_parsing(gui=gui)
-
-    def add_globals_post_args_parsing(self, args: argparse.Namespace):
-        from config.globals_config import add_globals_post_args_parsing
-        add_globals_post_args_parsing(args=args, json_cfg_path=self.get_json_config_file_path())
-
-    def assign_communication_interface(self, com_if_key: str, tmtc_printer: TmTcPrinter) -> \
-            Union[CommunicationInterface, None]:
-        from tmtccmd.config.com_if import create_communication_interface_default
-        return create_communication_interface_default(
-            com_if_key=com_if_key, tmtc_printer=tmtc_printer,
-            json_cfg_path=self.get_json_config_file_path(), space_packet_id=0x0865
-        )
-
-    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
-        from config.custom_mode_op import custom_mode_operation
-        custom_mode_operation(mode=mode, tmtc_backend=tmtc_backend)
-
-    def pack_service_queue(self, service: int, op_code: str, service_queue: TcQueueT):
-        from pus_tc.tc_packer_hook import pack_service_queue_user
-        pack_service_queue_user(service=service, op_code=op_code, service_queue=service_queue)
-
-    def get_object_ids(self) -> Dict[bytes, list]:
-        from config.object_ids import get_object_ids
-        return get_object_ids()
-
-    @staticmethod
-    def handle_service_8_telemetry(
-            object_id: bytes, action_id: int, custom_data: bytearray
-    ) -> Tuple[list, list]:
-        from pus_tm.service_8_hook import user_analyze_service_8_data
-        return user_analyze_service_8_data(
-            object_id=object_id, action_id=action_id, custom_data=custom_data
-        )
-
-    @staticmethod
-    def handle_service_3_housekeeping(
-        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
-    ) -> Tuple[list, list, bytearray, int]:
-        from pus_tm.hk_handling import handle_user_hk_packet
-        return handle_user_hk_packet(
-            object_id=object_id, set_id=set_id, hk_data=hk_data, service3_packet=service3_packet
-        )
-
-    @staticmethod
-    def handle_service_5_event(
-            object_id: bytes, event_id: int, param_1: int, param_2: int
-    ) -> str:
-        if object_id == RW1_ID:
-            if event_id == 1:
-                return ""
-        return ""

pus_tc/pdu1.py

@@ -6,6 +6,7 @@
 @author J. Meier
 @date   17.12.2020
 """
+import enum
 from tmtccmd.config.definitions import QueueCommands
 
 from tmtccmd.tc.packer import TcQueueT
@@ -15,6 +16,13 @@ from pus_tc.p60dock import P60DockConfigTable
 from gomspace.gomspace_pdu_definitions import *
 
 
+class Pdu1OpCodes(enum.Enum):
+    STAR_TRACKER_ON = "1"
+    STAR_TRACKER_OFF = "4"
+    ACS_A_SIDE_ON = "6"
+    ACS_A_SIDE_OFF = "7"
+
+
 class PDU1TestProcedure:
     """
     @brief  Use this class to define the tests to perform for the PDU2.
@@ -31,10 +39,10 @@ class PDU1TestProcedure:
     turn_channel_3_off = False
 
 
-def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     tc_queue.appendleft((QueueCommands.PRINT, "Commanding PDU1"))
 
-    if op_code == "1":
+    if op_code == Pdu1OpCodes.STAR_TRACKER_ON.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn star tracker on"))
         command = pack_set_param_command(object_id, PDUConfigTable.out_en_2.parameter_address,
                                          PDUConfigTable.out_en_2.parameter_size, Channel.on)
@@ -46,7 +54,7 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
                                          PDUConfigTable.out_en_4.parameter_size, Channel.on)
         command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "4":
+    if op_code == Pdu1OpCodes.STAR_TRACKER_OFF.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn star tracker off"))
         command = pack_set_param_command(object_id, PDUConfigTable.out_en_2.parameter_address,
                                          PDUConfigTable.out_en_2.parameter_size, Channel.off)
@@ -58,16 +66,20 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
                                          PDUConfigTable.out_en_4.parameter_size, Channel.off)
         command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "6":
+    if op_code == Pdu1OpCodes.ACS_A_SIDE_ON.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn ACS Side A on"))
-        command = pack_set_param_command(object_id, PDUConfigTable.out_en_7.parameter_address,
+        command = pack_set_param_command(
-                                         PDUConfigTable.out_en_7.parameter_size, Channel.on)
+            object_id, PDUConfigTable.out_en_7.parameter_address,
+            PDUConfigTable.out_en_7.parameter_size, Channel.on
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=34, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "7":
+    if op_code == Pdu1OpCodes.ACS_A_SIDE_OFF.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn ACS Side A off"))
-        command = pack_set_param_command(object_id, PDUConfigTable.out_en_7.parameter_address,
+        command = pack_set_param_command(
-                                         PDUConfigTable.out_en_7.parameter_size, Channel.off)
+            object_id, PDUConfigTable.out_en_7.parameter_address,
+            PDUConfigTable.out_en_7.parameter_size, Channel.off
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=35, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())