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

Merge PR #57: SunSpec: Remove Kostal sunspec connection in favor of custom modbus implementation

pull/63/head
Jenkins nymea 2022-03-23 13:25:37 +01:00
parent d00edd494b c601cfb4db
commit 335261f025
4 changed files with 277 additions and 1303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sunspec/README.md
View File

@ -19,7 +19,6 @@ Connect nymea to SunSpec devices over Modbus TCP
## Tested connections
* SolarEdge (with custom battery)
* Kostal [Documentation](
## Requirements

51
sunspec/integrationpluginsunspec.cpp
View File

@ -70,25 +70,20 @@ void IntegrationPluginSunSpec::init()
// SunSpec connection params
m_connectionIpParamTypeIds.insert(sunspecConnectionThingClassId, sunspecConnectionThingIpAddressParamTypeId);
m_connectionIpParamTypeIds.insert(solarEdgeConnectionThingClassId, solarEdgeConnectionThingIpAddressParamTypeId);
m_connectionIpParamTypeIds.insert(kostalConnectionThingClassId, kostalConnectionThingIpAddressParamTypeId);
m_connectionPortParamTypeIds.insert(sunspecConnectionThingClassId, sunspecConnectionThingPortParamTypeId);
m_connectionPortParamTypeIds.insert(solarEdgeConnectionThingClassId, solarEdgeConnectionThingPortParamTypeId);
m_connectionPortParamTypeIds.insert(kostalConnectionThingClassId, kostalConnectionThingPortParamTypeId);
m_connectionMacAddressParamTypeIds.insert(sunspecConnectionThingClassId, sunspecConnectionThingMacAddressParamTypeId);
m_connectionMacAddressParamTypeIds.insert(solarEdgeConnectionThingClassId, solarEdgeConnectionThingMacAddressParamTypeId);
m_connectionMacAddressParamTypeIds.insert(kostalConnectionThingClassId, kostalConnectionThingMacAddressParamTypeId);
m_connectionSlaveIdParamTypeIds.insert(sunspecConnectionThingClassId, sunspecConnectionThingSlaveIdParamTypeId);
m_connectionSlaveIdParamTypeIds.insert(solarEdgeConnectionThingClassId, solarEdgeConnectionThingSlaveIdParamTypeId);
m_connectionSlaveIdParamTypeIds.insert(kostalConnectionThingClassId, kostalConnectionThingSlaveIdParamTypeId);
// Connected state for all things
m_connectedStateTypeIds.insert(sunspecConnectionThingClassId, sunspecConnectionConnectedStateTypeId);
m_connectedStateTypeIds.insert(solarEdgeConnectionThingClassId, solarEdgeConnectionConnectedStateTypeId);
m_connectedStateTypeIds.insert(solarEdgeBatteryThingClassId, solarEdgeBatteryConnectedStateTypeId);
m_connectedStateTypeIds.insert(kostalConnectionThingClassId, kostalConnectionConnectedStateTypeId);
// Child things
m_connectedStateTypeIds.insert(sunspecStorageThingClassId, sunspecStorageConnectedStateTypeId);
@ -173,7 +168,6 @@ void IntegrationPluginSunSpec::discoverThings(ThingDiscoveryInfo *info)
}
} else {
// Generic or not discoverable sunspec connection, show all network results
// - Kostal does not provide any usefull information for filtering in the discovery
if (networkDeviceInfo.hostName().isEmpty()) {
title += networkDeviceInfo.address().toString();
} else {
@ -218,8 +212,7 @@ void IntegrationPluginSunSpec::setupThing(ThingSetupInfo *info)
qCDebug(dcSunSpec()) << thing->params();
if (thing->thingClassId() == sunspecConnectionThingClassId
|| thing->thingClassId() == solarEdgeConnectionThingClassId
|| thing->thingClassId() == kostalConnectionThingClassId) {
|| thing->thingClassId() == solarEdgeConnectionThingClassId) {
setupConnection(info);
} else if (thing->thingClassId() == sunspecThreePhaseInverterThingClassId
@ -455,46 +448,8 @@ void IntegrationPluginSunSpec::processDiscoveryResult(Thing *thing, SunSpecConne
{
qCDebug(dcSunSpec()) << "Processing discovery result from" << thing->name() << connection;
// Note: from kostal devices is known, that they add inverter
// as normal and float version, but we need only one.
// Lets filter the duplicated information for kostal connections
if (thing->thingClassId() == kostalConnectionThingClassId) {
QHash<quint16, SunSpecModel *> filteredModels;
foreach (SunSpecModel *model, connection->models()) {
switch (model->modelId()) {
case SunSpecModelFactory::ModelIdInverterSinglePhaseFloat:
if (filteredModels.contains(SunSpecModelFactory::ModelIdInverterSinglePhase)) {
qCDebug(dcSunSpec()) << "Kostal: Filter out" << model;
} else {
filteredModels.insert(model->modelId(), model);
}
break;
case SunSpecModelFactory::ModelIdInverterSplitPhaseFloat:
if (filteredModels.contains(SunSpecModelFactory::ModelIdInverterSplitPhase)) {
qCDebug(dcSunSpec()) << "Kostal: Filter out" << model;
} else {
filteredModels.insert(model->modelId(), model);
}
break;
case SunSpecModelFactory::ModelIdInverterThreePhaseFloat:
if (filteredModels.contains(SunSpecModelFactory::ModelIdInverterThreePhase)) {
qCDebug(dcSunSpec()) << "Kostal: Filter out" << model;
} else {
filteredModels.insert(model->modelId(), model);
}
break;
default:
filteredModels.insert(model->modelId(), model);
break;
}
}
// Process the filtered list
checkAutoSetupModels(thing, filteredModels.values());
} else {
// Process all models
checkAutoSetupModels(thing, connection->models());
}
// Process all models
checkAutoSetupModels(thing, connection->models());
}
void IntegrationPluginSunSpec::checkAutoSetupModels(Thing *connectionThing, QList<SunSpecModel *> models)

56
sunspec/integrationpluginsunspec.json
View File

@ -1674,62 +1674,6 @@
]
}
]
},
{
"name": "kostal",
"displayName": "KOSTAL Solar Electric",
"id": "862d1ebf-cb78-4c55-89b2-819fddfd9acd",
"thingClasses": [
{
"name": "kostalConnection",
"displayName": "Kostal SunSpec",
"id": "0cad2dca-66ac-489c-8443-074e32aa27a0",
"createMethods": [ "User", "Discovery" ],
"interfaces": ["gateway"],
"providedInterfaces": ["solarinverter", "energystorage"],
"paramTypes": [
{
"id": "9fe10047-b2fd-460b-88ad-7f00977efc57",
"name":"ipAddress",
"displayName": "IP address",
"type": "QString",
"defaultValue": "127.0.0.1"
},
{
"id": "047b048d-2e93-4129-80df-231688436da4",
"name":"macAddress",
"displayName": "MAC address",
"type": "QString",
"defaultValue": "00:00:00:00:00:00"
},
{
"id": "bf87f540-ce2e-4c35-af62-942da7be2f80",
"name":"port",
"displayName": "Port",
"type": "int",
"defaultValue": 1502
},
{
"id": "48b133da-cce3-47f3-9c7c-470026af7829",
"name":"slaveId",
"displayName": "Slave ID",
"type": "int",
"defaultValue": 71
}
],
"stateTypes":[
{
"id": "b9c52ae8-cb9b-4742-8e9a-450dce3a009f",
"name": "connected",
"displayName": "Connected",
"displayNameEvent": "Connected changed",
"type": "bool",
"defaultValue": false,
"cached": false
}
]
}
]
}
]
}

1472
sunspec/translations/cb4bdec6-cf2c-4a0f-9709-42d951ca2d8b-en_US.ts
View File

File diff suppressed because it is too large Load Diff