From 89079f684b071e45f9706ea954407880258e9ab3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 29 Apr 2022 10:32:28 +0200
Subject: [PATCH] continued com ss tree

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

diff --git a/mission/system/tree/comModeTree.cpp b/mission/system/tree/comModeTree.cpp
index 56f44c2d..51e7a79c 100644
--- a/mission/system/tree/comModeTree.cpp
+++ b/mission/system/tree/comModeTree.cpp
@@ -33,7 +33,7 @@ void satsystem::com::init() {
   Subsystem* comSubsystem = new Subsystem(objects::COM_SUBSYSTEM, objects::EIVE_SYSTEM, 12, 24);
   buildTxOffSequence(comSubsystem, entry);
   buildTxOnSequence(comSubsystem, entry);
-  comSubsystem->setInitialMode(NML, com::Submodes::NONE);
+  comSubsystem->setInitialMode(NML, ::com::Submodes::NONE);
 }
 
 namespace {
@@ -60,9 +60,17 @@ void buildTxOffSequence(Subsystem* ss, ModeListEntry& eh) {
   // Build TX OFF table
   iht(objects::SYRLINKS_HK_HANDLER, NML, com::NONE, COM_TABLE_TX_OFF_TGT.second);
   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, com::NONE, COM_TABLE_TX_OFF_TRANS.second);
   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,
+                                      COM_TABLE_TX_OFF_TRANS.first)),
+        ctxc);
 }
 
 void buildTxOnSequence(Subsystem* ss, ModeListEntry& eh) {
@@ -83,6 +91,21 @@ void buildTxOnSequence(Subsystem* ss, ModeListEntry& eh) {
     eh.setCheckSuccess(checkSuccess);
     check(sequence.insert(eh), ctxc);
   };
+
+  // Build TX ON table
+  iht(objects::SYRLINKS_HK_HANDLER, NML, com::TX_ON, COM_TABLE_TX_ON_TGT.second);
+  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, com::NONE, COM_TABLE_TX_ON_TRANS.second);
+  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,
+                                      COM_TABLE_TX_ON_TRANS.first)),
+        ctxc);
 }
 
 }  // namespace
diff --git a/tmtc b/tmtc
index 76da8042..168b6622 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 76da8042a4601087e99fa856af241afe9e43695d
+Subproject commit 168b662288175f9db77a5796a02f38cb66911092