From d968bb9125c15d293264caf216786dca6c990e92 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 1 Oct 2021 10:55:56 +0200 Subject: [PATCH 01/11] updated includes --- config/custom_hooks.py | 2 +- pus_tc/heater.py | 2 +- pus_tc/imtq.py | 2 +- pus_tc/pdu1.py | 2 +- pus_tc/ploc_memory_dumper.py | 2 +- pus_tc/ploc_mpsoc.py | 2 +- pus_tc/ploc_supervisor.py | 2 +- pus_tc/ploc_upater.py | 2 +- pus_tc/rad_sensor.py | 2 +- pus_tc/reaction_wheels.py | 2 +- pus_tc/service_200_mode.py | 2 +- pus_tc/star_tracker.py | 2 +- pus_tc/tmp1075.py | 2 +- pus_tm/factory_hook.py | 2 +- tmtccmd | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/custom_hooks.py b/config/custom_hooks.py index 35405b4..1e49474 100644 --- a/config/custom_hooks.py +++ b/config/custom_hooks.py @@ -3,7 +3,7 @@ @details Template configuration file. Copy this folder to the TMTC commander root and adapt it to your needs. """ -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand def command_preparation_hook() -> PusTelecommand: diff --git a/pus_tc/heater.py b/pus_tc/heater.py index 18adf80..795ebbb 100644 --- a/pus_tc/heater.py +++ b/pus_tc/heater.py @@ -7,7 +7,7 @@ """ from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class SwitchNumbers: diff --git a/pus_tc/imtq.py b/pus_tc/imtq.py index 943157c..f459f16 100644 --- a/pus_tc/imtq.py +++ b/pus_tc/imtq.py @@ -8,7 +8,7 @@ from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py index e02bd58..0a713cc 100644 --- a/pus_tc/pdu1.py +++ b/pus_tc/pdu1.py @@ -7,7 +7,7 @@ import enum from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from gomspace.gomspace_common import * from pus_tc.p60dock import P60DockConfigTable from gomspace.gomspace_pdu_definitions import * diff --git a/pus_tc/ploc_memory_dumper.py b/pus_tc/ploc_memory_dumper.py index 60a4271..4618c44 100644 --- a/pus_tc/ploc_memory_dumper.py +++ b/pus_tc/ploc_memory_dumper.py @@ -11,7 +11,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class ActionIds: diff --git a/pus_tc/ploc_mpsoc.py b/pus_tc/ploc_mpsoc.py index d7a2977..8c45df1 100644 --- a/pus_tc/ploc_mpsoc.py +++ b/pus_tc/ploc_mpsoc.py @@ -11,7 +11,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class PlocTestProcedure: diff --git a/pus_tc/ploc_supervisor.py b/pus_tc/ploc_supervisor.py index 31f9627..9fff345 100644 --- a/pus_tc/ploc_supervisor.py +++ b/pus_tc/ploc_supervisor.py @@ -11,7 +11,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from tmtccmd.utility.logger import get_console_logger LOGGER = get_console_logger() diff --git a/pus_tc/ploc_upater.py b/pus_tc/ploc_upater.py index 6721013..31329d0 100644 --- a/pus_tc/ploc_upater.py +++ b/pus_tc/ploc_upater.py @@ -12,7 +12,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand latchup_id_dict = { diff --git a/pus_tc/rad_sensor.py b/pus_tc/rad_sensor.py index a462c13..9214484 100644 --- a/pus_tc/rad_sensor.py +++ b/pus_tc/rad_sensor.py @@ -9,7 +9,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data diff --git a/pus_tc/reaction_wheels.py b/pus_tc/reaction_wheels.py index 0c48491..c97760d 100644 --- a/pus_tc/reaction_wheels.py +++ b/pus_tc/reaction_wheels.py @@ -9,7 +9,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data diff --git a/pus_tc/service_200_mode.py b/pus_tc/service_200_mode.py index 4bc8cdb..08faad4 100644 --- a/pus_tc/service_200_mode.py +++ b/pus_tc/service_200_mode.py @@ -6,7 +6,7 @@ @date 02.05.2020 """ from tmtccmd.config.definitions import QueueCommands -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.packer import TcQueueT from tmtccmd.tc.service_200_mode import pack_mode_data from config.object_ids import TEST_DEVICE_ID diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py index 8edb2ed..e11fab1 100644 --- a/pus_tc/star_tracker.py +++ b/pus_tc/star_tracker.py @@ -10,7 +10,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class StarTrackerActionIds: diff --git a/pus_tc/tmp1075.py b/pus_tc/tmp1075.py index 48b2d65..6e8b65d 100644 --- a/pus_tc/tmp1075.py +++ b/pus_tc/tmp1075.py @@ -8,7 +8,7 @@ from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py index 0bdca81..3e80940 100644 --- a/pus_tm/factory_hook.py +++ b/pus_tm/factory_hook.py @@ -4,7 +4,7 @@ it to your needs. """ from tmtccmd.tm.service_8_functional_cmd import Service8TM -from tmtccmd.ecss.tm import PusTelemetry +from spacepackets.ecss.tm import PusTelemetry from tmtccmd.utility.logger import get_console_logger from tmtccmd.tm.service_1_verification import Service1TM diff --git a/tmtccmd b/tmtccmd index 6e6e5d5..be3c04d 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 6e6e5d56a0155f00508c8da506acc6891431ff2c +Subproject commit be3c04d04559d10923d9e3e3582d3eb767873913 From 28ab1316ce9eb80edebfbc8e272e07194c3957a2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 2 Oct 2021 12:17:21 +0200 Subject: [PATCH 02/11] added spacepackets submodule --- .gitmodules | 3 +++ spacepackets | 1 + tmtccmd | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 spacepackets diff --git a/.gitmodules b/.gitmodules index 8c20967..477ffc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = tmtccmd url = https://github.com/robamu-org/tmtccmd.git +[submodule "spacepackets"] + path = spacepackets + url = https://github.com/robamu-org/py-spacepackets.git diff --git a/spacepackets b/spacepackets new file mode 160000 index 0000000..a84d6c5 --- /dev/null +++ b/spacepackets @@ -0,0 +1 @@ +Subproject commit a84d6c58b3edabd19b24669fd24340d5760de355 diff --git a/tmtccmd b/tmtccmd index be3c04d..6bba4fd 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit be3c04d04559d10923d9e3e3582d3eb767873913 +Subproject commit 6bba4fda3740fadf65fbd3b7d72e6ca01f996b91 From 38e00b405a28a98457cf850b08ccf27e3c64bbec Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 2 Oct 2021 13:32:13 +0200 Subject: [PATCH 03/11] bumped submodules --- spacepackets | 2 +- tmtccmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spacepackets b/spacepackets index a84d6c5..9d4752f 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit a84d6c58b3edabd19b24669fd24340d5760de355 +Subproject commit 9d4752f238ddac5e0ef28b7c93e9f9b114fc17ec diff --git a/tmtccmd b/tmtccmd index 6bba4fd..e1de131 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 6bba4fda3740fadf65fbd3b7d72e6ca01f996b91 +Subproject commit e1de13164db171a10e4744e85bf798502a250a0d From 90865496f578647e96d6176308b3fbc5a1734a4b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Oct 2021 01:33:03 +0200 Subject: [PATCH 04/11] changes in submodules --- pus_tc/acs.py | 3 ++- pus_tc/tc_packer_hook.py | 6 +++--- pus_tm/factory_hook.py | 8 ++++---- spacepackets | 2 +- tmtccmd | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pus_tc/acs.py b/pus_tc/acs.py index 66f5ad6..4edd3bd 100644 --- a/pus_tc/acs.py +++ b/pus_tc/acs.py @@ -1,6 +1,7 @@ import enum from tmtccmd.tc.definitions import TcQueueT -from tmtccmd.pus.service_list import PusServices +from spacepackets.ecss.definitions import PusServices + from tmtccmd.tc.service_200_mode import pack_mode_data, Modes from tmtccmd.tc.packer import PusTelecommand from config.object_ids import MGM_0_HANDLER_ID, MGM_1_HANDLER_ID, MGM_2_HANDLER_ID, MGM_3_HANDLER_ID diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py index 4eef894..3c11be7 100644 --- a/pus_tc/tc_packer_hook.py +++ b/pus_tc/tc_packer_hook.py @@ -8,7 +8,7 @@ from tmtccmd.config.definitions import CoreServiceList from tmtccmd.utility.logger import get_console_logger from tmtccmd.tc.definitions import TcQueueT from tmtccmd.tc.service_5_event import pack_generic_service5_test_into -from tmtccmd.tc.service_17_test import pack_service17_ping_command +from tmtccmd.pus.service_17_test import pack_service_17_ping_command from pus_tc.service_200_mode import pack_service200_test_into from pus_tc.p60dock import pack_p60dock_test_into @@ -42,7 +42,7 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu if service == CoreServiceList.SERVICE_5.value: return pack_generic_service5_test_into(tc_queue=service_queue) if service == CoreServiceList.SERVICE_17.value: - return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple()) + return service_queue.appendleft(pack_service_17_ping_command(ssc=1700).pack_command_tuple()) if service == CoreServiceList.SERVICE_200.value: return pack_service200_test_into(tc_queue=service_queue) if service == CustomServiceList.P60DOCK.value: @@ -125,5 +125,5 @@ def create_total_tc_queue_user() -> TcQueueT: os.mkdir("log") tc_queue = deque() pack_generic_service5_test_into(tc_queue) - tc_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple()) + tc_queue.appendleft(pack_service_17_ping_command(ssc=1700).pack_command_tuple()) return tc_queue diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py index 3e80940..646744f 100644 --- a/pus_tm/factory_hook.py +++ b/pus_tm/factory_hook.py @@ -7,10 +7,10 @@ from tmtccmd.tm.service_8_functional_cmd import Service8TM from spacepackets.ecss.tm import PusTelemetry from tmtccmd.utility.logger import get_console_logger -from tmtccmd.tm.service_1_verification import Service1TM +from tmtccmd.pus.service_1_verification import Service1TMExtended +from tmtccmd.pus.service_17_test import Service17TMExtended from tmtccmd.tm.service_3_housekeeping import Service3TM from tmtccmd.tm.service_5_event import Service5TM -from tmtccmd.tm.service_17_test import Service17TM from tmtccmd.utility.tmtc_printer import TmTcPrinter from config.definitions import PUS_APID @@ -27,7 +27,7 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter): service_type = raw_tm_packet[7] tm_packet = None if service_type == 1: - tm_packet = Service1TM.unpack(raw_telemetry=raw_tm_packet) + tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm_packet) if service_type == 3: tm_packet = Service3TM.unpack(raw_telemetry=raw_tm_packet, custom_hk_handling=False) if service_type == 5: @@ -35,7 +35,7 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter): if service_type == 8: tm_packet = Service8TM.unpack(raw_telemetry=raw_tm_packet) if service_type == 17: - tm_packet = Service17TM.unpack(raw_telemetry=raw_tm_packet) + tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet) if tm_packet is None: LOGGER.info(f'The service {service_type} is not implemented in Telemetry Factory') tm_packet = PusTelemetry.unpack(raw_telemetry=raw_tm_packet) diff --git a/spacepackets b/spacepackets index 9d4752f..309f841 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 9d4752f238ddac5e0ef28b7c93e9f9b114fc17ec +Subproject commit 309f841ce3e6f86ccbc799e6bf392ae1974e25e3 diff --git a/tmtccmd b/tmtccmd index e1de131..b4316ce 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit e1de13164db171a10e4744e85bf798502a250a0d +Subproject commit b4316ce352d77ba4f969f8c3350bd3b7b5d03260 From 47dbb62ebb03441766f24ee9bf98c0c13c387349 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Oct 2021 09:58:09 +0200 Subject: [PATCH 05/11] submodule updates --- spacepackets | 2 +- tmtccmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spacepackets b/spacepackets index 309f841..6d5f65c 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 309f841ce3e6f86ccbc799e6bf392ae1974e25e3 +Subproject commit 6d5f65c773094b37267850d5836443684954d1e7 diff --git a/tmtccmd b/tmtccmd index b4316ce..2dc96d0 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit b4316ce352d77ba4f969f8c3350bd3b7b5d03260 +Subproject commit 2dc96d012fd27615aa6efc2af98f6bcdbe7bf244 From ee780738f9f02d027006567415f53f306aff56fb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Oct 2021 10:03:28 +0200 Subject: [PATCH 06/11] fixed for updated core --- config/globals_config.py | 2 +- tmtccmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/globals_config.py b/config/globals_config.py index 3fc9b35..3872094 100644 --- a/config/globals_config.py +++ b/config/globals_config.py @@ -26,7 +26,7 @@ class CustomGlobalIds(enum.Enum): def set_globals_pre_args_parsing(gui: bool = False): set_default_globals_pre_args_parsing( - gui=gui, apid=PUS_APID, com_if_id=CoreComInterfaces.TCPIP_UDP.value) + gui=gui, tc_apid=PUS_APID, tm_apid=PUS_APID, com_if_id=CoreComInterfaces.TCPIP_UDP.value) def add_globals_post_args_parsing(args: argparse.Namespace, json_cfg_path: str): diff --git a/tmtccmd b/tmtccmd index 2dc96d0..762377c 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 2dc96d012fd27615aa6efc2af98f6bcdbe7bf244 +Subproject commit 762377c5855bcb267d3c9a4dd3409aa05b986f34 From 12a4a52d547a68ec7c5139dab957c2d806ab972a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Oct 2021 10:06:40 +0200 Subject: [PATCH 07/11] printing out version string of spacepackets --- tmtc_client_cli.py | 4 +++- tmtc_client_gui.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tmtc_client_cli.py b/tmtc_client_cli.py index d3f5b15..3fc7ded 100755 --- a/tmtc_client_cli.py +++ b/tmtc_client_cli.py @@ -35,6 +35,7 @@ from pus_tm.factory_hook import ccsds_tm_handler try: from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler from tmtccmd.ccsds.handler import CcsdsTmHandler + import spacepackets except ImportError as error: run_tmtc_commander = None initialize_tmtc_commander = None @@ -46,7 +47,8 @@ except ImportError as error: def main(): hook_obj = EiveHookObject() - print(f"-- eive tmtc version {__version__}") + print(f'-- eive tmtc version {__version__} --') + print(f'-- spacepackets version {spacepackets.__version__} --') initialize_tmtc_commander(hook_object=hook_obj) ccsds_handler = CcsdsTmHandler() ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50) diff --git a/tmtc_client_gui.py b/tmtc_client_gui.py index ddcfa07..09d363c 100755 --- a/tmtc_client_gui.py +++ b/tmtc_client_gui.py @@ -35,6 +35,7 @@ from pus_tm.factory_hook import ccsds_tm_handler try: from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler from tmtccmd.ccsds.handler import CcsdsTmHandler + import spacepackets except ImportError as error: run_tmtc_commander = None initialize_tmtc_commander = None @@ -47,6 +48,7 @@ except ImportError as error: def main(): hook_obj = EiveHookObject() print(f"-- eive tmtc version {__version__}") + print(f'-- spacepackets version {spacepackets.__version__} --') initialize_tmtc_commander(hook_object=hook_obj) ccsds_handler = CcsdsTmHandler() ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50) From ba866a5f0aead78945323b5fe2bfa2a3d3e41f71 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 4 Oct 2021 11:30:30 +0200 Subject: [PATCH 08/11] updated submodules --- .../Unittests_in_spacepackets.xml | 18 ++++++++++++++++++ .../runConfigurations/Unittests_in_tmtccmd.xml | 18 ++++++++++++++++++ spacepackets | 2 +- tmtccmd | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .idea/runConfigurations/Unittests_in_spacepackets.xml create mode 100644 .idea/runConfigurations/Unittests_in_tmtccmd.xml diff --git a/.idea/runConfigurations/Unittests_in_spacepackets.xml b/.idea/runConfigurations/Unittests_in_spacepackets.xml new file mode 100644 index 0000000..bf17647 --- /dev/null +++ b/.idea/runConfigurations/Unittests_in_spacepackets.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Unittests_in_tmtccmd.xml b/.idea/runConfigurations/Unittests_in_tmtccmd.xml new file mode 100644 index 0000000..f6549f0 --- /dev/null +++ b/.idea/runConfigurations/Unittests_in_tmtccmd.xml @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/spacepackets b/spacepackets index 6d5f65c..7346249 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 6d5f65c773094b37267850d5836443684954d1e7 +Subproject commit 7346249c0d5c719da0bb77539200f7734902a3e1 diff --git a/tmtccmd b/tmtccmd index 762377c..b6be235 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 762377c5855bcb267d3c9a4dd3409aa05b986f34 +Subproject commit b6be235965a7c76f09d41b4069ee81c82a56f902 From 6d442f47e657a8e5e1d227eb001e3e4f743167ba Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Oct 2021 00:52:12 +0200 Subject: [PATCH 09/11] slight adaption of tmtccmd --- config/hook_implementations.py | 2 +- spacepackets | 2 +- tmtccmd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/hook_implementations.py b/config/hook_implementations.py index 4770d89..d80ab19 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -44,7 +44,7 @@ class EiveHookObject(TmTcHookBase): 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 + json_cfg_path=self.get_json_config_file_path(), space_packet_ids=(0x0865,) ) def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int): diff --git a/spacepackets b/spacepackets index 7346249..f29df6c 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit 7346249c0d5c719da0bb77539200f7734902a3e1 +Subproject commit f29df6c9e84e4f33c5d1d3b03ae84c961a34c76d diff --git a/tmtccmd b/tmtccmd index b6be235..1dc7266 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit b6be235965a7c76f09d41b4069ee81c82a56f902 +Subproject commit 1dc7266d5f40597357bb18b3291bcb6dafd7726a From 706f79a1f2cc7c909fe995e8473ff148f2578083 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Oct 2021 01:28:12 +0200 Subject: [PATCH 10/11] submodule updates --- spacepackets | 2 +- tmtccmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spacepackets b/spacepackets index f29df6c..cb2f00e 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit f29df6c9e84e4f33c5d1d3b03ae84c961a34c76d +Subproject commit cb2f00e778e7f23350213392933af264929957a7 diff --git a/tmtccmd b/tmtccmd index 1dc7266..544e8cd 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 1dc7266d5f40597357bb18b3291bcb6dafd7726a +Subproject commit 544e8cd2ebe5a3b4395d9a95949e8fef2e60cf4f From 3b2caa7326042b18ee921fdd96003acefb547b50 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Oct 2021 12:23:28 +0200 Subject: [PATCH 11/11] update spacepackets and tmtccmd --- spacepackets | 2 +- tmtccmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spacepackets b/spacepackets index cb2f00e..b5068ce 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit cb2f00e778e7f23350213392933af264929957a7 +Subproject commit b5068ceb033b6a857d463d6d91aa8cbdf07913e9 diff --git a/tmtccmd b/tmtccmd index 544e8cd..a7299e7 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 544e8cd2ebe5a3b4395d9a95949e8fef2e60cf4f +Subproject commit a7299e7a68936ce7fa1fdf004a6c2dd2c8073711