fsfw/fsfw_example_public
Archived
13
1
Fork 1
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

added updates manually

Browse Source
This commit is contained in:
Robin Müller
2021-04-29 15:58:00 +02:00
parent 4f6fe6959f
commit 106bdbf233
30 changed files with 203 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tmtc/config/hook_base.py
View File

@ -21,9 +21,9 @@ class FsfwHookBase(TmTcHookBase):
from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing
set_default_globals_pre_args_parsing(gui=gui, apid=0xef)
def add_globals_post_args_parsing(self, args: argparse.Namespace):
def add_globals_post_args_parsing(self, args: argparse.Namespace, json_cfg_path: str = ""):
from tmtccmd.defaults.globals_setup import set_default_globals_post_args_parsing
set_default_globals_post_args_parsing(args=args)
set_default_globals_post_args_parsing(args=args, json_cfg_path=json_cfg_path)
def assign_communication_interface(self, com_if: int, tmtc_printer: TmTcPrinter) -> \
Union[CommunicationInterface, None]:
@ -45,7 +45,7 @@ class FsfwHookBase(TmTcHookBase):
from pus_tm.factory_hook import tm_user_factory_hook
return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)
def set_object_ids(self) -> Dict[int, bytearray]:
def set_object_ids(self) -> Dict[bytes, list]:
from config.object_ids import set_object_ids
return set_object_ids()
@ -60,7 +60,7 @@ class FsfwHookBase(TmTcHookBase):
@staticmethod
def handle_service_3_housekeeping(
object_id: int, set_id: int, hk_data: bytearray, service3_packet: Service3Base
object_id: bytearray, set_id: int, hk_data: bytearray, service3_packet: Service3Base
) -> Tuple[list, list, bytearray, int]:
from pus_tm.service_3_hk_handling import service_3_hk_handling
return service_3_hk_handling(
@ -70,5 +70,8 @@ class FsfwHookBase(TmTcHookBase):
def command_preparation_hook(self) -> Union[None, PusTelecommand]:
pass
def set_json_config_file_path(self) -> str:
return "config/tmtc_config.json"