From 8b8324f21c1b0d30ba1c5ef7919846bfeb283e62 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Sun, 18 Oct 2020 23:50:02 +0200 Subject: [PATCH] some stuff renamed --- datapoolglob/DataPoolParameterWrapper.cpp | 2 +- fdir/FaultCounter.cpp | 2 +- monitoring/AbsLimitMonitor.h | 4 ++-- monitoring/LimitMonitor.h | 4 ++-- monitoring/MonitorReporter.h | 2 +- monitoring/TriplexMonitor.h | 2 +- parameters/HasParametersIF.h | 2 +- power/PowerComponent.cpp | 2 +- thermal/CoreComponent.cpp | 2 +- thermal/Heater.cpp | 2 +- thermal/TemperatureSensor.h | 2 +- thermal/ThermalComponent.cpp | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/datapoolglob/DataPoolParameterWrapper.cpp b/datapoolglob/DataPoolParameterWrapper.cpp index 3a57d90d..e5d55006 100644 --- a/datapoolglob/DataPoolParameterWrapper.cpp +++ b/datapoolglob/DataPoolParameterWrapper.cpp @@ -23,7 +23,7 @@ ReturnValue_t DataPoolParameterWrapper::set(uint8_t domainId, ReturnValue_t status = mySet.read(); if (status != HasReturnvaluesIF::RETURN_OK) { //should only fail for invalid pool id - return HasParametersIF::INVALID_MATRIX_ID; + return HasParametersIF::INVALID_IDENTIFIER_ID; } type = raw.getType(); diff --git a/fdir/FaultCounter.cpp b/fdir/FaultCounter.cpp index 443adb52..6519a3a8 100644 --- a/fdir/FaultCounter.cpp +++ b/fdir/FaultCounter.cpp @@ -76,7 +76,7 @@ ReturnValue_t FaultCounter::getParameter(uint8_t domainId, uint16_t parameterId, parameterWrapper->set(timer.timeout); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/monitoring/AbsLimitMonitor.h b/monitoring/AbsLimitMonitor.h index c9c33c74..5891c36a 100644 --- a/monitoring/AbsLimitMonitor.h +++ b/monitoring/AbsLimitMonitor.h @@ -39,7 +39,7 @@ public: parameterId, parameterWrapper, newValues, startAtIndex); // We'll reuse the DOMAIN_ID of MonitorReporter, // as we know the parameterIds used there. - if (result != this->INVALID_MATRIX_ID) { + if (result != this->INVALID_IDENTIFIER_ID) { return result; } switch (parameterId) { @@ -47,7 +47,7 @@ public: parameterWrapper->set(this->limit); break; default: - return this->INVALID_MATRIX_ID; + return this->INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/monitoring/LimitMonitor.h b/monitoring/LimitMonitor.h index 66e6725e..abcbe8e8 100644 --- a/monitoring/LimitMonitor.h +++ b/monitoring/LimitMonitor.h @@ -41,7 +41,7 @@ public: ReturnValue_t result = this->MonitorBase::getParameter(domainId, parameterId, parameterWrapper, newValues, startAtIndex); //We'll reuse the DOMAIN_ID of MonitorReporter, as we know the parameterIds used there. - if (result != this->INVALID_MATRIX_ID) { + if (result != this->INVALID_IDENTIFIER_ID) { return result; } switch (parameterId) { @@ -52,7 +52,7 @@ public: parameterWrapper->set(this->upperLimit); break; default: - return this->INVALID_MATRIX_ID; + return this->INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/monitoring/MonitorReporter.h b/monitoring/MonitorReporter.h index 88fa6ede..286d82cf 100644 --- a/monitoring/MonitorReporter.h +++ b/monitoring/MonitorReporter.h @@ -65,7 +65,7 @@ public: parameterWrapper->set(this->eventEnabled); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/monitoring/TriplexMonitor.h b/monitoring/TriplexMonitor.h index 9b60aeb6..c4b3c537 100644 --- a/monitoring/TriplexMonitor.h +++ b/monitoring/TriplexMonitor.h @@ -82,7 +82,7 @@ public: parameterWrapper->set(limit); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/parameters/HasParametersIF.h b/parameters/HasParametersIF.h index 286dcbc6..c4fd81b3 100644 --- a/parameters/HasParametersIF.h +++ b/parameters/HasParametersIF.h @@ -29,7 +29,7 @@ using ParameterId_t = uint32_t; class HasParametersIF { public: static const uint8_t INTERFACE_ID = CLASS_ID::HAS_PARAMETERS_IF; - static const ReturnValue_t INVALID_MATRIX_ID = MAKE_RETURN_CODE(0x01); + static const ReturnValue_t INVALID_IDENTIFIER_ID = MAKE_RETURN_CODE(0x01); static const ReturnValue_t INVALID_DOMAIN_ID = MAKE_RETURN_CODE(0x02); static const ReturnValue_t INVALID_VALUE = MAKE_RETURN_CODE(0x03); static const ReturnValue_t READ_ONLY = MAKE_RETURN_CODE(0x05); diff --git a/power/PowerComponent.cpp b/power/PowerComponent.cpp index f42c3153..c31b9a85 100644 --- a/power/PowerComponent.cpp +++ b/power/PowerComponent.cpp @@ -75,7 +75,7 @@ ReturnValue_t PowerComponent::getParameter(uint8_t domainId, parameterWrapper->set<>(max); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/thermal/CoreComponent.cpp b/thermal/CoreComponent.cpp index 657e79cb..90d10eda 100644 --- a/thermal/CoreComponent.cpp +++ b/thermal/CoreComponent.cpp @@ -251,7 +251,7 @@ ReturnValue_t CoreComponent::getParameter(uint8_t domainId, parameterWrapper->set(parameters.upperOpLimit); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/thermal/Heater.cpp b/thermal/Heater.cpp index 2bee47f1..ce965d5e 100644 --- a/thermal/Heater.cpp +++ b/thermal/Heater.cpp @@ -301,7 +301,7 @@ ReturnValue_t Heater::getParameter(uint8_t domainId, uint16_t parameterId, parameterWrapper->set(heaterOnCountdown.timeout); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/thermal/TemperatureSensor.h b/thermal/TemperatureSensor.h index 9b4f0e60..f41b3761 100644 --- a/thermal/TemperatureSensor.h +++ b/thermal/TemperatureSensor.h @@ -208,7 +208,7 @@ public: parameterWrapper->set(parameters.gradient); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; } diff --git a/thermal/ThermalComponent.cpp b/thermal/ThermalComponent.cpp index 50786654..6bc09e55 100644 --- a/thermal/ThermalComponent.cpp +++ b/thermal/ThermalComponent.cpp @@ -151,7 +151,7 @@ ReturnValue_t ThermalComponent::getParameter(uint8_t domainId, const ParameterWrapper* newValues, uint16_t startAtIndex) { ReturnValue_t result = CoreComponent::getParameter(domainId, parameterId, parameterWrapper, newValues, startAtIndex); - if (result != INVALID_MATRIX_ID) { + if (result != INVALID_IDENTIFIER_ID) { return result; } switch (parameterId) { @@ -162,7 +162,7 @@ ReturnValue_t ThermalComponent::getParameter(uint8_t domainId, parameterWrapper->set(nopParameters.upperNopLimit); break; default: - return INVALID_MATRIX_ID; + return INVALID_IDENTIFIER_ID; } return HasReturnvaluesIF::RETURN_OK; }