Jakob Meier 608644f5f1 fixed merge conflicts

2021-10-29 18:43:01 +02:00

..

archive

fixed merge conflicts

2021-09-25 11:57:33 +02:00

boardtest

removed unused gpio definitions in busConf.h

2021-09-25 11:09:29 +02:00

csp

now a sd card will always be on

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

devices

cleaning up preproc defines

2021-08-17 17:48:51 +02:00

fsfwconfig

fixed merge conflicts

2021-10-29 18:43:01 +02:00

obc

hosted build compiling again

2021-10-11 19:34:34 +02:00

utility

fixes for file system

2021-07-23 18:20:01 +02:00

CMakeLists.txt

applied changes according to pr comments

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