From aa45d34b4a682c1240f5c4ad8d86bff99f858bae Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Sun, 8 Nov 2020 15:20:51 +0100
Subject: [PATCH] include improvements /factory improvement
---
defaultcfg/config/objects/Factory.cpp | 14 +++++++-------
events/Event.h | 2 +-
ipc/MessageQueueIF.h | 2 +-
ipc/MessageQueueMessageIF.h | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/defaultcfg/config/objects/Factory.cpp b/defaultcfg/config/objects/Factory.cpp
index 51dd61304..41333b1c3 100644
--- a/defaultcfg/config/objects/Factory.cpp
+++ b/defaultcfg/config/objects/Factory.cpp
@@ -11,6 +11,7 @@
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
+#include <internalError/InternalErrorReporter.h>
#include <cstdint>
@@ -31,15 +32,15 @@ void Factory::produce(void) {
setStaticFrameworkObjectIds();
new EventManager(objects::EVENT_MANAGER);
new HealthTable(objects::HEALTH_TABLE);
- //new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
+ new InternalErrorReporter(objects::INTERNAL_ERROR_REPORTER);
}
void Factory::setStaticFrameworkObjectIds() {
- PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
- PusServiceBase::packetDestination = objects::TM_FUNNEL;
+ PusServiceBase::packetSource = objects::NO_OBJECT;
+ PusServiceBase::packetDestination = objects::NO_OBJECT;
- CommandingServiceBase::defaultPacketSource = objects::PUS_PACKET_DISTRIBUTOR;
- CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
+ CommandingServiceBase::defaultPacketSource = objects::NO_OBJECT;
+ CommandingServiceBase::defaultPacketDestination = objects::NO_OBJECT;
VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
@@ -48,7 +49,6 @@ void Factory::setStaticFrameworkObjectIds() {
DeviceHandlerFailureIsolation::powerConfirmationId = objects::NO_OBJECT;
- TmPacketStored::timeStamperId = objects::PUS_TIME;
- //TmFunnel::downlinkDestination = objects::NO_OBJECT;
+ TmPacketStored::timeStamperId = objects::NO_OBJECT;
}
diff --git a/events/Event.h b/events/Event.h
index f5434826b..90ff1a901 100644
--- a/events/Event.h
+++ b/events/Event.h
@@ -4,7 +4,7 @@
#include <stdint.h>
#include "fwSubsystemIdRanges.h"
//could be move to more suitable location
-#include <subsystemIdRanges.h>
+#include <events/subsystemIdRanges.h>
typedef uint16_t EventId_t;
typedef uint8_t EventSeverity_t;
diff --git a/ipc/MessageQueueIF.h b/ipc/MessageQueueIF.h
index 44b6f4c00..1c06521ca 100644
--- a/ipc/MessageQueueIF.h
+++ b/ipc/MessageQueueIF.h
@@ -1,7 +1,7 @@
#ifndef FSFW_IPC_MESSAGEQUEUEIF_H_
#define FSFW_IPC_MESSAGEQUEUEIF_H_
-#include <fsfw/ipc/messageQueueDefinitions.h>
+#include "messageQueueDefinitions.h"
#include "MessageQueueMessageIF.h"
#include "../returnvalues/HasReturnvaluesIF.h"
diff --git a/ipc/MessageQueueMessageIF.h b/ipc/MessageQueueMessageIF.h
index b5a30c086..33e01e7d0 100644
--- a/ipc/MessageQueueMessageIF.h
+++ b/ipc/MessageQueueMessageIF.h
@@ -1,7 +1,7 @@
#ifndef FRAMEWORK_IPC_MESSAGEQUEUEMESSAGEIF_H_
#define FRAMEWORK_IPC_MESSAGEQUEUEMESSAGEIF_H_
-#include <fsfw/ipc/messageQueueDefinitions.h>
+#include "messageQueueDefinitions.h"
#include <cstddef>
#include <cstdint>