cleaned up a bit
parent
7fed767ff1
commit
f336dd0c8e
26
idm/idm.cpp
26
idm/idm.cpp
|
|
@ -173,31 +173,6 @@ void Idm::onModbusError()
|
||||||
emit statusUpdated(m_idmInfo);
|
emit statusUpdated(m_idmInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Idm::systemOperationModeToString(IdmSysMode mode)
|
|
||||||
{
|
|
||||||
QString result{};
|
|
||||||
|
|
||||||
/* Operation modes according to table of manual p. 13 */
|
|
||||||
switch (mode) {
|
|
||||||
case IdmSysModeStandby:
|
|
||||||
result = "Standby";
|
|
||||||
break;
|
|
||||||
case IdmSysModeAutomatic:
|
|
||||||
result = "Automatik";
|
|
||||||
break;
|
|
||||||
case IdmSysModeAway:
|
|
||||||
result = "Abwesend";
|
|
||||||
break;
|
|
||||||
case IdmSysModeOnlyHotwater:
|
|
||||||
result = "Nur Warmwasser";
|
|
||||||
break;
|
|
||||||
case IdmSysModeOnlyRoomHeating:
|
|
||||||
result = "Nur Heizung/Kühlung";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString Idm::heatPumpOperationModeToString(IdmHeatPumpMode mode)
|
QString Idm::heatPumpOperationModeToString(IdmHeatPumpMode mode)
|
||||||
{
|
{
|
||||||
QString result{};
|
QString result{};
|
||||||
|
|
@ -221,4 +196,3 @@ QString Idm::heatPumpOperationModeToString(IdmHeatPumpMode mode)
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -167,9 +167,6 @@ private:
|
||||||
* by the receivedStatusGroupx functions */
|
* by the receivedStatusGroupx functions */
|
||||||
IdmInfo m_idmInfo;
|
IdmInfo m_idmInfo;
|
||||||
|
|
||||||
/** Converts a system operation mode code to a string (according to manual p. 13) */
|
|
||||||
QString systemOperationModeToString(IdmSysMode mode);
|
|
||||||
|
|
||||||
/** Converts a heat pump operation mode code to a string (according to manual p. 14) */
|
/** Converts a heat pump operation mode code to a string (according to manual p. 14) */
|
||||||
QString heatPumpOperationModeToString(IdmHeatPumpMode mode);
|
QString heatPumpOperationModeToString(IdmHeatPumpMode mode);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -146,6 +146,7 @@ void IntegrationPluginIdm::executeAction(ThingActionInfo *info)
|
||||||
double targetTemperature = thing->stateValue(navigator2TargetTemperatureStateTypeId).toDouble();
|
double targetTemperature = thing->stateValue(navigator2TargetTemperatureStateTypeId).toDouble();
|
||||||
QUuid requestId = idm->setTargetTemperature(targetTemperature);
|
QUuid requestId = idm->setTargetTemperature(targetTemperature);
|
||||||
m_asyncActions.insert(requestId, info);
|
m_asyncActions.insert(requestId, info);
|
||||||
|
connect(info, &ThingActionInfo::aborted, [requestId, this] {m_asyncActions.remove(requestId);});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Q_ASSERT_X(false, "executeAction", QString("Unhandled action: %1").arg(action.actionTypeId().toString()).toUtf8());
|
Q_ASSERT_X(false, "executeAction", QString("Unhandled action: %1").arg(action.actionTypeId().toString()).toUtf8());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue