constante is without a e in English, add Enable in front of data type
This commit is contained in:
@@ -48,19 +48,19 @@ bool DemandHandler::init() {
|
||||
initSuccess = false;
|
||||
}
|
||||
if (o[DemandHandlerConfig::DEMAND].size() <
|
||||
static_cast<int>(ParameterIndex::CONSTANTE_1)) {
|
||||
TMFE::Instance()->Msg(
|
||||
MERROR, __FUNCTION__,
|
||||
"Constante 1 index is %i, where array size is %i.",
|
||||
static_cast<int>(ParameterIndex::CONSTANTE_1), o.size());
|
||||
static_cast<int>(ParameterIndex::CONSTANT_1)) {
|
||||
TMFE::Instance()->Msg(MERROR, __FUNCTION__,
|
||||
"Constant 1 index is %i, where array size is %i.",
|
||||
static_cast<int>(ParameterIndex::CONSTANT_1),
|
||||
o.size());
|
||||
initSuccess = false;
|
||||
}
|
||||
if (o[DemandHandlerConfig::DEMAND].size() <
|
||||
static_cast<int>(ParameterIndex::CONSTANTE_2)) {
|
||||
TMFE::Instance()->Msg(
|
||||
MERROR, __FUNCTION__,
|
||||
"Constante 2 index is %i, where array size is %i.",
|
||||
static_cast<int>(ParameterIndex::CONSTANTE_2), o.size());
|
||||
static_cast<int>(ParameterIndex::CONSTANT_2)) {
|
||||
TMFE::Instance()->Msg(MERROR, __FUNCTION__,
|
||||
"Constant 2 index is %i, where array size is %i.",
|
||||
static_cast<int>(ParameterIndex::CONSTANT_2),
|
||||
o.size());
|
||||
initSuccess = false;
|
||||
}
|
||||
if (o[DemandHandlerConfig::DEMAND].size() <
|
||||
@@ -86,8 +86,8 @@ bool DemandHandler::init() {
|
||||
|
||||
this->pullMinimalPressure();
|
||||
this->pullMaximalPressure();
|
||||
this->pullConstante1();
|
||||
this->pullConstante2();
|
||||
this->pullConstant1();
|
||||
this->pullConstant2();
|
||||
this->pullPressureControlMode();
|
||||
return true;
|
||||
}
|
||||
@@ -102,11 +102,11 @@ bool DemandHandler::setHotlink() {
|
||||
case static_cast<int>(ParameterIndex::MAXIMAL_PRESSURE):
|
||||
pullMaximalPressure();
|
||||
break;
|
||||
case static_cast<int>(ParameterIndex::CONSTANTE_1):
|
||||
pullConstante1();
|
||||
case static_cast<int>(ParameterIndex::CONSTANT_1):
|
||||
pullConstant1();
|
||||
break;
|
||||
case static_cast<int>(ParameterIndex::CONSTANTE_2):
|
||||
pullConstante2();
|
||||
case static_cast<int>(ParameterIndex::CONSTANT_2):
|
||||
pullConstant2();
|
||||
break;
|
||||
case static_cast<int>(ParameterIndex::PRESSURE_CONTROL_MODE):
|
||||
pullPressureControlMode();
|
||||
@@ -140,19 +140,19 @@ void DemandHandler::pullMaximalPressure() {
|
||||
eventBus.publish(event);
|
||||
}
|
||||
|
||||
void DemandHandler::pullConstante1() {
|
||||
void DemandHandler::pullConstant1() {
|
||||
midas::odb o(this->path);
|
||||
float constante1 = o[DemandHandlerConfig::DEMAND]
|
||||
[static_cast<int>(ParameterIndex::CONSTANTE_1)];
|
||||
Event event = {EventType::CONSTANTE_1, constante1};
|
||||
[static_cast<int>(ParameterIndex::CONSTANT_1)];
|
||||
Event event = {EventType::CONSTANT_1, constante1};
|
||||
eventBus.publish(event);
|
||||
}
|
||||
|
||||
void DemandHandler::pullConstante2() {
|
||||
void DemandHandler::pullConstant2() {
|
||||
midas::odb o(this->path);
|
||||
float constance2 = o[DemandHandlerConfig::DEMAND]
|
||||
[static_cast<int>(ParameterIndex::CONSTANTE_2)];
|
||||
Event event = {EventType::CONSTANTE_2, constance2};
|
||||
[static_cast<int>(ParameterIndex::CONSTANT_2)];
|
||||
Event event = {EventType::CONSTANT_2, constance2};
|
||||
eventBus.publish(event);
|
||||
}
|
||||
|
||||
@@ -161,7 +161,8 @@ void DemandHandler::pullPressureControlMode() {
|
||||
float pressureControlMode =
|
||||
o[DemandHandlerConfig::DEMAND]
|
||||
[static_cast<int>(ParameterIndex::PRESSURE_CONTROL_MODE)];
|
||||
Event event = {EventType::PRESSURE_CONTROL_MODE, pressureControlMode != 0};
|
||||
Event event = {EventType::ENABLE_PRESSURE_CONTROL_MODE,
|
||||
pressureControlMode != 0};
|
||||
eventBus.publish(event);
|
||||
}
|
||||
|
||||
@@ -169,7 +170,7 @@ void DemandHandler::pullSetPressure() {
|
||||
midas::odb o(this->path);
|
||||
float setPressure = o[DemandHandlerConfig::DEMAND]
|
||||
[static_cast<int>(ParameterIndex::SET_PRESSURE)];
|
||||
Event event = {EventType::SET_PRESSURE, setPressure != 0};
|
||||
Event event = {EventType::ENABLE_SET_PRESSURE, setPressure != 0};
|
||||
eventBus.publish(event);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user