ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added sg ready generic thing class

Browse Source
This commit is contained in:
Boernsman 2020-11-09 10:42:42 +01:00
parent af83f1514f
commit 779fc9c6d5
3 changed files with 147 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
genericthings/integrationplugingenericthings.cpp
View File

@ -634,6 +634,7 @@ void IntegrationPluginGenericThings::executeAction(ThingActionInfo *info)
} }
Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8()); Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
} else if (thing->thingClassId() == thermostatThingClassId) { } else if (thing->thingClassId() == thermostatThingClassId) {
if (action.actionTypeId() == thermostatTemperatureSensorInputActionTypeId) { if (action.actionTypeId() == thermostatTemperatureSensorInputActionTypeId) {
thing->setStateValue(thermostatTemperatureSensorInputStateTypeId, action.param(thermostatTemperatureSensorInputActionTemperatureSensorInputParamTypeId).value()); thing->setStateValue(thermostatTemperatureSensorInputStateTypeId, action.param(thermostatTemperatureSensorInputActionTemperatureSensorInputParamTypeId).value());
@ -647,6 +648,45 @@ void IntegrationPluginGenericThings::executeAction(ThingActionInfo *info)
thermostatCheckPowerOutputState(thing); thermostatCheckPowerOutputState(thing);
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
return; return;
} else if (thing->thingClassId() == sgReadyThingClassId) {
if (action.actionTypeId() == sgReadyRelay1ActionTypeId) {
thing->setStateValue(sgReadyRelay1StateTypeId, action.param(sgReadyRelay1ActionRelay1ParamTypeId).value());
int operatingMode = sgReadyOperatingMode(thing->stateValue(sgReadyRelay1StateTypeId).toBool(), thing->stateValue(sgReadyRelay2StateTypeId).toBool());
thing->setStateValue(sgReadyOperatingModeStateTypeId, operatingMode);
thing->setStateValue(sgReadyOperatingModeDescriptionStateTypeId, sgReadyOperatingModeDescription(operatingMode));
info->finish(Thing::ThingErrorNoError);
return;
}
if (action.actionTypeId() == sgReadyRelay2ActionTypeId) {
thing->setStateValue(sgReadyRelay2StateTypeId, action.param(sgReadyRelay2ActionRelay2ParamTypeId).value());
int operatingMode = sgReadyOperatingMode(thing->stateValue(sgReadyRelay1StateTypeId).toBool(), thing->stateValue(sgReadyRelay2StateTypeId).toBool());
thing->setStateValue(sgReadyOperatingModeStateTypeId, operatingMode);
thing->setStateValue(sgReadyOperatingModeDescriptionStateTypeId, sgReadyOperatingModeDescription(operatingMode));
info->finish(Thing::ThingErrorNoError);
return;
}
if (action.actionTypeId() == sgReadyOperatingModeActionTypeId) {
int operatingMode = action.param(sgReadyOperatingModeActionOperatingModeParamTypeId).value().toInt();
thing->setStateValue(sgReadyOperatingModeStateTypeId, operatingMode);
thing->setStateValue(sgReadyOperatingModeDescriptionStateTypeId, sgReadyOperatingModeDescription(operatingMode));
if (operatingMode == 1) {
thing->setStateValue(sgReadyRelay1StateTypeId, 1);
thing->setStateValue(sgReadyRelay2StateTypeId, 0);
} else if (operatingMode == 2) {
thing->setStateValue(sgReadyRelay1StateTypeId, 0);
thing->setStateValue(sgReadyRelay2StateTypeId, 0);
} else if (operatingMode == 3) {
thing->setStateValue(sgReadyRelay1StateTypeId, 0);
thing->setStateValue(sgReadyRelay2StateTypeId, 1);
} else if (operatingMode == 4) {
thing->setStateValue(sgReadyRelay1StateTypeId, 1);
thing->setStateValue(sgReadyRelay2StateTypeId, 1);
}
info->finish(Thing::ThingErrorNoError);
return;
}
Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
} else { } else {
Q_ASSERT_X(false, "executeAction", QString("Unhandled thingClassId: %1").arg(thing->thingClassId().toString()).toUtf8()); Q_ASSERT_X(false, "executeAction", QString("Unhandled thingClassId: %1").arg(thing->thingClassId().toString()).toUtf8());
} }
@ -801,6 +841,7 @@ void IntegrationPluginGenericThings::moveBlindToAngle(Action action, Thing *thin
} }
} }
void IntegrationPluginGenericThings::thermostatCheckPowerOutputState(Thing *thing) void IntegrationPluginGenericThings::thermostatCheckPowerOutputState(Thing *thing)
{ {
double targetTemperature = thing->stateValue(thermostatTargetTemperatureStateTypeId).toDouble(); double targetTemperature = thing->stateValue(thermostatTargetTemperatureStateTypeId).toDouble();
@ -815,3 +856,53 @@ void IntegrationPluginGenericThings::thermostatCheckPowerOutputState(Thing *thin
//Possible improvement add boost action where powerState = true is forced inside the hysteresis //Possible improvement add boost action where powerState = true is forced inside the hysteresis
} }
} }
QString IntegrationPluginGenericThings::sgReadyOperatingModeDescription(int operatingMode)
{
if (operatingMode == 1) {
return "Operating mode 1";
} else if (operatingMode == 2) {
return "Operating mode 2";
} else if (operatingMode == 3) {
return "Operating mode 3";
} else if (operatingMode == 4) {
return "Operating mode 4";
}
return QString("Unknown operating mode %1").arg(operatingMode);
}
int IntegrationPluginGenericThings::sgReadyOperatingMode(bool relay1, bool relay2)
{
if (relay1 && !relay2) {
/*
* Betriebszustand 1 (1 Schaltzustand, bei Klemmenlösung: 1:0):
* Dieser Betriebszustand ist abwärtskompatibel zur häufig zu festen Uhrzeiten
* geschalteten EVU-Sperre und umfasst maximal 2 Stunden „harte“ Sperrzeit.
*/
return 1;
} else if (!relay1 && !relay2) {
/*
* Betriebszustand 2 (1 Schaltzustand, bei Klemmenlösungen: 0:0):
* In dieser Schaltung läuft die Wärmepumpe im energieffizienten Normalbetrieb
* mit anteiliger Wärmespeicher-Füllung für die maximal zweistündige EVU-Sperre.
*/
return 2;
} else if (!relay1 && relay2) {
/*
* Betriebszustand 3 (1 Schaltzustand, bei Klemmenlösung 0:1):
* In diesem Betriebszustand läuft die Wärmepumpe innerhalb des Reglers im verstärkten
* Betrieb für Raumheizung und Warmwasserbereitung. Es handelt sich dabei nicht um einen
* definitiven Anlaufbefehl, sondern um eine Einschaltempfehlung entsprechend der heutigen Anhebung.
*/
return 3;
} else {
/*
* Betriebszustand 4 (1 Schaltzustand, bei Klemmenlösung 1:1):
* Hierbei handelt es sich um einen definitiven Anlaufbefehl, insofern dieser im Rahmen der Regeleinstellungen möglich ist.
* Für diesen Betriebszustand müssen für verschiedene Tarif- und Nutzungsmodelle verschiedene Regelungsmodelle am Regler einstellbar sein:
* Variante 1: Die Wärmepumpe (Verdichter) wird aktiv eingeschaltet.
* Variante 2: Die Wärmepumpe (Verdichter und elektrische Zusatzheizungen) wird aktiv eingeschaltet, optional: höhere Temperatur in den Wärmespeichern
*/
return 4;
}
}

3
genericthings/integrationplugingenericthings.h
View File

@ -72,6 +72,9 @@ private:
void moveBlindToAngle(Action action, Thing *thing); void moveBlindToAngle(Action action, Thing *thing);
void thermostatCheckPowerOutputState(Thing *thing); void thermostatCheckPowerOutputState(Thing *thing);
int sgReadyOperatingMode(bool relay1, bool relay2);
QString sgReadyOperatingModeDescription(int operatingMode);
}; };
#endif // INTEGRATIONPLUGINGENERICTHINGS_H #endif // INTEGRATIONPLUGINGENERICTHINGS_H

53
genericthings/integrationplugingenericthings.json
View File

@ -1088,6 +1088,59 @@
"ioType": "digitalInput" "ioType": "digitalInput"
} }
] ]
},
{
"id": "83cf138d-02dc-4015-9b03-6360c2f3cfb1",
"name": "sgReady",
"displayName": "SG-Ready",
"createMethods": ["user"],
"interfaces": [],
"settingsTypes": [
],
"stateTypes": [
{
"id": "d080466e-7271-441f-9916-1199a6668545",
"name": "relay1",
"displayName": "Relay 1",
"displayNameEvent": "Relay 1 changed",
"displayNameAction": "Set relay 1",
"type": "bool",
"defaultValue": false,
"ioType": "digitalInput",
"writable": true
},
{
"id": "caf22937-fdf7-41e1-a87b-d11e66c4f4c6",
"name": "relay2",
"displayName": "Relay 2",
"displayNameEvent": "Relay 2 changed",
"displayNameAction": "Set relay 2",
"type": "bool",
"defaultValue": false,
"ioType": "digitalInput",
"writable": true
},
{
"id": "85667640-d719-4be4-a5fa-e41193eea162",
"name": "operatingMode",
"displayName": "Operating mode",
"displayNameAction": "Set operating mode",
"displayNameEvent": "Operating mode changed",
"type": "int",
"minValue": 1,
"maxValue": 4,
"writable": true,
"defaultValue": 2
},
{
"id": "b421d098-f6e9-40e2-b536-58acdb3a49fe",
"name": "operatingModeDescription",
"displayName": "Operating mode description",
"displayNameEvent": "Operating mode description changed",
"type": "QString",
"defaultValue": ""
}
]
} }
] ]
} }