Marius Eggert d33ae9ede7
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Merge branch 'eggert/acs' into marquardt/ptgCtrl
# Conflicts:
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h
#	mission/controller/acs/AcsParameters.h
#	mission/controller/acs/ActuatorCmd.h
#	mission/controller/acs/Guidance.cpp
#	mission/controller/acs/Guidance.h
#	mission/controller/acs/MultiplicativeKalmanFilter.cpp
#	mission/controller/acs/OutputValues.h
#	mission/controller/acs/SensorProcessing.cpp
#	mission/controller/acs/SensorProcessing.h
#	mission/controller/acs/control/Detumble.cpp
#	mission/controller/acs/control/Detumble.h
#	mission/controller/acs/control/PtgCtrl.cpp
#	mission/controller/acs/util/MathOperations.h
2022-12-13 11:26:23 +01:00
..
2022-09-16 18:10:23 +02:00
2022-12-02 13:55:19 +01:00
2022-09-01 17:31:43 +02:00
2022-12-12 10:06:55 +01:00
2022-10-25 11:22:31 +02:00
2022-11-29 23:24:45 +01:00
2022-11-03 15:29:54 +01:00
2022-11-15 17:21:12 +01:00
2020-09-30 17:17:01 +02:00