Jakob.Meier 97f36a6ac7 fixed merge conflicts

2021-07-23 14:36:15 +02:00

..

controller

object manager singleton now

2021-06-08 16:45:25 +02:00

core

added more sd card stubs

2021-07-05 12:09:31 +02:00

devices

added uart flush in ploc supervisor handler

2021-07-23 13:27:58 +02:00

utility

fixes for updated fsfw

2021-06-21 16:54:33 +02:00

CMakeLists.txt

applied changes according to pr comments

2021-06-21 17:25:13 +02:00

mission.mk

more similar to example now

2020-09-30 17:17:01 +02:00