Marius Eggert 895d03a35c Merge branch 'develop' into eggert/acs ...

# Conflicts:
#	dummies/CMakeLists.txt
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h

2022-11-04 14:19:43 +01:00

..

acs

amended gyr sensor fusion

2022-11-04 12:41:35 +01:00

controllerdefinitions

Merge branch 'develop' into eggert/acs

2022-11-04 14:19:43 +01:00

AcsController.cpp

Merge branch 'develop' into eggert/acs

2022-11-04 14:19:43 +01:00

AcsController.h

Merge branch 'develop' into eggert/acs

2022-11-04 14:19:43 +01:00

CMakeLists.txt

added CMake files for new directories. amended existing controller Cmake

2022-09-26 10:15:03 +02:00

ThermalController.cpp

afmt

2022-11-03 16:14:57 +01:00

ThermalController.h

Merge remote-tracking branch 'origin/develop' into mueller/acs-ss-init

2022-10-20 17:03:50 +02:00