eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

use new decorator to add tmtc definitions now

Browse Source
This commit is contained in:
Robin Müller
2022-08-12 10:18:21 +02:00
parent 26a886b5a2
commit 8625a98eb9
15 changed files with 84 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pus_tc/system/core.py
View File

@ -1,13 +1,13 @@
import enum
from config.definitions import CustomServiceList
from tmtccmd.config import TmTcDefWrapper
from tmtccmd.config import TmtcDefinitionWrapper
from tmtccmd.tc import DefaultPusQueueHelper
from tmtccmd.tc.pus_8_funccmd import generate_action_command
from tmtccmd.logging import get_console_logger
from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
from tmtccmd.config.tmtc import OpCodeEntry, register_tmtc_definitions
from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
from config.object_ids import CORE_CONTROLLER_ID
@ -67,8 +67,8 @@ class Copy(enum.IntEnum):
NONE = 2
@register_tmtc_definitions
def add_core_controller_definitions(defs: TmTcDefWrapper):
@tmtc_definitions_provider
def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
oce = OpCodeEntry()
oce.add(keys=OpCodes.REBOOT_XSC, info=Info.REBOOT_XSC)
oce.add(keys=OpCodes.REBOOT_XSC, info=Info.REBOOT_XSC)

8
pus_tc/system/proc.py
View File

@ -7,8 +7,8 @@ from typing import List
from config.definitions import CustomServiceList
from config.object_ids import get_object_ids
from pus_tc.system.tcs import pack_tcs_sys_commands
from tmtccmd.config import TmTcDefWrapper, OpCodeEntry
from tmtccmd.config.tmtc import register_tmtc_definitions
from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
from tmtccmd.config.tmtc import tmtc_definitions_provider
from tmtccmd.tc import DefaultPusQueueHelper
from tmtccmd.tc.pus_11_tc_sched import (
@ -127,8 +127,8 @@ def generic_print(q: DefaultPusQueueHelper, info: dict):
q.add_log_cmd(f"Executing {info[1]} Procedure (OpCodes: {info[0]})")
@register_tmtc_definitions
def add_proc_cmds(defs: TmTcDefWrapper):
@tmtc_definitions_provider
def add_proc_cmds(defs: TmtcDefinitionWrapper):
oce = OpCodeEntry()
for proc_entry in PROC_INFO_DICT.values():
oce.add(keys=proc_entry[0], info=proc_entry[1])

8
pus_tc/system/tcs.py
View File

@ -1,8 +1,8 @@
import enum
from config.definitions import CustomServiceList
from tmtccmd.config import TmTcDefWrapper, OpCodeEntry
from tmtccmd.config.tmtc import register_tmtc_definitions
from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
from tmtccmd.config.tmtc import tmtc_definitions_provider
from tmtccmd.tc import DefaultPusQueueHelper
from tmtccmd.tc.pus_200_fsfw_modes import Modes
from tmtccmd.tc.pus_3_fsfw_hk import (
@ -33,8 +33,8 @@ class SetIds(enum.IntEnum):
SUS_TEMP_SENSORS = 2
@register_tmtc_definitions
def add_tcs_cmds(defs: TmTcDefWrapper):
@tmtc_definitions_provider
def add_tcs_cmds(defs: TmtcDefinitionWrapper):
oce = OpCodeEntry()
oce.add(
keys=OpCodes.TCS_BOARD_ASS_NORMAL,