Merge branch 'develop' into meier/ccsds

This commit is contained in:
Jakob Meier 2021-11-24 15:56:57 +01:00
commit aabbb129a6
3 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="tmtcc Service 17" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
<configuration default="false" name="Ping Command" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
<module name="tmtc" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />

@ -1 +1 @@
Subproject commit aeb778d8d413e29c7eb6fe4c1ba7900800555a53
Subproject commit 3265d5b780fb5a551962eb9126df3d7d5e70fbeb

@ -1 +1 @@
Subproject commit 81be25388c3920870ab93f015435b933f5ed828d
Subproject commit 71213f68e2947afda9551539a97c540e14d1e7b6