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

2022-09-27 14:57:01 +02:00
parent 86d3732f65 24062071c0
commit 2b41b3ee26
37 changed files with 242 additions and 87 deletions
--- a/mission/system/objects/SusAssembly.h
+++ b/mission/system/objects/SusAssembly.h
@ -5,6 +5,8 @@
 #include <fsfw/devicehandlers/AssemblyBase.h>

 #include "DualLaneAssemblyBase.h"
+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"

 struct SusAssHelper {
 public:
--- a/mission/system/objects/TcsBoardAssembly.h
+++ b/mission/system/objects/TcsBoardAssembly.h
@ -5,6 +5,9 @@
 #include <fsfw/devicehandlers/AssemblyBase.h>
 #include <fsfw/power/PowerSwitcher.h>

+#include "events/subsystemIdRanges.h"
+#include "returnvalues/classIds.h"
+
 struct TcsBoardHelper {
  TcsBoardHelper(std::array<std::pair<object_id_t, std::string>, 16> rtdInfos)
      : rtdInfos(std::move(rtdInfos)) {}