mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

compiling again

Browse Source
This commit is contained in:
Robin Müller
2020-11-30 16:06:59 +01:00
parent f70ee7696a
commit 4bb9dd816e
12 changed files with 196 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
monitoring/AbsLimitMonitor.h
View File

@ -66,8 +66,8 @@ protected:
switch (state) {
case MonitoringIF::OUT_OF_RANGE:
EventManagerIF::triggerEvent(this->reportingId,
violationEvent, this->parameterId.objectId,
this->parameterId.localPoolId);
violationEvent, this->globalPoolId.objectId,
this->globalPoolId.localPoolId);
break;
default:
break;

4
monitoring/LimitMonitor.h
View File

@ -80,11 +80,11 @@ protected:
switch (state) {
case MonitoringIF::BELOW_LOW_LIMIT:
EventManagerIF::triggerEvent(this->reportingId, belowLowEvent,
this->parameterId.objectId, this->parameterId.localPoolId);
this->globalPoolId.objectId, this->globalPoolId.localPoolId);
break;
case MonitoringIF::ABOVE_HIGH_LIMIT:
EventManagerIF::triggerEvent(this->reportingId, aboveHighEvent,
this->parameterId.objectId, this->parameterId.localPoolId);
this->globalPoolId.objectId, this->globalPoolId.localPoolId);
break;
default:
break;

8
monitoring/MonitorReporter.h
View File

@ -20,7 +20,7 @@ public:
MonitorReporter(object_id_t reportingId, uint8_t monitorId,
gp_id_t globalPoolId, uint16_t confirmationLimit) :
monitorId(monitorId), parameterId(parameterId),
monitorId(monitorId), globalPoolId(globalPoolId),
reportingId(reportingId), oldState(MonitoringIF::UNCHECKED),
reportingEnabled(ENABLED), eventEnabled(ENABLED), currentCounter(0),
confirmationLimit(confirmationLimit) {
@ -96,7 +96,7 @@ public:
protected:
const uint8_t monitorId;
const gp_id_t parameterId;
const gp_id_t globalPoolId;
object_id_t reportingId;
ReturnValue_t oldState;
@ -167,13 +167,13 @@ protected:
*/
virtual void sendTransitionReport(T parameterValue, T crossedLimit,
ReturnValue_t state) {
MonitoringReportContent<T> report(parameterId,
MonitoringReportContent<T> report(globalPoolId,
parameterValue, crossedLimit, oldState, state);
LimitViolationReporter::sendLimitViolationReport(&report);
}
ReturnValue_t setToState(ReturnValue_t state) {
if (oldState != state && reportingEnabled) {
MonitoringReportContent<T> report(parameterId, 0, 0, oldState,
MonitoringReportContent<T> report(globalPoolId, 0, 0, oldState,
state);
LimitViolationReporter::sendLimitViolationReport(&report);
oldState = state;