eive-obsw/mission/controller/acs
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
..
config afmt 2022-12-01 15:56:55 +01:00
control Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
util Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
AcsParameters.cpp added sensor fusion logic for GYR 2022-10-14 14:57:22 +02:00
AcsParameters.h Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
ActuatorCmd.cpp Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
ActuatorCmd.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
Guidance.cpp Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
Guidance.h Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
Igrf13Model.cpp Igrf13Model cleanup 2022-12-12 15:00:11 +01:00
Igrf13Model.h Igrf13Model cleanup 2022-12-12 15:00:11 +01:00
MultiplicativeKalmanFilter.cpp MEKF cleanup 2022-12-12 15:00:29 +01:00
MultiplicativeKalmanFilter.h removed OutputValues 2022-11-03 10:43:27 +01:00
Navigation.cpp removed OutputValues 2022-11-03 10:43:27 +01:00
Navigation.h removed OutputValues 2022-11-03 10:43:27 +01:00
SensorProcessing.cpp Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
SensorProcessing.h Merge branch 'eggert/acs' into marquardt/ptgCtrl 2022-12-13 11:26:23 +01:00
SensorValues.cpp added GPS and RW sensor readings. added RW1..4 dummies to acsTask 2022-11-21 11:18:39 +01:00
SensorValues.h post merge cleanup 2022-11-04 14:54:23 +01:00
SusConverter.cpp afmt 2022-12-01 15:56:55 +01:00
SusConverter.h afmt 2022-12-01 15:56:55 +01:00