From 7f0db5b47cf9ff4dd78fbb267855cb112ab106c5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 29 Jan 2021 22:45:53 +0100 Subject: [PATCH] type and name change for HasParametersIF --- devicehandlers/DeviceHandlerBase.cpp | 6 +++--- devicehandlers/DeviceHandlerBase.h | 2 +- devicehandlers/DeviceHandlerFailureIsolation.cpp | 12 ++++++------ devicehandlers/DeviceHandlerFailureIsolation.h | 6 +++--- fdir/FaultCounter.cpp | 4 ++-- fdir/FaultCounter.h | 2 +- monitoring/LimitMonitor.h | 10 +++++----- monitoring/MonitorReporter.h | 8 ++++---- monitoring/TriplexMonitor.h | 8 ++++---- parameters/HasParametersIF.h | 11 +++++------ power/Fuse.cpp | 6 +++--- power/Fuse.h | 6 +++--- power/PowerComponent.cpp | 8 ++++---- power/PowerComponent.h | 6 +++--- power/PowerSensor.cpp | 6 +++--- power/PowerSensor.h | 2 +- thermal/Heater.cpp | 6 +++--- thermal/Heater.h | 4 ++-- thermal/TemperatureSensor.h | 6 +++--- thermal/ThermalComponent.cpp | 6 +++--- thermal/ThermalComponent.h | 2 +- thermal/ThermalComponentCore.cpp | 6 +++--- thermal/ThermalComponentCore.h | 2 +- 23 files changed, 67 insertions(+), 68 deletions(-) diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index b0fdb310d..897d0595b 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -1380,10 +1380,10 @@ void DeviceHandlerBase::doOffActivity() { } ReturnValue_t DeviceHandlerBase::getParameter(uint8_t domainId, - uint16_t parameterId, ParameterWrapper* parameterWrapper, + uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { - ReturnValue_t result = fdirInstance->getParameter(domainId, parameterId, - parameterWrapper, newValues, startAtIndex); + ReturnValue_t result = fdirInstance->getParameter(domainId, uniqueId, parameterWrapper, + newValues, startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h index 92dc9201a..e75d2729d 100644 --- a/devicehandlers/DeviceHandlerBase.h +++ b/devicehandlers/DeviceHandlerBase.h @@ -216,7 +216,7 @@ public: virtual void getMode(Mode_t *mode, Submode_t *submode); HealthState getHealth(); ReturnValue_t setHealth(HealthState health); - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex) override; diff --git a/devicehandlers/DeviceHandlerFailureIsolation.cpp b/devicehandlers/DeviceHandlerFailureIsolation.cpp index 5f7ab89f6..ba118090b 100644 --- a/devicehandlers/DeviceHandlerFailureIsolation.cpp +++ b/devicehandlers/DeviceHandlerFailureIsolation.cpp @@ -209,20 +209,20 @@ void DeviceHandlerFailureIsolation::startRecovery(Event reason) { } ReturnValue_t DeviceHandlerFailureIsolation::getParameter(uint8_t domainId, - uint16_t parameterId, ParameterWrapper* parameterWrapper, + uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { - ReturnValue_t result = strangeReplyCount.getParameter(domainId, parameterId, + ReturnValue_t result = strangeReplyCount.getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } - result = missedReplyCount.getParameter(domainId, parameterId, - parameterWrapper, newValues, startAtIndex); + result = missedReplyCount.getParameter(domainId, uniqueId, parameterWrapper, newValues, + startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } - result = recoveryCounter.getParameter(domainId, parameterId, - parameterWrapper, newValues, startAtIndex); + result = recoveryCounter.getParameter(domainId, uniqueId, parameterWrapper, newValues, + startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } diff --git a/devicehandlers/DeviceHandlerFailureIsolation.h b/devicehandlers/DeviceHandlerFailureIsolation.h index 8a3fd9dd9..016b18b3a 100644 --- a/devicehandlers/DeviceHandlerFailureIsolation.h +++ b/devicehandlers/DeviceHandlerFailureIsolation.h @@ -17,9 +17,9 @@ public: ReturnValue_t initialize(); void triggerEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0);bool isFdirActionInProgress(); - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex); + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex); protected: FaultCounter strangeReplyCount; diff --git a/fdir/FaultCounter.cpp b/fdir/FaultCounter.cpp index 6519a3a88..53c1dd7de 100644 --- a/fdir/FaultCounter.cpp +++ b/fdir/FaultCounter.cpp @@ -58,14 +58,14 @@ FaultCounter::FaultCounter() : parameterDomain(0), timer(), faultCount(0), failureThreshold(0) { } -ReturnValue_t FaultCounter::getParameter(uint8_t domainId, uint16_t parameterId, +ReturnValue_t FaultCounter::getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { if (domainId != parameterDomain) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case 0: parameterWrapper->set(failureThreshold); break; diff --git a/fdir/FaultCounter.h b/fdir/FaultCounter.h index dc929debd..e0670c4b3 100644 --- a/fdir/FaultCounter.h +++ b/fdir/FaultCounter.h @@ -23,7 +23,7 @@ public: void setFailureThreshold(uint32_t failureThreshold); void setFaultDecrementTimeMs(uint32_t timeMs); - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex); diff --git a/monitoring/LimitMonitor.h b/monitoring/LimitMonitor.h index c4448ceda..cd8b8d130 100644 --- a/monitoring/LimitMonitor.h +++ b/monitoring/LimitMonitor.h @@ -37,16 +37,16 @@ public: } } - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex) { + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex) { ReturnValue_t result = this->MonitorBase::getParameter(domainId, - parameterId, parameterWrapper, newValues, startAtIndex); + uniqueId, parameterWrapper, newValues, startAtIndex); //We'll reuse the DOMAIN_ID of MonitorReporter, as we know the parameterIds used there. if (result != this->INVALID_IDENTIFIER_ID) { return result; } - switch (parameterId) { + switch (uniqueId) { case 10: parameterWrapper->set(this->lowerLimit); break; diff --git a/monitoring/MonitorReporter.h b/monitoring/MonitorReporter.h index 7ce110e57..d155594d6 100644 --- a/monitoring/MonitorReporter.h +++ b/monitoring/MonitorReporter.h @@ -51,13 +51,13 @@ public: return state; } - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex) { + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex) { if (domainId != monitorId) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case 0: parameterWrapper->set(this->confirmationLimit); break; diff --git a/monitoring/TriplexMonitor.h b/monitoring/TriplexMonitor.h index c4b3c5375..d9ee83053 100644 --- a/monitoring/TriplexMonitor.h +++ b/monitoring/TriplexMonitor.h @@ -71,13 +71,13 @@ public: return HasReturnvaluesIF::RETURN_OK; } - ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex) { + ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex) { if (domainId != this->domainId) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case 0: parameterWrapper->set(limit); break; diff --git a/parameters/HasParametersIF.h b/parameters/HasParametersIF.h index 4bdd2e1b2..84790be66 100644 --- a/parameters/HasParametersIF.h +++ b/parameters/HasParametersIF.h @@ -52,9 +52,8 @@ public: return id; } - static uint32_t getFullParameterId(uint8_t domainId, - uint8_t uniqueIdentifier, uint16_t linearIndex) { - return (domainId << 24) + (uniqueIdentifier << 16) + linearIndex; + static uint32_t getFullParameterId(uint8_t domainId, uint8_t uniqueId, uint16_t linearIndex) { + return (domainId << 24) + (uniqueId << 16) + linearIndex; } virtual ~HasParametersIF() {} @@ -74,9 +73,9 @@ public: * matrix indexes. * @return */ - virtual ReturnValue_t getParameter(uint8_t domainId, - uint8_t uniqueIdentifier, ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex) = 0; + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueIdentifier, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex) = 0; }; #endif /* FSFW_PARAMETERS_HASPARAMETERSIF_H_ */ diff --git a/power/Fuse.cpp b/power/Fuse.cpp index b6e0a7f16..91da5388c 100644 --- a/power/Fuse.cpp +++ b/power/Fuse.cpp @@ -210,15 +210,15 @@ void Fuse::setDataPoolEntriesInvalid() { set.commit(); } -ReturnValue_t Fuse::getParameter(uint8_t domainId, uint16_t parameterId, +ReturnValue_t Fuse::getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { - ReturnValue_t result = currentLimit.getParameter(domainId, parameterId, + ReturnValue_t result = currentLimit.getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } - result = powerMonitor.getParameter(domainId, parameterId, parameterWrapper, + result = powerMonitor.getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); return result; } diff --git a/power/Fuse.h b/power/Fuse.h index b892611bc..1dc387212 100644 --- a/power/Fuse.h +++ b/power/Fuse.h @@ -62,9 +62,9 @@ public: ReturnValue_t setHealth(HealthState health); HasHealthIF::HealthState getHealth(); - ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex); + ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex); private: uint8_t oldFuseState; diff --git a/power/PowerComponent.cpp b/power/PowerComponent.cpp index c31b9a85e..04f8658ea 100644 --- a/power/PowerComponent.cpp +++ b/power/PowerComponent.cpp @@ -61,13 +61,13 @@ ReturnValue_t PowerComponent::deSerialize(const uint8_t** buffer, size_t* size, return SerializeAdapter::deSerialize(&max, buffer, size, streamEndianness); } -ReturnValue_t PowerComponent::getParameter(uint8_t domainId, - uint16_t parameterId, ParameterWrapper* parameterWrapper, - const ParameterWrapper* newValues, uint16_t startAtIndex) { +ReturnValue_t PowerComponent::getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, + uint16_t startAtIndex) { if (domainId != moduleId) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case 0: parameterWrapper->set<>(min); break; diff --git a/power/PowerComponent.h b/power/PowerComponent.h index c1add3b91..659b68530 100644 --- a/power/PowerComponent.h +++ b/power/PowerComponent.h @@ -31,9 +31,9 @@ public: ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, Endianness streamEndianness) override; - ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex); + ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex); private: const object_id_t deviceObjectId = objects::NO_OBJECT; const uint8_t switchId1; diff --git a/power/PowerSensor.cpp b/power/PowerSensor.cpp index fb181d9f9..40d7afc61 100644 --- a/power/PowerSensor.cpp +++ b/power/PowerSensor.cpp @@ -119,15 +119,15 @@ HasHealthIF::HealthState PowerSensor::getHealth() { return healthHelper.getHealth(); } -ReturnValue_t PowerSensor::getParameter(uint8_t domainId, uint16_t parameterId, +ReturnValue_t PowerSensor::getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { - ReturnValue_t result = currentLimit.getParameter(domainId, parameterId, + ReturnValue_t result = currentLimit.getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } - result = voltageLimit.getParameter(domainId, parameterId, parameterWrapper, + result = voltageLimit.getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); return result; } diff --git a/power/PowerSensor.h b/power/PowerSensor.h index a0ccb1ca7..5a21ab104 100644 --- a/power/PowerSensor.h +++ b/power/PowerSensor.h @@ -48,7 +48,7 @@ public: float getPower(); ReturnValue_t setHealth(HealthState health); HasHealthIF::HealthState getHealth(); - ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, + ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex); private: diff --git a/thermal/Heater.cpp b/thermal/Heater.cpp index ce965d5ea..782ce2963 100644 --- a/thermal/Heater.cpp +++ b/thermal/Heater.cpp @@ -290,13 +290,13 @@ void Heater::handleQueue() { } } -ReturnValue_t Heater::getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, +ReturnValue_t Heater::getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { if (domainId != DOMAIN_ID_BASE) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case 0: parameterWrapper->set(heaterOnCountdown.timeout); break; diff --git a/thermal/Heater.h b/thermal/Heater.h index b034dfee5..f83957a2e 100644 --- a/thermal/Heater.h +++ b/thermal/Heater.h @@ -34,8 +34,8 @@ public: MessageQueueId_t getCommandQueue() const; - ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, + ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex); protected: diff --git a/thermal/TemperatureSensor.h b/thermal/TemperatureSensor.h index f41b3761b..2b1fb1f07 100644 --- a/thermal/TemperatureSensor.h +++ b/thermal/TemperatureSensor.h @@ -183,10 +183,10 @@ public: static const uint8_t DOMAIN_ID_SENSOR = 1; - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex) { - ReturnValue_t result = sensorMonitor.getParameter(domainId, parameterId, + ReturnValue_t result = sensorMonitor.getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; @@ -194,7 +194,7 @@ public: if (domainId != this->DOMAIN_ID_BASE) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case ADDRESS_A: parameterWrapper->set(parameters.a); break; diff --git a/thermal/ThermalComponent.cpp b/thermal/ThermalComponent.cpp index 084201dd4..d42c34b33 100644 --- a/thermal/ThermalComponent.cpp +++ b/thermal/ThermalComponent.cpp @@ -148,14 +148,14 @@ ThermalComponentIF::State ThermalComponent::getIgnoredState(int8_t state) { } ReturnValue_t ThermalComponent::getParameter(uint8_t domainId, - uint16_t parameterId, ParameterWrapper* parameterWrapper, + uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { - ReturnValue_t result = ThermalComponentCore::getParameter(domainId, parameterId, + ReturnValue_t result = ThermalComponentCore::getParameter(domainId, uniqueId, parameterWrapper, newValues, startAtIndex); if (result != INVALID_IDENTIFIER_ID) { return result; } - switch (parameterId) { + switch (uniqueId) { case 12: parameterWrapper->set(nopParameters.lowerNopLimit); break; diff --git a/thermal/ThermalComponent.h b/thermal/ThermalComponent.h index 0785a9141..3b6dd9cdd 100644 --- a/thermal/ThermalComponent.h +++ b/thermal/ThermalComponent.h @@ -58,7 +58,7 @@ public: virtual ReturnValue_t setLimits( const uint8_t* data, size_t size); - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex); diff --git a/thermal/ThermalComponentCore.cpp b/thermal/ThermalComponentCore.cpp index ba8750532..7df04b047 100644 --- a/thermal/ThermalComponentCore.cpp +++ b/thermal/ThermalComponentCore.cpp @@ -247,17 +247,17 @@ ThermalComponentCore::Parameters ThermalComponentCore::getParameters() { } ReturnValue_t ThermalComponentCore::getParameter(uint8_t domainId, - uint16_t parameterId, ParameterWrapper* parameterWrapper, + uint8_t uniqueId, ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues, uint16_t startAtIndex) { ReturnValue_t result = temperatureMonitor.getParameter(domainId, - parameterId, parameterWrapper, newValues, startAtIndex); + uniqueId, parameterWrapper, newValues, startAtIndex); if (result != INVALID_DOMAIN_ID) { return result; } if (domainId != this->domainId) { return INVALID_DOMAIN_ID; } - switch (parameterId) { + switch (uniqueId) { case 0: parameterWrapper->set(parameters.heaterOn); break; diff --git a/thermal/ThermalComponentCore.h b/thermal/ThermalComponentCore.h index da9424e68..a1fa594a5 100644 --- a/thermal/ThermalComponentCore.h +++ b/thermal/ThermalComponentCore.h @@ -68,7 +68,7 @@ public: virtual void setOutputInvalid(); - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, + virtual ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueId, ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, uint16_t startAtIndex);