ETM-Schurig/nymea-plugins
1
0
Fork 0
mirror of https://github.com/nymea/nymea-plugins.git synced 2026-10-23 14:43:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add charging max power and fix states

Browse Source
This commit is contained in:
Simon Stürz 2022-11-15 00:37:39 +01:00
parent f647b809c9
commit 64482e1776
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fronius/integrationpluginfronius.cpp
View File

@ -246,6 +246,7 @@ void IntegrationPluginFronius::setupThing(ThingSetupInfo *info)
thing->setStateValue(sunspecStorageVersionStateTypeId, model->commonModelInfo().versionString); thing->setStateValue(sunspecStorageVersionStateTypeId, model->commonModelInfo().versionString);
thing->setStateValue(sunspecStorageBatteryCriticalStateTypeId, storage->chaState() < 5); thing->setStateValue(sunspecStorageBatteryCriticalStateTypeId, storage->chaState() < 5);
thing->setStateValue(sunspecStorageMaxChargingPowerStateTypeId, storage->wChaMax());
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, qRound(storage->chaState())); thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, qRound(storage->chaState()));
thing->setStateValue(sunspecStorageGridChargingStateTypeId, storage->chaGriSet() == SunSpecStorageModel::ChagrisetGrid); thing->setStateValue(sunspecStorageGridChargingStateTypeId, storage->chaGriSet() == SunSpecStorageModel::ChagrisetGrid);
thing->setStateValue(sunspecStorageEnableChargingStateTypeId, storage->storCtlMod().testFlag(SunSpecStorageModel::Storctl_modCharge)); thing->setStateValue(sunspecStorageEnableChargingStateTypeId, storage->storCtlMod().testFlag(SunSpecStorageModel::Storctl_modCharge));
@ -254,31 +255,31 @@ void IntegrationPluginFronius::setupThing(ThingSetupInfo *info)
switch (storage->chaSt()) { switch (storage->chaSt()) {
case SunSpecStorageModel::ChastOff: case SunSpecStorageModel::ChastOff:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Off"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Off");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle");
break; break;
case SunSpecStorageModel::ChastEmpty: case SunSpecStorageModel::ChastEmpty:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Empty"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Empty");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle");
break; break;
case SunSpecStorageModel::ChastDischarging: case SunSpecStorageModel::ChastDischarging:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Discharging"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Discharging");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "discharging"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "discharging");
break; break;
case SunSpecStorageModel::ChastCharging: case SunSpecStorageModel::ChastCharging:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Charging"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Charging");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "charging"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "charging");
break; break;
case SunSpecStorageModel::ChastFull: case SunSpecStorageModel::ChastFull:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Full"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Full");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle");
break; break;
case SunSpecStorageModel::ChastHolding: case SunSpecStorageModel::ChastHolding:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Holding"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Holding");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle");
break; break;
case SunSpecStorageModel::ChastTesting: case SunSpecStorageModel::ChastTesting:
thing->setStateValue(sunspecStorageBatteryLevelStateTypeId, "Testing"); thing->setStateValue(sunspecStorageStorageStatusStateTypeId, "Testing");
thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle"); thing->setStateValue(sunspecStorageChargingStateStateTypeId, "idle");
break; break;
} }
@ -323,7 +324,6 @@ void IntegrationPluginFronius::postSetupThing(Thing *thing)
foreach (SunSpecStorageModel *model, m_sunSpecStorages.values()) { foreach (SunSpecStorageModel *model, m_sunSpecStorages.values()) {
model->readBlockData(); model->readBlockData();
} }
}); });
@ -466,6 +466,21 @@ void IntegrationPluginFronius::executeAction(ThingActionInfo *info)
} }
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} else if (action.actionTypeId() == sunspecStorageMaxChargingPowerActionTypeId) {
QModbusReply *reply = storage->setWChaMax(action.param(sunspecStorageMaxChargingPowerActionMaxChargingPowerParamTypeId).value().toFloat());
if (!reply) {
info->finish(Thing::ThingErrorHardwareFailure);
return;
}
connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
connect(reply, &QModbusReply::finished, info, [info, reply]{
if (reply->error() != QModbusDevice::NoError) {
info->finish(Thing::ThingErrorHardwareFailure);
return;
}
info->finish(Thing::ThingErrorNoError);
});
} 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());
} }

10
fronius/integrationpluginfronius.json
View File

@ -481,6 +481,16 @@
"maxValue": 100, "maxValue": 100,
"defaultValue": 0 "defaultValue": 0
}, },
{
"id": "1747f03b-75a2-4a7c-9ab9-b51fe5e13932",
"name": "maxChargingPower",
"displayName": "Max charging power",
"displayNameAction": "Set max charging power",
"type": "int",
"unit": "Watt",
"defaultValue": 0,
"writable": true
},
{ {
"id": "1dd36a84-eacd-4bd7-adbd-3ab1ccfaa9ac", "id": "1dd36a84-eacd-4bd7-adbd-3ab1ccfaa9ac",
"name": "storageStatus", "name": "storageStatus",