optional module handling complete

src/fsfw/monitoring/AbsLimitMonitor.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_MONITORING_ABSLIMITMONITOR_H_
 #define FSFW_MONITORING_ABSLIMITMONITOR_H_
 
+#include "monitoringConf.h"
 #include "MonitorBase.h"
 #include <cmath>
 

src/fsfw/monitoring/HasMonitorsIF.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_MONITORING_HASMONITORSIF_H_
 #define FSFW_MONITORING_HASMONITORSIF_H_
 
+#include "monitoringConf.h"
 #include "../events/EventReportingProxyIF.h"
 #include "../objectmanager/ObjectManagerIF.h"
 #include "../ipc/MessageQueueSenderIF.h"

src/fsfw/monitoring/LimitMonitor.h

@@ -1,6 +1,7 @@
 #ifndef FRAMEWORK_MONITORING_LIMITMONITOR_H_
 #define FRAMEWORK_MONITORING_LIMITMONITOR_H_
 
+#include "monitoringConf.h"
 #include "MonitorBase.h"
 
 /**

src/fsfw/monitoring/LimitViolationReporter.h

@@ -7,6 +7,7 @@
 #ifndef LIMITVIOLATIONREPORTER_H_
 #define LIMITVIOLATIONREPORTER_H_
 
+#include "monitoringConf.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../serialize/SerializeIF.h"
 #include "../storagemanager/StorageManagerIF.h"

src/fsfw/monitoring/MonitorBase.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_MONITORING_MONITORBASE_H_
 #define FSFW_MONITORING_MONITORBASE_H_
 
+#include "monitoringConf.h"
 #include "LimitViolationReporter.h"
 #include "MonitoringIF.h"
 #include "MonitoringMessageContent.h"

src/fsfw/monitoring/MonitorReporter.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_MONITORING_MONITORREPORTER_H_
 #define FSFW_MONITORING_MONITORREPORTER_H_
 
+#include "monitoringConf.h"
 #include "LimitViolationReporter.h"
 #include "MonitoringIF.h"
 #include "MonitoringMessageContent.h"

src/fsfw/monitoring/MonitoringIF.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_MONITORING_MONITORINGIF_H_
 #define FSFW_MONITORING_MONITORINGIF_H_
 
+#include "monitoringConf.h"
 #include "MonitoringMessage.h"
 #include "../serialize/SerializeIF.h"
 

src/fsfw/monitoring/MonitoringMessage.h

@@ -1,8 +1,9 @@
 #ifndef MONITORINGMESSAGE_H_
 #define MONITORINGMESSAGE_H_
 
-#include "../ipc/CommandMessage.h"
-#include "../storagemanager/StorageManagerIF.h"
+#include "monitoringConf.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 class MonitoringMessage: public CommandMessage {
 public:

src/fsfw/monitoring/MonitoringMessageContent.h

@@ -1,6 +1,7 @@
 #ifndef FSFW_MONITORING_MONITORINGMESSAGECONTENT_H_
 #define FSFW_MONITORING_MONITORINGMESSAGECONTENT_H_
 
+#include "monitoringConf.h"
 #include "HasMonitorsIF.h"
 #include "MonitoringIF.h"
 

src/fsfw/monitoring/ReceivesMonitoringReportsIF.h

@@ -1,7 +1,8 @@
 #ifndef RECEIVESMONITORINGREPORTSIF_H_
 #define RECEIVESMONITORINGREPORTSIF_H_
 
-#include "../ipc/MessageQueueSenderIF.h"
+#include "monitoringConf.h"
+#include "fsfw/ipc/messageQueueDefinitions.h"
 
 class ReceivesMonitoringReportsIF {
 public:

src/fsfw/monitoring/TriplexMonitor.h

@@ -1,6 +1,7 @@
 #ifndef FRAMEWORK_MONITORING_TRIPLEXMONITOR_H_
 #define FRAMEWORK_MONITORING_TRIPLEXMONITOR_H_
 
+#include "monitoringConf.h"
 #include "../datapool/DataSet.h"
 #include "../datapool/PIDReaderList.h"
 #include "../health/HealthTableIF.h"

src/fsfw/monitoring/TwoValueLimitMonitor.h

@@ -1,6 +1,7 @@
 #ifndef FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_
 #define FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_
 
+#include "monitoringConf.h"
 #include "LimitMonitor.h"
 
 template<typename T>

src/fsfw/monitoring/monitoringConf.h

@@ -0,0 +1,11 @@
+#ifndef FSFW_MONITORING_MONITORINGCONF_H_
+#define FSFW_MONITORING_MONITORINGCONF_H_
+
+#include "fsfw/FSFW.h"
+
+#ifndef FSFW_ADD_MONITORING
+#warning Monitoring files were included but compilation was \
+    not enabled with FSFW_ADD_MONITORING
+#endif
+
+#endif /* FSFW_MONITORING_MONITORINGCONF_H_ */