Jakob Meier ceb7f40d35 fixed merge conflicts

2022-03-27 10:44:32 +02:00

..

controller

minor update in fsfw

2022-03-08 09:48:18 +01:00

core

fixed merge conflicts

2022-03-27 10:44:32 +02:00

devices

fixed merge conflicts

2022-03-27 10:44:32 +02:00

memory

Merge pull request 'Update for memory management' (#159) from mueller/sdcman-mg into develop

2022-03-04 09:55:06 +01:00

system

longer timeout for mode service

2022-03-25 18:39:21 +01:00

tmtc

apply auto-formatter

2022-03-26 14:10:31 +01:00

utility

apply auto-formatter

2022-03-26 14:10:31 +01:00

CMakeLists.txt

Merge remote-tracking branch 'origin/develop' into mueller/system-subsystems

2022-03-03 15:50:31 +01:00

mission.mk

more similar to example now

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