Jakob.Meier 97f36a6ac7 fixed merge conflicts

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

..

archive/gpio

Merge branch 'mueller/master' into meier/max13865pt1000Handler

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

boardtest

q7s compiling

2021-06-21 16:46:49 +02:00

csp

now a sd card will always be on

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

devices

fixed merge conflicts

2021-06-24 17:49:23 +02:00

fsfwconfig

fixed merge conflicts

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

obc

applied changes according to pr comments

2021-06-21 17:25:13 +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