eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/master' into mueller_MessageNamespaceRenamed

Browse Source
This commit is contained in:
Robin Müller
2020-08-25 14:02:48 +02:00
parent 952fc7303a fddf31121d
commit 9fbf0d1d94
395 changed files with 6939 additions and 3803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
monitoring/AbsLimitMonitor.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_
#define FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_
#include <framework/monitoring/MonitorBase.h>
#include "MonitorBase.h"
#include <cmath>
template<typename T>

6
monitoring/HasMonitorsIF.h
View File

@ -7,9 +7,9 @@
#ifndef HASMONITORSIF_H_
#define HASMONITORSIF_H_
#include <framework/events/EventReportingProxyIF.h>
#include <framework/objectmanager/ObjectManagerIF.h>
#include <framework/ipc/MessageQueueSenderIF.h>
#include "../events/EventReportingProxyIF.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../ipc/MessageQueueSenderIF.h"
class HasMonitorsIF {
public:

2
monitoring/LimitMonitor.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_MONITORING_LIMITMONITOR_H_
#define FRAMEWORK_MONITORING_LIMITMONITOR_H_
#include <framework/monitoring/MonitorBase.h>
#include "MonitorBase.h"
/**
* Variant of a limit checking class.

16
monitoring/LimitViolationReporter.cpp
View File

@ -4,11 +4,11 @@
* @date 17.07.2014
* @author baetz
*/
#include <framework/monitoring/LimitViolationReporter.h>
#include <framework/monitoring/MonitoringIF.h>
#include <framework/monitoring/ReceivesMonitoringReportsIF.h>
#include <framework/objectmanager/ObjectManagerIF.h>
#include <framework/serialize/SerializeAdapter.h>
#include "LimitViolationReporter.h"
#include "MonitoringIF.h"
#include "ReceivesMonitoringReportsIF.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../serialize/SerializeAdapter.h"
ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF* data) {
ReturnValue_t result = checkClassLoaded();
@ -17,7 +17,7 @@ ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF
}
store_address_t storeId;
uint8_t* dataTarget = NULL;
uint32_t maxSize = data->getSerializedSize();
size_t maxSize = data->getSerializedSize();
if (maxSize > MonitoringIF::VIOLATION_REPORT_MAX_SIZE) {
return MonitoringIF::INVALID_SIZE;
}
@ -26,8 +26,8 @@ ReturnValue_t LimitViolationReporter::sendLimitViolationReport(const SerializeIF
if (result != HasReturnvaluesIF::RETURN_OK) {
return result;
}
uint32_t size = 0;
result = data->serialize(&dataTarget, &size, maxSize, true);
size_t size = 0;
result = data->serialize(&dataTarget, &size, maxSize, SerializeIF::Endianness::BIG);
if (result != HasReturnvaluesIF::RETURN_OK) {
return result;
}

8
monitoring/LimitViolationReporter.h
View File

@ -7,10 +7,10 @@
#ifndef LIMITVIOLATIONREPORTER_H_
#define LIMITVIOLATIONREPORTER_H_
#include <framework/returnvalues/HasReturnvaluesIF.h>
#include <framework/serialize/SerializeIF.h>
#include <framework/storagemanager/StorageManagerIF.h>
#include <framework/ipc/MessageQueueSenderIF.h>
#include "../returnvalues/HasReturnvaluesIF.h"
#include "../serialize/SerializeIF.h"
#include "../storagemanager/StorageManagerIF.h"
#include "../ipc/MessageQueueSenderIF.h"
namespace Factory{
void setStaticFrameworkObjectIds();

12
monitoring/MonitorBase.h
View File

@ -1,12 +1,12 @@
#ifndef MONITORBASE_H_
#define MONITORBASE_H_
#include <framework/datapool/DataSet.h>
#include <framework/datapool/PIDReader.h>
#include <framework/monitoring/LimitViolationReporter.h>
#include <framework/monitoring/MonitoringIF.h>
#include <framework/monitoring/MonitoringMessageContent.h>
#include <framework/monitoring/MonitorReporter.h>
#include "../datapool/DataSet.h"
#include "../datapool/PIDReader.h"
#include "LimitViolationReporter.h"
#include "MonitoringIF.h"
#include "MonitoringMessageContent.h"
#include "MonitorReporter.h"
/**
* Base class for monitoring of parameters.

10
monitoring/MonitorReporter.h
View File

@ -1,11 +1,11 @@
#ifndef FRAMEWORK_MONITORING_MONITORREPORTER_H_
#define FRAMEWORK_MONITORING_MONITORREPORTER_H_
#include <framework/events/EventManagerIF.h>
#include <framework/monitoring/LimitViolationReporter.h>
#include <framework/monitoring/MonitoringIF.h>
#include <framework/monitoring/MonitoringMessageContent.h>
#include <framework/parameters/HasParametersIF.h>
#include "../events/EventManagerIF.h"
#include "LimitViolationReporter.h"
#include "MonitoringIF.h"
#include "MonitoringMessageContent.h"
#include "../parameters/HasParametersIF.h"
template<typename T>
class MonitorReporter: public HasParametersIF {

6
monitoring/MonitoringIF.h
View File

@ -1,9 +1,9 @@
#ifndef MONITORINGIF_H_
#define MONITORINGIF_H_
#include <framework/memory/HasMemoryIF.h>
#include <framework/monitoring/MonitoringMessage.h>
#include <framework/serialize/SerializeIF.h>
#include "../memory/HasMemoryIF.h"
#include "MonitoringMessage.h"
#include "../serialize/SerializeIF.h"
class MonitoringIF : public SerializeIF {
public:

4
monitoring/MonitoringMessage.cpp
View File

@ -1,5 +1,5 @@
#include <framework/monitoring/MonitoringMessage.h>
#include <framework/objectmanager/ObjectManagerIF.h>
#include "MonitoringMessage.h"
#include "../objectmanager/ObjectManagerIF.h"
MonitoringMessage::~MonitoringMessage() {
}

4
monitoring/MonitoringMessage.h
View File

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

18
monitoring/MonitoringMessageContent.h
View File

@ -1,15 +1,15 @@
#ifndef MONITORINGMESSAGECONTENT_H_
#define MONITORINGMESSAGECONTENT_H_
#include <framework/monitoring/HasMonitorsIF.h>
#include <framework/monitoring/MonitoringIF.h>
#include <framework/objectmanager/ObjectManagerIF.h>
#include <framework/serialize/SerialBufferAdapter.h>
#include <framework/serialize/SerialFixedArrayListAdapter.h>
#include <framework/serialize/SerializeElement.h>
#include <framework/serialize/SerialLinkedListAdapter.h>
#include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <framework/timemanager/TimeStamperIF.h>
#include "HasMonitorsIF.h"
#include "MonitoringIF.h"
#include "../objectmanager/ObjectManagerIF.h"
#include "../serialize/SerialBufferAdapter.h"
#include "../serialize/SerialFixedArrayListAdapter.h"
#include "../serialize/SerializeElement.h"
#include "../serialize/SerialLinkedListAdapter.h"
#include "../serviceinterface/ServiceInterfaceStream.h"
#include "../timemanager/TimeStamperIF.h"
namespace Factory{
void setStaticFrameworkObjectIds();

2
monitoring/ReceivesMonitoringReportsIF.h
View File

@ -1,7 +1,7 @@
#ifndef RECEIVESMONITORINGREPORTSIF_H_
#define RECEIVESMONITORINGREPORTSIF_H_
#include <framework/ipc/MessageQueueSenderIF.h>
#include "../ipc/MessageQueueSenderIF.h"
class ReceivesMonitoringReportsIF {
public:

10
monitoring/TriplexMonitor.h
View File

@ -1,11 +1,11 @@
#ifndef FRAMEWORK_MONITORING_TRIPLEXMONITOR_H_
#define FRAMEWORK_MONITORING_TRIPLEXMONITOR_H_
#include <framework/datapool/DataSet.h>
#include <framework/datapool/PIDReaderList.h>
#include <framework/health/HealthTableIF.h>
#include <framework/parameters/HasParametersIF.h>
#include <framework/objectmanager/ObjectManagerIF.h>
#include "../datapool/DataSet.h"
#include "../datapool/PIDReaderList.h"
#include "../health/HealthTableIF.h"
#include "../parameters/HasParametersIF.h"
#include "../objectmanager/ObjectManagerIF.h"
//SHOULDDO: This is by far not perfect. Could be merged with new Monitor classes. But still, it's over-engineering.

2
monitoring/TwoValueLimitMonitor.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_
#define FRAMEWORK_MONITORING_TWOVALUELIMITMONITOR_H_
#include <framework/monitoring/LimitMonitor.h>
#include "LimitMonitor.h"
template<typename T>
class TwoValueLimitMonitor: public LimitMonitor<T> {