Jakob.Meier 0ce55d5e62 fixed conflicts

2021-07-23 18:04:51 +02:00

..

archive/gpio

Merge branch 'mueller/master' into meier/max13865pt1000Handler

2021-04-01 15:34:28 +02:00

boardtest

removed fsfw_hal

2021-07-15 19:06:57 +02:00

csp

now a sd card will always be on

2021-07-09 17:54:32 +02:00

devices

removed fsfw_hal

2021-07-15 19:06:57 +02:00

fsfwconfig

fixed conflicts

2021-07-23 18:04:51 +02:00

obc

removed fsfw_hal

2021-07-15 19:06:57 +02:00

utility

writing api for scratch buffer

2021-07-09 16:57:34 +02:00

CMakeLists.txt

applied changes according to pr comments

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