eive-obsw/mission/controller
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
..
acs Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
controllerdefinitions Merge remote-tracking branch 'origin/develop' into acs-ctrl-v1 2022-12-01 15:57:09 +01:00
AcsController.cpp Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
AcsController.h Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
CMakeLists.txt afmt 2022-12-01 15:56:55 +01:00
ThermalController.cpp add missing tmp devs in ctrel map as well 2022-11-14 10:11:44 +01:00
ThermalController.h add missing tmp devs in ctrel map as well 2022-11-14 10:11:44 +01:00