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
parent a4735defaa 10611d0415
commit 895d03a35c
234 changed files with 6948 additions and 3311 deletions
--- a/dummies/CMakeLists.txt
+++ b/dummies/CMakeLists.txt
@ -12,6 +12,7 @@ target_sources(
         AcuDummy.cpp
         PduDummy.cpp
         P60DockDummy.cpp
+         SaDeploymentDummy.cpp
         GpsDummy.cpp
         GyroAdisDummy.cpp
         GyroL3GD20Dummy.cpp