From 17279a6fd0809b0e2ec3609f5e625731c6ba2fd1 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 16 Aug 2022 17:09:46 +0200
Subject: [PATCH] host compiles

---
 bsp_hosted/ObjectFactory.cpp    | 7 +++----
 fsfw                            | 2 +-
 mission/core/GenericFactory.cpp | 1 +
 tmtc                            | 2 +-
 unittest/testEnvironment.cpp    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index 8129790c..64092bad 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -45,8 +45,8 @@
 #include <dummies/TemperatureSensorsDummy.h>
 
 void Factory::setStaticFrameworkObjectIds() {
-  PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
-  PusServiceBase::packetDestination = objects::TM_FUNNEL;
+  PusServiceBase::PUS_DISTRIBUTOR = objects::PUS_PACKET_DISTRIBUTOR;
+  PusServiceBase::PACKET_DESTINATION = objects::TM_FUNNEL;
 
   CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
   CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
@@ -55,8 +55,7 @@ void Factory::setStaticFrameworkObjectIds() {
   // No storage object for now.
   TmFunnel::storageDestination = objects::NO_OBJECT;
 
-  VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
-  TmPacketBase::timeStamperId = objects::TIME_STAMPER;
+  VerificationReporter::DEFAULT_RECEIVER = objects::PUS_SERVICE_1_VERIFICATION;
 }
 
 void ObjectFactory::produce(void* args) {
diff --git a/fsfw b/fsfw
index c57e95c6..d815f422 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit c57e95c69851f8bc15a345eaed9c921ac2030f1d
+Subproject commit d815f422c394bb87ccf9e9d306cb42bd01f162bc
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 01fe4e9b..0a9be3f9 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -54,6 +54,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_) {
     *healthTable_ = healthTable;
   }
   new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
+  new VerificationReporter();
   auto* timeStamper = new CdsShortTimeStamper(objects::TIME_STAMPER);
 
   {
diff --git a/tmtc b/tmtc
index 3fa70080..ca9f85de 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 3fa700804e0592db4e9a5667de2a81323cac5dc7
+Subproject commit ca9f85de1b51e29e3c0cccd527d736083e374f7f
diff --git a/unittest/testEnvironment.cpp b/unittest/testEnvironment.cpp
index e4d5bed2..72726f39 100644
--- a/unittest/testEnvironment.cpp
+++ b/unittest/testEnvironment.cpp
@@ -7,7 +7,7 @@
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
 #include <fsfw/storagemanager/PoolManager.h>
-#include <fsfw/timemanager/TimeStamper.h>
+#include <fsfw/timemanager/CdsShortTimeStamper.h>
 
 #ifdef LINUX
 ServiceInterfaceStream sif::debug("DEBUG  ");
@@ -28,7 +28,7 @@ void factory(void* args) {
   eventManager = new EventManagerMock();
   new HealthTable(objects::HEALTH_TABLE);
   new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
-  new TimeStamper(objects::TIME_STAMPER);
+  new CdsShortTimeStamper(objects::TIME_STAMPER);
 
   {
     PoolManager::LocalPoolConfig poolCfg = {{300, 16},  {200, 32}, {150, 64},  {150, 128},