From 39e0a0ca0f3e03eaaefa775dd2f83b469f1adaa0 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 17 Jun 2021 12:04:08 +0200
Subject: [PATCH] update to new fsfw

---
 mission/core/GenericFactory.cpp      |  2 +-
 mission/devices/TestEchoComIF.cpp    |  2 +-
 mission/utility/PusPacketCreator.cpp | 13 ++-----------
 mission/utility/TmFunnel.cpp         |  3 +--
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 75067f2..cd9ae5e 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -31,7 +31,7 @@
 #include "fsfw/tcdistribution/CCSDSDistributor.h"
 #include "fsfw/tcdistribution/PUSDistributor.h"
 #include "fsfw/timemanager/TimeStamper.h"
-#include "fsfw/tmtcpacket/pus/TmPacketStored.h"
+#include "fsfw/tmtcpacket/pus/tm.h"
 
 
 
diff --git a/mission/devices/TestEchoComIF.cpp b/mission/devices/TestEchoComIF.cpp
index 36d08bc..bb4871f 100644
--- a/mission/devices/TestEchoComIF.cpp
+++ b/mission/devices/TestEchoComIF.cpp
@@ -4,7 +4,7 @@
 #include <fsfw/serialize/SerializeAdapter.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <fsfw/tmtcservices/CommandingServiceBase.h>
-#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
+#include <fsfw/tmtcpacket/pus/tm.h>
 
 
 TestEchoComIF::TestEchoComIF(object_id_t objectId):
diff --git a/mission/utility/PusPacketCreator.cpp b/mission/utility/PusPacketCreator.cpp
index b2f6030..f67af8b 100644
--- a/mission/utility/PusPacketCreator.cpp
+++ b/mission/utility/PusPacketCreator.cpp
@@ -1,5 +1,5 @@
-#include <fsfw/tmtcpacket/pus/TcPacketBase.h>
-#include <fsfw/tmtcpacket/pus/TmPacketBase.h>
+#include <fsfw/tmtcpacket/pus/tc.h>
+#include <fsfw/tmtcpacket/pus/tm.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <mission/utility/PusPacketCreator.h>
@@ -7,13 +7,4 @@
 void PusPacketCreator::createPusPacketAndPrint() {
 	// TODO: use TC packet stored here instead..
 
-//	uint8_t packetStore[TcPacketBase::TC_PACKET_MIN_SIZE];
-//	TcPacketBase packet(packetStore);
-//	packet.initSpacePacketHeader(true, true, 0x73, 25);
-//	packet.initializeTcPacket(0x73, 25, 0, 17, 1);
-//	packet.setPacketDataLength(sizeof(PUSTcDataFieldHeader)
-//			+ TcPacketBase::CRC_SIZE-1);
-//	packet.setErrorControl();
-//	sif::info << "PUS packet created: " << std::endl;
-//	arrayprinter::print(packet.getWholeData(), packet.getFullSize());
 }
diff --git a/mission/utility/TmFunnel.cpp b/mission/utility/TmFunnel.cpp
index 120cf4a..6e3919c 100644
--- a/mission/utility/TmFunnel.cpp
+++ b/mission/utility/TmFunnel.cpp
@@ -1,8 +1,7 @@
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/objectmanager/ObjectManager.h>
-#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
+#include <fsfw/tmtcpacket/pus/tm.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
-#include <fsfw/tmtcpacket/pus/TmPacketPusC.h>
 #include <mission/utility/TmFunnel.h>
 
 object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT;