From 7012a6c41f6e211c060f583c21061fe7ca3f4c45 Mon Sep 17 00:00:00 2001 From: Irini Kosmidou Date: Tue, 21 Jun 2022 15:21:55 +0200 Subject: [PATCH 01/17] scex tmtc init --- config/definitions.py | 1 + pus_tc/devs/scex.py | 0 pus_tc/tc_packer_hook.py | 6 ++++-- spacepackets | 2 +- tmtccmd | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 pus_tc/devs/scex.py diff --git a/config/definitions.py b/config/definitions.py index c12a6d2..acd37ac 100644 --- a/config/definitions.py +++ b/config/definitions.py @@ -50,3 +50,4 @@ class CustomServiceList(enum.Enum): RTD = "rtd" TVTTESTPROCEDURE = "tvtestproc" CONTROLLERS = "controllers" + SCEX = "scex" diff --git a/pus_tc/devs/scex.py b/pus_tc/devs/scex.py new file mode 100644 index 0000000..e69de29 diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py index be637d4..1d0e828 100644 --- a/pus_tc/tc_packer_hook.py +++ b/pus_tc/tc_packer_hook.py @@ -242,8 +242,10 @@ def pack_service_queue_user( tc_queue=service_queue, object_id=RW_ASSEMBLY, op_code=op_code ) if service == CustomServiceList.CONTROLLERS.value: - return pack_controller_commands(tc_queue=service_queue, op_code=op_code) - LOGGER.warning(f"Invalid Service {service}") + return pack_cmd_ctrl_to_prompted_mode(tc_queue=service_queue) + if service == CustomServiceList.SCEX.value: + pass + LOGGER.warning("Invalid Service !") def create_total_tc_queue_user() -> TcQueueT: diff --git a/spacepackets b/spacepackets index 7fdf07f..2dbd8f6 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 7fdf07f2a1a93bcad0bdda32acd48b2a600cd861 +Subproject commit 2dbd8f680351cdadc8114b1b80cfa155ac75c25a diff --git a/tmtccmd b/tmtccmd index 4de1bb0..8f69fa2 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 4de1bb09c97b30fa64260c9f470537d23456c810 +Subproject commit 8f69fa22c7557369569372ee22058f29d4fe6b56 -- 2.43.0 From 67500e88edbf684e79775333c69735ac88b31fd0 Mon Sep 17 00:00:00 2001 From: Irini Kosmidou Date: Tue, 21 Jun 2022 16:49:11 +0200 Subject: [PATCH 02/17] scex command init --- .run/Ping_Command.run.xml | 4 ++-- .run/SCEX Ping.run.xml | 24 ++++++++++++++++++++++ config/object_ids.py | 1 + pus_tc/cmd_definitions.py | 2 ++ pus_tc/devs/scex.py | 42 +++++++++++++++++++++++++++++++++++++++ pus_tc/tc_packer_hook.py | 8 +++++--- pus_tm/factory_hook.py | 2 +- tmtccmd | 2 +- 8 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 .run/SCEX Ping.run.xml diff --git a/.run/Ping_Command.run.xml b/.run/Ping_Command.run.xml index c62c2fb..a5e168f 100644 --- a/.run/Ping_Command.run.xml +++ b/.run/Ping_Command.run.xml @@ -1,5 +1,5 @@ - +