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

Merge branch 'master' into gaisser_notice_file

Browse Source
This commit is contained in:
Steffen Gaisser 2021-04-29 20:03:21 +02:00
commit 551017dac0
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_hosted/fsfwconfig/FSFWConfig.h
View File

@ -17,7 +17,7 @@
#define FSFW_DISABLE_PRINTOUT 0
#endif
#define FSFW_USE_PUS_C_TELEMETRY 1
#define FSFW_USE_PUS_C_TELEMETRY 0
//! Can be used to disable the ANSI color sequences for C stdio.
#define FSFW_COLORED_OUTPUT 1

2
fsfw

@ -1 +1 @@
Subproject commit 9f8373977179b79fabd5d56bc999d8cac2078d8c
Subproject commit 097244bf8b429d1b107343a3dbd77fa537a9c86d

2
fsfw_hal

@ -1 +1 @@
Subproject commit a85c01465bc8687773676f05c5e7eb8af54b25ff
Subproject commit a4f5e783e1d0452321559c1d612ef0add868d47c

3
tmtc/config/hook_base.py
View File

@ -4,6 +4,7 @@ from typing import Dict, Union, Tuple
from tmtccmd.core.hook_base import TmTcHookBase
from tmtccmd.ecss.tc import PusTelecommand
from tmtccmd.pus_tm.service_3_base import Service3Base
from tmtccmd.ecss.conf import PusVersion
class FsfwHookBase(TmTcHookBase):
@ -19,7 +20,7 @@ class FsfwHookBase(TmTcHookBase):
def add_globals_pre_args_parsing(self, gui: bool = False):
from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing
set_default_globals_pre_args_parsing(gui=gui, apid=0xef)
set_default_globals_pre_args_parsing(gui=gui, apid=0xef, pus_tm_version=PusVersion.PUS_A)
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