fsfw/fsfw-example-hosted
fsfw/fsfw-example-hosted
12
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-hosted into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2021-10-18 17:46:35 +02:00
commit d5c90151f9
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
6 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -13,3 +13,6 @@
[submodule "tmtc/common_tmtc"] [submodule "tmtc/common_tmtc"]
path = tmtc/common_tmtc path = tmtc/common_tmtc
url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-tmtc-common.git url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-tmtc-common.git
[submodule "tmtc/spacepackets"]
path = tmtc/spacepackets
url = https://github.com/robamu-org/py-spacepackets.git

24
tmtc/.idea/runConfigurations/PUS_3_One_HK.xml generated Normal file
View File

@ -0,0 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="PUS 3 One HK" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
<module name="tmtc" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
<option name="PARAMETERS" value="-s 3 -o 1 -l" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
</component>

2
tmtc/common_tmtc

@ -1 +1 @@
Subproject commit 22ea3eea9278c3f73c0f804dc3618ea004fe224b Subproject commit 99ca187b50ad9cd6ee1ba4bcbf9db981bed653ae

1
tmtc/spacepackets Submodule

@ -0,0 +1 @@
Subproject commit 38d74744a759a0a89d5edf5155b95728ca96b3d2

3
tmtc/tmtc_client_cli.py
View File

@ -28,12 +28,14 @@ limitations under the License.
""" """
import sys import sys
from spacepackets.log import set_custom_console_logger_name
from common_tmtc.config.hook_implementation import FsfwHookBase from common_tmtc.config.hook_implementation import FsfwHookBase
from common_tmtc.config.definitions import PUS_APID from common_tmtc.config.definitions import PUS_APID
from common_tmtc.pus_tm.factory_hook import ccsds_tm_handler from common_tmtc.pus_tm.factory_hook import ccsds_tm_handler
try: try:
from tmtccmd.runner import run_tmtc_commander, initialize_tmtc_commander, add_ccsds_handler from tmtccmd.runner import run_tmtc_commander, initialize_tmtc_commander, add_ccsds_handler
from tmtccmd.ccsds.handler import CcsdsTmHandler from tmtccmd.ccsds.handler import CcsdsTmHandler
from tmtccmd.utility.logger import TMTC_LOGGER_NAME
except ImportError as error: except ImportError as error:
run_tmtc_commander = None run_tmtc_commander = None
initialize_tmtc_commander = None initialize_tmtc_commander = None
@ -49,6 +51,7 @@ def main():
ccsds_handler = CcsdsTmHandler() ccsds_handler = CcsdsTmHandler()
ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50) ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50)
add_ccsds_handler(ccsds_handler) add_ccsds_handler(ccsds_handler)
set_custom_console_logger_name(TMTC_LOGGER_NAME)
run_tmtc_commander(use_gui=False, app_name="TMTC Commander FSFW") run_tmtc_commander(use_gui=False, app_name="TMTC Commander FSFW")

2
tmtc/tmtccmd

@ -1 +1 @@
Subproject commit 8f2289ceef004334401127e8a756cb2d49b1ad0c Subproject commit 4d71822fa1f1cfc16ccd4d0fb750eb2900a263b2