16 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
gaisser	bfa0ac9a9f	Merge pull request 'Added submodules in NOTICE File' (#5) from gaisser_notice_file into master ... Reviewed-on: #5	2021-04-29 20:03:28 +02:00
gaisser	551017dac0	Merge branch 'master' into gaisser_notice_file	2021-04-29 20:03:21 +02:00
Steffen Gaisser	15dba9f945	Added submodules in NOTICE File	2021-04-29 20:00:17 +02:00
gaisser	c85ea564a9	Merge pull request 'PUS A Telemetry fixes' (#4) from mueller/tmtc-pus-a-fix into master ... Reviewed-on: #4	2021-04-29 19:59:36 +02:00
Robin Mueller	74278c16cf	update fsfw and FSFWConfig for PUS A	2021-04-29 19:54:26 +02:00
Robin Mueller	1c265fa351	using pus a again for tmtc	2021-04-29 19:41:33 +02:00
gaisser	fcf2d57253	Merge pull request 'Fixes for Demo' (#2) from mueller/demo-fixes into master ... Reviewed-on: #2	2021-04-29 19:32:56 +02:00
gaisser	1635e109c9	Merge branch 'master' into mueller/demo-fixes	2021-04-29 19:32:09 +02:00
Robin Mueller	244cc972a5	reverted pus c changes	2021-04-29 19:30:36 +02:00
Robin Mueller	16c226ed8c	fsfw update	2021-04-29 19:27:58 +02:00
gaisser	06ba4f4fd7	Merge pull request 'readded all submodules' (#1) from mueller/added-submodules into master ... Reviewed-on: #1	2021-04-29 17:05:21 +02:00
Robin Mueller	471a766253	Merge branch 'mueller/added-submodules' into mueller/master	2021-04-29 16:05:57 +02:00
Robin Mueller	3fffe785ca	readded all submodules	2021-04-29 16:04:44 +02:00
Robin Mueller	05260c590a	readded all submodules	2021-04-29 16:02:44 +02:00
Robin Mueller	106bdbf233	added updates manually	2021-04-29 15:58:00 +02:00
Steffen Gaisser	4f6fe6959f	Init commit	2021-04-27 17:22:34 +02:00