From c9f8d2e21912025324c7c7b02c3bfb8a17815ec6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 27 Jan 2023 11:29:13 +0100
Subject: [PATCH] COM compiles again

---
 mission/system/tree/comModeTree.cpp | 35 +++++++++++++++--------------
 tmtc                                |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/mission/system/tree/comModeTree.cpp b/mission/system/tree/comModeTree.cpp
index fc7b5635..7a788317 100644
--- a/mission/system/tree/comModeTree.cpp
+++ b/mission/system/tree/comModeTree.cpp
@@ -3,41 +3,42 @@
 #include "eive/objects.h"
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/modes/HasModesIF.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 #include <fsfw/subsystem/Subsystem.h>
 
 #include "util.h"
 
 const auto check = subsystem::checkInsert;
 
+Subsystem satsystem::com::SUBSYSTEM = Subsystem(objects::COM_SUBSYSTEM, 12, 24);
+
 static const auto OFF = HasModesIF::MODE_OFF;
 static const auto ON = HasModesIF::MODE_ON;
 static const auto NML = DeviceHandlerIF::MODE_NORMAL;
 
 auto COM_SEQUENCE_TX_OFF = std::make_pair(NML << 24, FixedArrayList<ModeListEntry, 2>());
-auto COM_TABLE_TX_OFF_TGT = std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 0>());
+auto COM_TABLE_TX_OFF_TGT = std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 1>());
 auto COM_TABLE_TX_OFF_TRANS = std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
 
 auto COM_SEQUENCE_TX_ON = std::make_pair(NML << 24, FixedArrayList<ModeListEntry, 2>());
-auto COM_TABLE_TX_ON_TGT = std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 0>());
+auto COM_TABLE_TX_ON_TGT = std::make_pair((NML << 24) | 1, FixedArrayList<ModeListEntry, 1>());
 auto COM_TABLE_TX_ON_TRANS = std::make_pair((NML << 24) | 2, FixedArrayList<ModeListEntry, 6>());
 
 namespace {
-void buildTxOffSequence(Subsystem* ss, ModeListEntry& eh);
-void buildTxOnSequence(Subsystem* ss, ModeListEntry& eh);
+void buildTxOffSequence(Subsystem& ss, ModeListEntry& eh);
+void buildTxOnSequence(Subsystem& ss, ModeListEntry& eh);
 }  // namespace
 
 void satsystem::com::init() {
   ModeListEntry entry;
-  Subsystem* comSubsystem = new Subsystem(objects::COM_SUBSYSTEM, objects::EIVE_SYSTEM, 12, 24);
-  buildTxOffSequence(comSubsystem, entry);
-  buildTxOnSequence(comSubsystem, entry);
-  comSubsystem->setInitialMode(NML, 0 /* TODO: Which submode? */);
+  buildTxOffSequence(SUBSYSTEM, entry);
+  buildTxOnSequence(SUBSYSTEM, entry);
+  SUBSYSTEM.setInitialMode(NML, 0 /* TODO: Which submode? */);
 }
 
 namespace {
 
-void buildTxOffSequence(Subsystem* ss, ModeListEntry& eh) {
+void buildTxOffSequence(Subsystem& ss, ModeListEntry& eh) {
   std::string context = "satsystem::com::buildTxOffSequence";
   auto ctxc = context.c_str();
   // Insert Helper Table
@@ -58,21 +59,21 @@ void buildTxOffSequence(Subsystem* ss, ModeListEntry& eh) {
 
   // Build TX OFF table
   iht(objects::SYRLINKS_HK_HANDLER, NML, 0/* TODO */, COM_TABLE_TX_OFF_TGT.second);
-  check(ss->addTable(TableEntry(COM_SEQUENCE_TX_OFF.first, &COM_TABLE_TX_OFF_TGT.second)), ctxc);
+  check(ss.addTable(TableEntry(COM_SEQUENCE_TX_OFF.first, &COM_TABLE_TX_OFF_TGT.second)), ctxc);
 
   // Build TX OFF transition
   iht(objects::SYRLINKS_HK_HANDLER, NML, 0/* TODO */, COM_TABLE_TX_OFF_TRANS.second);
-  check(ss->addTable(TableEntry(COM_SEQUENCE_TX_OFF.first, &COM_TABLE_TX_OFF_TRANS.second)), ctxc);
+  check(ss.addTable(TableEntry(COM_SEQUENCE_TX_OFF.first, &COM_TABLE_TX_OFF_TRANS.second)), ctxc);
 
   // Build TX OFF sequence
   ihs(COM_SEQUENCE_TX_OFF.second, COM_TABLE_TX_OFF_TGT.first, 0, false);
   ihs(COM_SEQUENCE_TX_OFF.second, COM_TABLE_TX_OFF_TRANS.first, 0, false);
-  check(ss->addSequence(SequenceEntry(COM_TABLE_TX_OFF_TRANS.first, &COM_TABLE_TX_OFF_TRANS.second,
+  check(ss.addSequence(SequenceEntry(COM_TABLE_TX_OFF_TRANS.first, &COM_TABLE_TX_OFF_TRANS.second,
                                       COM_TABLE_TX_OFF_TRANS.first)),
         ctxc);
 }
 
-void buildTxOnSequence(Subsystem* ss, ModeListEntry& eh) {
+void buildTxOnSequence(Subsystem& ss, ModeListEntry& eh) {
   std::string context = "satsystem::com::buildTxOnSequence";
   auto ctxc = context.c_str();
   // Insert Helper Table
@@ -93,16 +94,16 @@ void buildTxOnSequence(Subsystem* ss, ModeListEntry& eh) {
 
   // Build TX ON table
   iht(objects::SYRLINKS_HK_HANDLER, NML, /*TODO*/0, COM_TABLE_TX_ON_TGT.second);
-  check(ss->addTable(TableEntry(COM_SEQUENCE_TX_ON.first, &COM_TABLE_TX_ON_TGT.second)), ctxc);
+  check(ss.addTable(TableEntry(COM_SEQUENCE_TX_ON.first, &COM_TABLE_TX_ON_TGT.second)), ctxc);
 
   // Build TX ON transition
   iht(objects::SYRLINKS_HK_HANDLER, NML, /*TODO*/0, COM_TABLE_TX_ON_TRANS.second);
-  check(ss->addTable(TableEntry(COM_SEQUENCE_TX_ON.first, &COM_TABLE_TX_ON_TRANS.second)), ctxc);
+  check(ss.addTable(TableEntry(COM_SEQUENCE_TX_ON.first, &COM_TABLE_TX_ON_TRANS.second)), ctxc);
 
   // Build TX ON sequence
   ihs(COM_SEQUENCE_TX_ON.second, COM_TABLE_TX_ON_TGT.first, 0, false);
   ihs(COM_SEQUENCE_TX_ON.second, COM_TABLE_TX_ON_TRANS.first, 0, false);
-  check(ss->addSequence(SequenceEntry(COM_TABLE_TX_ON_TRANS.first, &COM_TABLE_TX_ON_TRANS.second,
+  check(ss.addSequence(SequenceEntry(COM_TABLE_TX_ON_TRANS.first, &COM_TABLE_TX_ON_TRANS.second,
                                       COM_TABLE_TX_ON_TRANS.first)),
         ctxc);
 }
diff --git a/tmtc b/tmtc
index df1bbe9d..8b6039e1 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit df1bbe9dede97c8587578af3969eacda7facfd32
+Subproject commit 8b6039e15d6e1653fd9128b7d2c7991e5bee9588