ETM-Schurig
/
nymea-plugins-genericthings
mirror of https://github.com/nymea/nymea-plugins-genericthings.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #20: Generic Energy: Add a generic wallbox

remove-unneeded-dependency
jenkins 2023-11-28 10:40:15 +01:00
parent 6a0afadc49 8a9f0d7b77
commit f721478814
2 changed files with 144 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
genericenergy/integrationplugingenericenergy.cpp
View File

@ -74,8 +74,17 @@ void IntegrationPluginGenericEnergy::setupThing(ThingSetupInfo *info)
thing->setStateValue(energyStorageBatteryCriticalStateTypeId, currentBatteryLevel <= value.toInt());
}
});
} else if (thing->thingClassId() == wallboxThingClassId) {
connect(thing, &Thing::settingChanged, [thing](const ParamTypeId &settingTypeId, const QVariant &value) {
if (settingTypeId == wallboxSettingsMinChargingCurrentParamTypeId) {
thing->setStateMinValue(wallboxMaxChargingCurrentStateTypeId, value);
} else if (settingTypeId == wallboxSettingsMaxChargingCurrentParamTypeId) {
thing->setStateMaxValue(wallboxMaxChargingCurrentStateTypeId, value);
}
});
}
// Fall trough, if not already finished and returned...
info->finish(Thing::ThingErrorNoError);
}
@ -157,6 +166,30 @@ void IntegrationPluginGenericEnergy::executeAction(ThingActionInfo *info)
info->finish(Thing::ThingErrorNoError);
return;
}
} else if (thing->thingClassId() == wallboxThingClassId) {
if (action.actionTypeId() == wallboxChargingActionTypeId) {
thing->setStateValue(wallboxChargingStateTypeId, action.paramValue(wallboxChargingActionChargingParamTypeId).toBool());
} else if (action.actionTypeId() == wallboxCurrentPowerActionTypeId) {
thing->setStateValue(wallboxCurrentPowerStateTypeId, action.paramValue(wallboxCurrentPowerActionCurrentPowerParamTypeId).toDouble());
} else if (action.actionTypeId() == wallboxDesiredPhaseCountActionTypeId) {
thing->setStateValue(wallboxDesiredPhaseCountStateTypeId, action.paramValue(wallboxDesiredPhaseCountActionDesiredPhaseCountParamTypeId).toUInt());
} else if (action.actionTypeId() == wallboxMaxChargingCurrentActionTypeId) {
thing->setStateValue(wallboxMaxChargingCurrentStateTypeId, action.paramValue(wallboxMaxChargingCurrentActionMaxChargingCurrentParamTypeId).toUInt());
} else if (action.actionTypeId() == wallboxPhaseCountActionTypeId) {
thing->setStateValue(wallboxPhaseCountStateTypeId, action.paramValue(wallboxPhaseCountActionPhaseCountParamTypeId).toUInt());
} else if (action.actionTypeId() == wallboxPluggedInActionTypeId) {
thing->setStateValue(wallboxPluggedInStateTypeId, action.paramValue(wallboxPluggedInActionPluggedInParamTypeId).toBool());
} else if (action.actionTypeId() == wallboxPowerActionTypeId) {
thing->setStateValue(wallboxPowerStateTypeId, action.paramValue(wallboxPowerActionPowerParamTypeId).toBool());
} else if (action.actionTypeId() == wallboxTotalEnergyConsumedActionTypeId) {
thing->setStateValue(wallboxTotalEnergyConsumedStateTypeId, action.paramValue(wallboxTotalEnergyConsumedActionTotalEnergyConsumedParamTypeId).toDouble());
} else {
Q_ASSERT_X(false, "Generic Wallbox", QString("Unhandled action: %1").arg(action.actionTypeId().toString()).toUtf8());
info->finish(Thing::ThingErrorUnsupportedFeature);
return;
}
info->finish(Thing::ThingErrorNoError);
} else {
Q_ASSERT_X(false, "executeAction", QString("Unhandled thingClassId: %1").arg(thing->thingClassId().toString()).toUtf8());
}

111
genericenergy/integrationplugingenericenergy.json
View File

@ -289,6 +289,117 @@
"writable": true
}
]
},
{
"id": "6f453eaa-7594-4be8-a92d-14878193071a",
"name": "wallbox",
"displayName": "Generic wallbox",
"createMethods": ["user"],
"interfaces": ["evcharger", "smartmeterconsumer"],
"settingsTypes": [
{
"id": "03da62b5-9b6a-4cd0-8e68-8c93da98e2fe",
"name": "minChargingCurrent",
"displayName": "Minimum charging current",
"type": "uint",
"minValue": 0,
"maxValue": 6,
"defaultValue": 6
},
{
"id": "017b2d92-eb57-4177-b489-437b04e212eb",
"name": "maxChargingCurrent",
"displayName": "Maximum charging current",
"type": "uint",
"minValue": 6,
"maxValue": 64,
"defaultValue": 32
}
],
"stateTypes": [
{
"id": "1e0890e5-065a-455a-a068-10b0231897f4",
"name": "maxChargingCurrent",
"displayName": "Maximum charging current",
"displayNameAction": "Set maximum charging current",
"type": "uint",
"unit": "Ampere",
"minValue": 6,
"maxValue": 32,
"defaultValue": 6,
"writable": true
},
{
"id": "51c7b606-1eb0-418a-8203-3f0fb9d6e454",
"name": "power",
"displayName": "Charging allowed",
"displayNameAction": "Set charging allowed",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "e9cc633d-35a6-4a86-8e97-14b12ba06d8e",
"name": "pluggedIn",
"displayName": "Plugged in",
"displayNameAction": "Set plugged in",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "b5d43614-7ed0-4c6e-b48a-f74aa9884769",
"name": "charging",
"displayName": "Charging",
"displayNameAction": "Set charging",
"type": "bool",
"defaultValue": false,
"writable": true
},
{
"id": "08fbe34e-735d-4ce5-81c7-ea1c7b07877b",
"name": "phaseCount",
"displayName": "Used phase count",
"displayNameAction": "Set phase count",
"type": "uint",
"minValue": 1,
"maxValue": 3,
"defaultValue": 3,
"writable": true
},
{
"id": "68239a43-c627-4b31-bc48-e8a814066cc5",
"name": "desiredPhaseCount",
"displayName": "Desired phase count",
"displayNameAction": "Set desired phase count",
"type": "uint",
"possibleValues": [1, 3],
"minValue": 1,
"maxValue": 3,
"defaultValue": 3,
"writable": true
},
{
"id": "596a002d-77f4-410c-8ca9-3a4bb8051328",
"name": "currentPower",
"displayName": "Current power consumption",
"displayNameAction": "Set current power",
"type": "double",
"unit": "Watt",
"defaultValue": 0,
"writable": true
},
{
"id": "c3b4303f-7267-4401-b2da-2378d39d762d",
"name": "totalEnergyConsumed",
"displayName": "Total energy consumption",
"displayNameAction": "Set total energy consumption",
"type": "double",
"unit": "KiloWattHour",
"defaultValue": 0,
"writable": true
}
]
}
]
}