some stuff renamed
This commit is contained in:
parent
1bddfeb86b
commit
8b8324f21c
@ -23,7 +23,7 @@ ReturnValue_t DataPoolParameterWrapper::set(uint8_t domainId,
|
|||||||
ReturnValue_t status = mySet.read();
|
ReturnValue_t status = mySet.read();
|
||||||
if (status != HasReturnvaluesIF::RETURN_OK) {
|
if (status != HasReturnvaluesIF::RETURN_OK) {
|
||||||
//should only fail for invalid pool id
|
//should only fail for invalid pool id
|
||||||
return HasParametersIF::INVALID_MATRIX_ID;
|
return HasParametersIF::INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
type = raw.getType();
|
type = raw.getType();
|
||||||
|
@ -76,7 +76,7 @@ ReturnValue_t FaultCounter::getParameter(uint8_t domainId, uint16_t parameterId,
|
|||||||
parameterWrapper->set(timer.timeout);
|
parameterWrapper->set(timer.timeout);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,7 @@ public:
|
|||||||
parameterId, parameterWrapper, newValues, startAtIndex);
|
parameterId, parameterWrapper, newValues, startAtIndex);
|
||||||
// We'll reuse the DOMAIN_ID of MonitorReporter,
|
// We'll reuse the DOMAIN_ID of MonitorReporter,
|
||||||
// as we know the parameterIds used there.
|
// as we know the parameterIds used there.
|
||||||
if (result != this->INVALID_MATRIX_ID) {
|
if (result != this->INVALID_IDENTIFIER_ID) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
switch (parameterId) {
|
switch (parameterId) {
|
||||||
@ -47,7 +47,7 @@ public:
|
|||||||
parameterWrapper->set(this->limit);
|
parameterWrapper->set(this->limit);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return this->INVALID_MATRIX_ID;
|
return this->INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ public:
|
|||||||
ReturnValue_t result = this->MonitorBase<T>::getParameter(domainId,
|
ReturnValue_t result = this->MonitorBase<T>::getParameter(domainId,
|
||||||
parameterId, parameterWrapper, newValues, startAtIndex);
|
parameterId, parameterWrapper, newValues, startAtIndex);
|
||||||
//We'll reuse the DOMAIN_ID of MonitorReporter, as we know the parameterIds used there.
|
//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;
|
return result;
|
||||||
}
|
}
|
||||||
switch (parameterId) {
|
switch (parameterId) {
|
||||||
@ -52,7 +52,7 @@ public:
|
|||||||
parameterWrapper->set(this->upperLimit);
|
parameterWrapper->set(this->upperLimit);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return this->INVALID_MATRIX_ID;
|
return this->INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@ public:
|
|||||||
parameterWrapper->set(this->eventEnabled);
|
parameterWrapper->set(this->eventEnabled);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ public:
|
|||||||
parameterWrapper->set(limit);
|
parameterWrapper->set(limit);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@ using ParameterId_t = uint32_t;
|
|||||||
class HasParametersIF {
|
class HasParametersIF {
|
||||||
public:
|
public:
|
||||||
static const uint8_t INTERFACE_ID = CLASS_ID::HAS_PARAMETERS_IF;
|
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_DOMAIN_ID = MAKE_RETURN_CODE(0x02);
|
||||||
static const ReturnValue_t INVALID_VALUE = MAKE_RETURN_CODE(0x03);
|
static const ReturnValue_t INVALID_VALUE = MAKE_RETURN_CODE(0x03);
|
||||||
static const ReturnValue_t READ_ONLY = MAKE_RETURN_CODE(0x05);
|
static const ReturnValue_t READ_ONLY = MAKE_RETURN_CODE(0x05);
|
||||||
|
@ -75,7 +75,7 @@ ReturnValue_t PowerComponent::getParameter(uint8_t domainId,
|
|||||||
parameterWrapper->set<>(max);
|
parameterWrapper->set<>(max);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -251,7 +251,7 @@ ReturnValue_t CoreComponent::getParameter(uint8_t domainId,
|
|||||||
parameterWrapper->set(parameters.upperOpLimit);
|
parameterWrapper->set(parameters.upperOpLimit);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -301,7 +301,7 @@ ReturnValue_t Heater::getParameter(uint8_t domainId, uint16_t parameterId,
|
|||||||
parameterWrapper->set(heaterOnCountdown.timeout);
|
parameterWrapper->set(heaterOnCountdown.timeout);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -208,7 +208,7 @@ public:
|
|||||||
parameterWrapper->set(parameters.gradient);
|
parameterWrapper->set(parameters.gradient);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ ReturnValue_t ThermalComponent::getParameter(uint8_t domainId,
|
|||||||
const ParameterWrapper* newValues, uint16_t startAtIndex) {
|
const ParameterWrapper* newValues, uint16_t startAtIndex) {
|
||||||
ReturnValue_t result = CoreComponent::getParameter(domainId, parameterId,
|
ReturnValue_t result = CoreComponent::getParameter(domainId, parameterId,
|
||||||
parameterWrapper, newValues, startAtIndex);
|
parameterWrapper, newValues, startAtIndex);
|
||||||
if (result != INVALID_MATRIX_ID) {
|
if (result != INVALID_IDENTIFIER_ID) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
switch (parameterId) {
|
switch (parameterId) {
|
||||||
@ -162,7 +162,7 @@ ReturnValue_t ThermalComponent::getParameter(uint8_t domainId,
|
|||||||
parameterWrapper->set(nopParameters.upperNopLimit);
|
parameterWrapper->set(nopParameters.upperNopLimit);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return INVALID_MATRIX_ID;
|
return INVALID_IDENTIFIER_ID;
|
||||||
}
|
}
|
||||||
return HasReturnvaluesIF::RETURN_OK;
|
return HasReturnvaluesIF::RETURN_OK;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user