From 1f5baabf312eb7edc5b0449d443dd5f73054dfa2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 18 Aug 2022 15:52:06 +0200 Subject: [PATCH] moved some more modules --- pus_tc/cmd_definitions.py | 25 ------------ pus_tc/procedure_packer.py | 6 +-- pus_tm/action_reply_handler.py | 2 +- {pus_tc/devs => tmtc}/ploc_memory_dumper.py | 10 +++++ {pus_tc/devs => tmtc}/ploc_mpsoc.py | 43 +++++++++++++++++++-- tmtc/ploc_supervisor.py | 6 +-- 6 files changed, 53 insertions(+), 39 deletions(-) rename {pus_tc/devs => tmtc}/ploc_memory_dumper.py (74%) rename {pus_tc/devs => tmtc}/ploc_mpsoc.py (86%) diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py index 11f1f3e..f9fe83e 100644 --- a/pus_tc/cmd_definitions.py +++ b/pus_tc/cmd_definitions.py @@ -205,31 +205,6 @@ def add_imtq_cmds(defs: TmtcDefinitionWrapper): defs.add_service(CustomServiceList.IMTQ.value, "IMQT Device", oce) -@tmtc_definitions_provider -def add_ploc_mpsoc_cmds(defs: TmtcDefinitionWrapper): - oce = OpCodeEntry() - oce.add("0", "Ploc MPSoC: Set mode off") - oce.add("1", "Ploc MPSoC: Set mode on") - oce.add("2", "Ploc MPSoC: Set mode normal") - oce.add("3", "Ploc MPSoC: Memory write") - oce.add("4", "Ploc MPSoC: Memory read") - oce.add("5", "Ploc MPSoC: Flash write") - oce.add("6", "Ploc MPSoC: Flash delete") - oce.add("7", "Ploc MPSoC: Replay start") - oce.add("8", "Ploc MPSoC: Replay stop") - oce.add("9", "Ploc MPSoC: Downlink pwr on") - oce.add("10", "Ploc MPSoC: Downlink pwr off") - oce.add("11", "Ploc MPSoC: Replay write sequence") - oce.add("12", "Ploc MPSoC: OBSW reset sequence count") - oce.add("13", "Ploc MPSoC: Read DEADBEEF address") - oce.add("14", "Ploc MPSoC: Mode replay") - oce.add("15", "Ploc MPSoC: Mode idle") - oce.add("16", "Ploc MPSoC: Tc cam command send") - oce.add("17", "Ploc MPSoC: Set UART TX tristate") - oce.add("18", "Ploc MPSoC: Relesase UART TX") - defs.add_service(CustomServiceList.PLOC_MPSOC.value, "Ploc MPSoC", oce) - - @tmtc_definitions_provider def add_system_cmds(defs: TmtcDefinitionWrapper): from pus_tc.system.acs import AcsOpCodes, SusOpCodes diff --git a/pus_tc/procedure_packer.py b/pus_tc/procedure_packer.py index 5271163..cf79831 100644 --- a/pus_tc/procedure_packer.py +++ b/pus_tc/procedure_packer.py @@ -30,17 +30,16 @@ from pus_tc.devs.acu import pack_acu_commands from pus_tc.devs.solar_array_deployment import pack_solar_array_deployment_test_into from pus_tc.devs.imtq import pack_imtq_test_into from pus_tc.devs.tmp1075 import pack_tmp1075_test_into -from pus_tc.devs.ploc_mpsoc import pack_ploc_mpsoc_commands +from tmtc.ploc_mpsoc import pack_ploc_mpsoc_commands from pus_tc.devs.heater import pack_heater_cmds from pus_tc.devs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into -from pus_tc.devs.ploc_memory_dumper import pack_ploc_memory_dumper_cmd +from tmtc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd from pus_tc.devs.ccsds_handler import pack_ccsds_handler_test from pus_tc.system.core import pack_core_commands from pus_tc.devs.star_tracker import pack_star_tracker_commands from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command from pus_tc.devs.gps import pack_gps_command -from pus_tc.system.time import pack_set_current_time_ascii_command from pus_tc.system.acs import pack_acs_command, pack_sus_cmds from pus_tc.devs.plpcdu import pack_pl_pcdu_commands from pus_tc.devs.str_img_helper import pack_str_img_helper_command @@ -62,7 +61,6 @@ from config.object_ids import ( RW3_ID, RW4_ID, RAD_SENSOR_ID, - PLOC_SUPV_ID, STAR_TRACKER_ID, PLOC_MEMORY_DUMPER_ID, CCSDS_HANDLER_ID, diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py index 8f1f21c..3497912 100644 --- a/pus_tm/action_reply_handler.py +++ b/pus_tm/action_reply_handler.py @@ -1,7 +1,7 @@ import struct from config.object_ids import * from pus_tc.devs.imtq import ImtqActionIds -from pus_tc.devs.ploc_mpsoc import PlocReplyIds +from tmtc.ploc_mpsoc import PlocReplyIds from tmtc.ploc_supervisor import SupvActionIds from pus_tc.devs.star_tracker import StarTrackerActionIds from gomspace.gomspace_common import GomspaceDeviceActionIds diff --git a/pus_tc/devs/ploc_memory_dumper.py b/tmtc/ploc_memory_dumper.py similarity index 74% rename from pus_tc/devs/ploc_memory_dumper.py rename to tmtc/ploc_memory_dumper.py index e913e18..d99dafc 100644 --- a/pus_tc/devs/ploc_memory_dumper.py +++ b/tmtc/ploc_memory_dumper.py @@ -8,7 +8,10 @@ """ import struct +from config.definitions import CustomServiceList from spacepackets.ecss.tc import PusTelecommand +from tmtccmd.config import TmtcDefinitionWrapper +from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.util import ObjectIdU32 @@ -17,6 +20,13 @@ class ActionIds: DUMP_MRAM = 1 +@tmtc_definitions_provider +def add_ploc_mem_dumper_cmds(defs: TmtcDefinitionWrapper): + oce = OpCodeEntry() + oce.add("0", "PLOC Memory Dumper: MRAM dump") + defs.add_service(CustomServiceList.PLOC_MEMORY_DUMPER, "PLOC Memory Dumper", oce) + + def pack_ploc_memory_dumper_cmd( object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str ): diff --git a/pus_tc/devs/ploc_mpsoc.py b/tmtc/ploc_mpsoc.py similarity index 86% rename from pus_tc/devs/ploc_mpsoc.py rename to tmtc/ploc_mpsoc.py index 6777d0b..3eb4322 100644 --- a/pus_tc/devs/ploc_mpsoc.py +++ b/tmtc/ploc_mpsoc.py @@ -9,9 +9,17 @@ import struct import enum +from config.definitions import CustomServiceList +from config.object_ids import get_object_ids, PLOC_MPSOC_ID +from tmtccmd.config.tmtc import ( + tmtc_definitions_provider, + OpCodeEntry, + TmtcDefinitionWrapper, +) from tmtccmd.logging import get_console_logger from spacepackets.ecss.tc import PusTelecommand -from tmtccmd.tc import DefaultPusQueueHelper +from tmtccmd.tc import DefaultPusQueueHelper, service_provider +from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.util import ObjectIdU32 from utility.input_helper import InputHelper from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes @@ -66,9 +74,36 @@ class PlocReplyIds(enum.IntEnum): TM_CAM_CMD_RPT = 19 -def pack_ploc_mpsoc_commands( - object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str -): +@tmtc_definitions_provider +def add_ploc_mpsoc_cmds(defs: TmtcDefinitionWrapper): + oce = OpCodeEntry() + oce.add("0", "Ploc MPSoC: Set mode off") + oce.add("1", "Ploc MPSoC: Set mode on") + oce.add("2", "Ploc MPSoC: Set mode normal") + oce.add("3", "Ploc MPSoC: Memory write") + oce.add("4", "Ploc MPSoC: Memory read") + oce.add("5", "Ploc MPSoC: Flash write") + oce.add("6", "Ploc MPSoC: Flash delete") + oce.add("7", "Ploc MPSoC: Replay start") + oce.add("8", "Ploc MPSoC: Replay stop") + oce.add("9", "Ploc MPSoC: Downlink pwr on") + oce.add("10", "Ploc MPSoC: Downlink pwr off") + oce.add("11", "Ploc MPSoC: Replay write sequence") + oce.add("12", "Ploc MPSoC: OBSW reset sequence count") + oce.add("13", "Ploc MPSoC: Read DEADBEEF address") + oce.add("14", "Ploc MPSoC: Mode replay") + oce.add("15", "Ploc MPSoC: Mode idle") + oce.add("16", "Ploc MPSoC: Tc cam command send") + oce.add("17", "Ploc MPSoC: Set UART TX tristate") + oce.add("18", "Ploc MPSoC: Relesase UART TX") + defs.add_service(CustomServiceList.PLOC_MPSOC.value, "Ploc MPSoC", oce) + + +@service_provider(CustomServiceList.PLOC_MPSOC) +def pack_ploc_mpsoc_commands(p: ServiceProviderParams): + object_id = get_object_ids().get(PLOC_MPSOC_ID) + q = p.queue_helper + op_code = p.op_code q.add_log_cmd( f"Generate command for PLOC MPSoC with object id: {object_id.as_hex_string}" ) diff --git a/tmtc/ploc_supervisor.py b/tmtc/ploc_supervisor.py index 138d227..821130d 100644 --- a/tmtc/ploc_supervisor.py +++ b/tmtc/ploc_supervisor.py @@ -137,11 +137,7 @@ class Info(str, enum.Enum): @tmtc_definitions_provider def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper): - oce = OpCodeEntry() - oce.add("0", "PLOC Memory Dumper: MRAM dump") - defs.add_service( - CustomServiceList.PLOC_MEMORY_DUMPER.value, "PLOC Memory Dumper", oce - ) + oce = OpCodeEntry() oce.add(OpCodes.OFF, Info.OFF) oce.add(OpCodes.ON, Info.ON)