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

include fixes

Browse Source
This commit is contained in:
Robin Müller 2020-09-29 18:01:55 +02:00
parent 4f3cfdcaaf
commit 3c814a5e61
9 changed files with 24 additions and 25 deletions
Show Stats 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_ #ifndef FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_
#define FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_ #define FRAMEWORK_MONITORING_ABSLIMITMONITOR_H_
#include "../monitoring/MonitorBase.h" #include "MonitorBase.h"
#include <cmath> #include <cmath>
template<typename T> template<typename T>

13
monitoring/LimitMonitor.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_MONITORING_LIMITMONITOR_H_ #ifndef FRAMEWORK_MONITORING_LIMITMONITOR_H_
#define FRAMEWORK_MONITORING_LIMITMONITOR_H_ #define FRAMEWORK_MONITORING_LIMITMONITOR_H_
#include "../monitoring/MonitorBase.h" #include "MonitorBase.h"
/** /**
* Variant of a limit checking class. * Variant of a limit checking class.
@ -16,13 +16,12 @@ public:
uint16_t confirmationLimit, T lowerLimit, T upperLimit, uint16_t confirmationLimit, T lowerLimit, T upperLimit,
Event belowLowEvent = MonitoringIF::VALUE_BELOW_LOW_LIMIT, Event belowLowEvent = MonitoringIF::VALUE_BELOW_LOW_LIMIT,
Event aboveHighEvent = MonitoringIF::VALUE_ABOVE_HIGH_LIMIT) : Event aboveHighEvent = MonitoringIF::VALUE_ABOVE_HIGH_LIMIT) :
MonitorBase<T>(reporterId, monitorId, parameterId, confirmationLimit), MonitorBase<T>(reporterId, monitorId, parameterId, confirmationLimit), lowerLimit(
lowerLimit(lowerLimit), upperLimit(upperLimit), belowLowEvent(belowLowEvent), lowerLimit), upperLimit(upperLimit), belowLowEvent(
aboveHighEvent(aboveHighEvent) { belowLowEvent), aboveHighEvent(aboveHighEvent) {
}
virtual ~LimitMonitor() {
} }
virtual ~LimitMonitor() {}
virtual ReturnValue_t checkSample(T sample, T* crossedLimit) { virtual ReturnValue_t checkSample(T sample, T* crossedLimit) {
*crossedLimit = 0.0; *crossedLimit = 0.0;
if (sample > upperLimit) { if (sample > upperLimit) {

6
monitoring/LimitViolationReporter.cpp
View File

@ -4,9 +4,9 @@
* @date 17.07.2014 * @date 17.07.2014
* @author baetz * @author baetz
*/ */
#include "../monitoring/LimitViolationReporter.h" #include "LimitViolationReporter.h"
#include "../monitoring/MonitoringIF.h" #include "MonitoringIF.h"
#include "../monitoring/ReceivesMonitoringReportsIF.h" #include "ReceivesMonitoringReportsIF.h"
#include "../objectmanager/ObjectManagerIF.h" #include "../objectmanager/ObjectManagerIF.h"
#include "../serialize/SerializeAdapter.h" #include "../serialize/SerializeAdapter.h"

12
monitoring/MonitorBase.h
View File

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

6
monitoring/MonitorReporter.h
View File

@ -2,9 +2,9 @@
#define FRAMEWORK_MONITORING_MONITORREPORTER_H_ #define FRAMEWORK_MONITORING_MONITORREPORTER_H_
#include "../events/EventManagerIF.h" #include "../events/EventManagerIF.h"
#include "../monitoring/LimitViolationReporter.h" #include "LimitViolationReporter.h"
#include "../monitoring/MonitoringIF.h" #include "MonitoringIF.h"
#include "../monitoring/MonitoringMessageContent.h" #include "MonitoringMessageContent.h"
#include "../parameters/HasParametersIF.h" #include "../parameters/HasParametersIF.h"
template<typename T> template<typename T>

2
monitoring/MonitoringIF.h
View File

@ -2,7 +2,7 @@
#define MONITORINGIF_H_ #define MONITORINGIF_H_
#include "../memory/HasMemoryIF.h" #include "../memory/HasMemoryIF.h"
#include "../monitoring/MonitoringMessage.h" #include "MonitoringMessage.h"
#include "../serialize/SerializeIF.h" #include "../serialize/SerializeIF.h"
class MonitoringIF : public SerializeIF { class MonitoringIF : public SerializeIF {

2
monitoring/MonitoringMessage.cpp
View File

@ -1,4 +1,4 @@
#include "../monitoring/MonitoringMessage.h" #include "MonitoringMessage.h"
#include "../objectmanager/ObjectManagerIF.h" #include "../objectmanager/ObjectManagerIF.h"
MonitoringMessage::~MonitoringMessage() { MonitoringMessage::~MonitoringMessage() {

4
monitoring/MonitoringMessageContent.h
View File

@ -1,8 +1,8 @@
#ifndef MONITORINGMESSAGECONTENT_H_ #ifndef MONITORINGMESSAGECONTENT_H_
#define MONITORINGMESSAGECONTENT_H_ #define MONITORINGMESSAGECONTENT_H_
#include "../monitoring/HasMonitorsIF.h" #include "HasMonitorsIF.h"
#include "../monitoring/MonitoringIF.h" #include "MonitoringIF.h"
#include "../objectmanager/ObjectManagerIF.h" #include "../objectmanager/ObjectManagerIF.h"
#include "../serialize/SerialBufferAdapter.h" #include "../serialize/SerialBufferAdapter.h"
#include "../serialize/SerialFixedArrayListAdapter.h" #include "../serialize/SerialFixedArrayListAdapter.h"

2
monitoring/TwoValueLimitMonitor.h
View File

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