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

Fix battery state

Browse Source
This commit is contained in:
Simon Stürz 2022-08-09 14:11:54 +02:00
parent 33a32169f1
commit afaaa04d62
5 changed files with 184 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
huawei/huawei-fusion-solar-registers.json
View File

@ -135,15 +135,15 @@
}, },
{ {
"key": "Running", "key": "Running",
"value": 1 "value": 2
}, },
{ {
"key": "Fault", "key": "Fault",
"value": 1 "value": 3
}, },
{ {
"key": "SleepMode", "key": "SleepMode",
"value": 1 "value": 4
} }
] ]
} }

6
huawei/huawei-registers.json
View File

@ -135,15 +135,15 @@
}, },
{ {
"key": "Running", "key": "Running",
"value": 1 "value": 2
}, },
{ {
"key": "Fault", "key": "Fault",
"value": 1 "value": 3
}, },
{ {
"key": "SleepMode", "key": "SleepMode",
"value": 1 "value": 4
} }
] ]
} }

30
huawei/huaweifusionsolardiscovery.cpp
View File

@ -99,26 +99,8 @@ void HuaweiFusionSolarDiscovery::checkNetworkDevice(const NetworkDeviceInfo &net
return; return;
} }
// Modbus TCP connected...ok, let's try to initialize it! qCDebug(dcHuawei()) << "Discovery: --> Found" << networkDeviceInfo;
connect(connection, &HuaweiFusionSolar::initializationFinished, this, [=](bool success){ m_discoveryResults.append(networkDeviceInfo);
if (!success) {
qCDebug(dcHuawei()) << "Discovery: Initialization failed on" << networkDeviceInfo.address().toString() << "Continue...";;
cleanupConnection(connection);
return;
}
qCDebug(dcHuawei()) << "Discovery: --> Found" << networkDeviceInfo;
m_discoveryResults.append(networkDeviceInfo);
// Done with this connection
cleanupConnection(connection);
});
// Initializing...
if (!connection->initialize()) {
qCDebug(dcHuawei()) << "Discovery: Unable to initialize connection on" << networkDeviceInfo.address().toString() << "Continue...";;
cleanupConnection(connection);
}
}); });
// If we get any error...skip this host... // If we get any error...skip this host...
@ -145,9 +127,11 @@ void HuaweiFusionSolarDiscovery::checkNetworkDevice(const NetworkDeviceInfo &net
void HuaweiFusionSolarDiscovery::cleanupConnection(HuaweiFusionSolar *connection) void HuaweiFusionSolarDiscovery::cleanupConnection(HuaweiFusionSolar *connection)
{ {
m_connections.removeAll(connection); if (m_connections.contains(connection)) {
connection->disconnectDevice(); m_connections.removeAll(connection);
connection->deleteLater(); connection->disconnectDevice();
connection->deleteLater();
}
} }
void HuaweiFusionSolarDiscovery::finishDiscovery() void HuaweiFusionSolarDiscovery::finishDiscovery()

326
huawei/integrationpluginhuawei.cpp
View File

@ -115,13 +115,12 @@ void IntegrationPluginHuawei::setupThing(ThingSetupInfo *info)
if (thing->thingClassId() == huaweiFusionSolarInverterThingClassId) { if (thing->thingClassId() == huaweiFusionSolarInverterThingClassId) {
// Handle reconfigure // Handle reconfigure
if (m_connections.contains(thing)) { if (m_connections.contains(thing))
m_connections.take(thing)->deleteLater(); delete m_connections.take(thing);
if (m_monitors.contains(thing))
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_monitors.take(thing));
if (m_monitors.contains(thing)) {
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_monitors.take(thing));
}
}
// Make sure we have a valid mac address, otherwise no monitor and not auto searching is possible // Make sure we have a valid mac address, otherwise no monitor and not auto searching is possible
MacAddress macAddress = MacAddress(thing->paramValue(huaweiFusionSolarInverterThingMacAddressParamTypeId).toString()); MacAddress macAddress = MacAddress(thing->paramValue(huaweiFusionSolarInverterThingMacAddressParamTypeId).toString());
@ -385,15 +384,17 @@ void IntegrationPluginHuawei::postSetupThing(Thing *thing)
void IntegrationPluginHuawei::thingRemoved(Thing *thing) void IntegrationPluginHuawei::thingRemoved(Thing *thing)
{ {
if (thing->thingClassId() == huaweiFusionSolarInverterThingClassId && m_connections.contains(thing)) { if (m_monitors.contains(thing)) {
m_connections.take(thing)->deleteLater(); hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_monitors.take(thing));
if (m_monitors.contains(thing)) {
hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(m_monitors.take(thing));
}
} }
if (thing->thingClassId() == huaweiRtuInverterThingClassId && m_rtuConnections.contains(thing)) { if (m_connections.contains(thing)) {
HuaweiFusionSolar *connection = m_connections.take(thing);
connection->disconnectDevice();
delete connection;
}
if (m_rtuConnections.contains(thing)) {
m_rtuConnections.take(thing)->deleteLater(); m_rtuConnections.take(thing)->deleteLater();
} }
@ -410,165 +411,178 @@ void IntegrationPluginHuawei::setupFusionSolar(ThingSetupInfo *info)
uint port = thing->paramValue(huaweiFusionSolarInverterThingPortParamTypeId).toUInt(); uint port = thing->paramValue(huaweiFusionSolarInverterThingPortParamTypeId).toUInt();
quint16 slaveId = thing->paramValue(huaweiFusionSolarInverterThingSlaveIdParamTypeId).toUInt(); quint16 slaveId = thing->paramValue(huaweiFusionSolarInverterThingSlaveIdParamTypeId).toUInt();
qCDebug(dcHuawei()) << "Setup connection to fusion solar dongle" << monitor->networkDeviceInfo().address().toString() << port << slaveId;
HuaweiFusionSolar *connection = new HuaweiFusionSolar(monitor->networkDeviceInfo().address(), port, slaveId, this); HuaweiFusionSolar *connection = new HuaweiFusionSolar(monitor->networkDeviceInfo().address(), port, slaveId, this);
connect(info, &ThingSetupInfo::aborted, connection, &HuaweiFusionSolar::deleteLater);
qCDebug(dcHuawei()) << "Finish setup huawei fusion solar dongle" << monitor->networkDeviceInfo().address().toString() << port << slaveId; connect(connection, &HuaweiFusionSolar::reachableChanged, info, [=](bool reachable){
if (!reachable) {
connect(connection, &HuaweiFusionSolar::reachableChanged, thing, [=](bool reachable){ qCWarning(dcHuawei()) << "Connection init finished with errors" << thing->name() << connection->hostAddress().toString();
qCDebug(dcHuawei()) << "Reachable changed to" << reachable << "for" << thing; hardwareManager()->networkDeviceDiscovery()->unregisterMonitor(monitor);
thing->setStateValue("connected", reachable); connection->disconnectDevice();
foreach (Thing *childThing, myThings().filterByParentId(thing->id())) { connection->deleteLater();
childThing->setStateValue("connected", reachable); info->finish(Thing::ThingErrorHardwareFailure, QT_TR_NOOP("Could not initialize the communication with the SmartDongle."));
}
});
connect(monitor, &NetworkDeviceMonitor::reachableChanged, thing, [=](bool reachable){
if (!thing->setupComplete())
return; return;
qCDebug(dcHuawei()) << "Network device monitor for" << thing->name() << (reachable ? "is now reachable" : "is not reachable any more" );
if (reachable && !thing->stateValue("connected").toBool()) {
connection->setHostAddress(monitor->networkDeviceInfo().address());
connection->connectDevice();
} else if (!reachable) {
// Note: We disable autoreconnect explicitly and we will
// connect the device once the monitor says it is reachable again
connection->disconnectDevice();
}
});
connect(connection, &HuaweiFusionSolar::inverterActivePowerChanged, thing, [](float inverterActivePower){
qCDebug(dcHuawei()) << "Inverter power changed" << inverterActivePower * -1000.0 << "W";
//thing->setStateValue(huaweiFusionSolarInverterCurrentPowerStateTypeId, inverterActivePower * -1000.0);
});
connect(connection, &HuaweiFusionSolar::actualInverterPowerChanged, thing, [thing](float actualInverterPower){
qCDebug(dcHuawei()) << "Inverter actual power changed" << actualInverterPower << "W";
thing->setStateValue(huaweiFusionSolarInverterCurrentPowerStateTypeId, actualInverterPower);
});
connect(connection, &HuaweiFusionSolar::inverterDeviceStatusChanged, thing, [thing](HuaweiFusionSolar::InverterDeviceStatus inverterDeviceStatus){
qCDebug(dcHuawei()) << "Inverter device status changed" << inverterDeviceStatus;
Q_UNUSED(thing)
});
connect(connection, &HuaweiFusionSolar::inverterEnergyProducedChanged, thing, [thing](float inverterEnergyProduced){
qCDebug(dcHuawei()) << "Inverter total energy produced changed" << inverterEnergyProduced << "kWh";
thing->setStateValue(huaweiFusionSolarInverterTotalEnergyProducedStateTypeId, inverterEnergyProduced);
});
// Meter
connect(connection, &HuaweiFusionSolar::powerMeterActivePowerChanged, thing, [this, thing](qint32 powerMeterActivePower){
Things meterThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiMeterThingClassId);
if (!meterThings.isEmpty()) {
qCDebug(dcHuawei()) << "Meter power changed" << powerMeterActivePower << "W";
// Note: > 0 -> return, < 0 consume
meterThings.first()->setStateValue(huaweiMeterCurrentPowerStateTypeId, -powerMeterActivePower);
} }
});
// Battery 1 m_connections.insert(thing, connection);
connect(connection, &HuaweiFusionSolar::lunaBattery1StatusChanged, thing, [this, thing](HuaweiFusionSolar::BatteryDeviceStatus lunaBattery1Status){ info->finish(Thing::ThingErrorNoError);
qCDebug(dcHuawei()) << "Battery 1 status changed" << lunaBattery1Status;
if (lunaBattery1Status != HuaweiFusionSolar::BatteryDeviceStatusOffline) { qCDebug(dcHuawei()) << "Setup huawei fusion solar smart dongle finished successfully" << monitor->networkDeviceInfo().address().toString() << port << slaveId;
// Check if w have to create the energy storage
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId); // Set connected state
bool alreadySetUp = false; thing->setStateValue("connected", true);
foreach (Thing *batteryThing, batteryThings) { foreach (Thing *childThing, myThings().filterByParentId(thing->id())) {
if (batteryThing->paramValue(huaweiBatteryThingUnitParamTypeId).toUInt() == 1) { childThing->setStateValue("connected", true);
alreadySetUp = true; }
connect(connection, &HuaweiFusionSolar::reachableChanged, thing, [=](bool reachable){
qCDebug(dcHuawei()) << "Reachable changed to" << reachable << "for" << thing;
thing->setStateValue("connected", reachable);
foreach (Thing *childThing, myThings().filterByParentId(thing->id())) {
childThing->setStateValue("connected", reachable);
}
});
connect(monitor, &NetworkDeviceMonitor::reachableChanged, thing, [=](bool reachable){
if (!thing->setupComplete())
return;
qCDebug(dcHuawei()) << "Network device monitor for" << thing->name() << (reachable ? "is now reachable" : "is not reachable any more" );
if (reachable && !thing->stateValue("connected").toBool()) {
connection->setHostAddress(monitor->networkDeviceInfo().address());
connection->connectDevice();
} else if (!reachable) {
// Note: We disable autoreconnect explicitly and we will
// connect the device once the monitor says it is reachable again
connection->disconnectDevice();
}
});
connect(connection, &HuaweiFusionSolar::actualInverterPowerChanged, thing, [thing](float actualInverterPower){
qCDebug(dcHuawei()) << "Inverter actual power changed" << actualInverterPower << "W";
thing->setStateValue(huaweiFusionSolarInverterCurrentPowerStateTypeId, actualInverterPower);
});
connect(connection, &HuaweiFusionSolar::inverterDeviceStatusReadFinished, thing, [thing](HuaweiFusionSolar::InverterDeviceStatus inverterDeviceStatus){
qCDebug(dcHuawei()) << "Inverter device status changed" << inverterDeviceStatus;
Q_UNUSED(thing)
});
connect(connection, &HuaweiFusionSolar::inverterEnergyProducedReadFinished, thing, [thing](float inverterEnergyProduced){
qCDebug(dcHuawei()) << "Inverter total energy produced changed" << inverterEnergyProduced << "kWh";
thing->setStateValue(huaweiFusionSolarInverterTotalEnergyProducedStateTypeId, inverterEnergyProduced);
});
// Meter
connect(connection, &HuaweiFusionSolar::powerMeterActivePowerReadFinished, thing, [this, thing](qint32 powerMeterActivePower){
Things meterThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiMeterThingClassId);
if (!meterThings.isEmpty()) {
qCDebug(dcHuawei()) << "Meter power changed" << powerMeterActivePower << "W";
// Note: > 0 -> return, < 0 consume
meterThings.first()->setStateValue(huaweiMeterCurrentPowerStateTypeId, -powerMeterActivePower);
}
});
// Battery 1
connect(connection, &HuaweiFusionSolar::lunaBattery1StatusReadFinished, thing, [this, thing](HuaweiFusionSolar::BatteryDeviceStatus lunaBattery1Status){
qCDebug(dcHuawei()) << "Battery 1 status changed" << lunaBattery1Status;
if (lunaBattery1Status != HuaweiFusionSolar::BatteryDeviceStatusOffline) {
// Check if w have to create the energy storage
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId);
bool alreadySetUp = false;
foreach (Thing *batteryThing, batteryThings) {
if (batteryThing->paramValue(huaweiBatteryThingUnitParamTypeId).toUInt() == 1) {
alreadySetUp = true;
}
}
if (!alreadySetUp) {
qCDebug(dcHuawei()) << "Set up huawei energy storage 1 for" << thing;
ThingDescriptor descriptor(huaweiBatteryThingClassId, "Luna 2000 Battery", QString(), thing->id());
ParamList params;
params.append(Param(huaweiBatteryThingUnitParamTypeId, 1));
descriptor.setParams(params);
emit autoThingsAppeared(ThingDescriptors() << descriptor);
} }
} }
});
if (!alreadySetUp) { connect(connection, &HuaweiFusionSolar::lunaBattery1PowerReadFinished, thing, [this, thing](qint32 lunaBattery1Power){
qCDebug(dcHuawei()) << "Set up huawei energy storage 1 for" << thing; qCDebug(dcHuawei()) << "Battery 1 power changed" << lunaBattery1Power << "W";
ThingDescriptor descriptor(huaweiBatteryThingClassId, "Luna 2000 Battery", QString(), thing->id()); Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 1);
ParamList params; if (!batteryThings.isEmpty()) {
params.append(Param(huaweiBatteryThingUnitParamTypeId, 1)); batteryThings.first()->setStateValue(huaweiBatteryCurrentPowerStateTypeId, lunaBattery1Power);
descriptor.setParams(params); if (lunaBattery1Power < 0) {
emit autoThingsAppeared(ThingDescriptors() << descriptor); batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "discharging");
} } else if (lunaBattery1Power > 0) {
} batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "charging");
}); } else {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "idle");
connect(connection, &HuaweiFusionSolar::lunaBattery1PowerChanged, thing, [this, thing](qint32 lunaBattery1Power){
qCDebug(dcHuawei()) << "Battery 1 power changed" << lunaBattery1Power << "W";
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 1);
if (!batteryThings.isEmpty()) {
batteryThings.first()->setStateValue(huaweiBatteryCurrentPowerStateTypeId, lunaBattery1Power);
if (lunaBattery1Power < 0) {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "discharging");
} else if (lunaBattery1Power > 0) {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "charging");
} else {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "idle");
}
}
});
connect(connection, &HuaweiFusionSolar::lunaBattery1SocChanged, thing, [this, thing](float lunaBattery1Soc){
qCDebug(dcHuawei()) << "Battery 1 SOC changed" << lunaBattery1Soc << "%";
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 1);
if (!batteryThings.isEmpty()) {
batteryThings.first()->setStateValue(huaweiBatteryBatteryLevelStateTypeId, lunaBattery1Soc);
batteryThings.first()->setStateValue(huaweiBatteryBatteryCriticalStateTypeId, lunaBattery1Soc < 10);
}
});
// Battery 2
connect(connection, &HuaweiFusionSolar::lunaBattery2StatusChanged, thing, [this, thing](HuaweiFusionSolar::BatteryDeviceStatus lunaBattery1Status){
qCDebug(dcHuawei()) << "Battery 2 status changed" << lunaBattery1Status;
if (lunaBattery1Status != HuaweiFusionSolar::BatteryDeviceStatusOffline) {
// Check if w have to create the energy storage
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId);
bool alreadySetUp = false;
foreach (Thing *batteryThing, batteryThings) {
if (batteryThing->paramValue(huaweiBatteryThingUnitParamTypeId).toUInt() == 2) {
alreadySetUp = true;
} }
} }
});
if (!alreadySetUp) { connect(connection, &HuaweiFusionSolar::lunaBattery1SocReadFinished, thing, [this, thing](float lunaBattery1Soc){
qCDebug(dcHuawei()) << "Set up huawei energy storage 2 for" << thing; qCDebug(dcHuawei()) << "Battery 1 SOC changed" << lunaBattery1Soc << "%";
ThingDescriptor descriptor(huaweiBatteryThingClassId, "Luna 2000 Battery", QString(), thing->id()); Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 1);
ParamList params; if (!batteryThings.isEmpty()) {
params.append(Param(huaweiBatteryThingUnitParamTypeId, 2)); batteryThings.first()->setStateValue(huaweiBatteryBatteryLevelStateTypeId, lunaBattery1Soc);
descriptor.setParams(params); batteryThings.first()->setStateValue(huaweiBatteryBatteryCriticalStateTypeId, lunaBattery1Soc < 10);
emit autoThingsAppeared(ThingDescriptors() << descriptor);
} }
} });
});
connect(connection, &HuaweiFusionSolar::lunaBattery2PowerChanged, thing, [this, thing](qint32 lunaBattery2Power){ // Battery 2
qCDebug(dcHuawei()) << "Battery 2 power changed" << lunaBattery2Power << "W"; connect(connection, &HuaweiFusionSolar::lunaBattery2StatusReadFinished, thing, [this, thing](HuaweiFusionSolar::BatteryDeviceStatus lunaBattery2Status){
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 2); qCDebug(dcHuawei()) << "Battery 2 status changed" << lunaBattery2Status;
if (!batteryThings.isEmpty()) { if (lunaBattery2Status != HuaweiFusionSolar::BatteryDeviceStatusOffline) {
batteryThings.first()->setStateValue(huaweiBatteryCurrentPowerStateTypeId, lunaBattery2Power); // Check if w have to create the energy storage
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId);
bool alreadySetUp = false;
foreach (Thing *batteryThing, batteryThings) {
if (batteryThing->paramValue(huaweiBatteryThingUnitParamTypeId).toUInt() == 2) {
alreadySetUp = true;
}
}
if (lunaBattery2Power < 0) { if (!alreadySetUp) {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "discharging"); qCDebug(dcHuawei()) << "Set up huawei energy storage 2 for" << thing;
} else if (lunaBattery2Power > 0) { ThingDescriptor descriptor(huaweiBatteryThingClassId, "Luna 2000 Battery", QString(), thing->id());
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "charging"); ParamList params;
} else { params.append(Param(huaweiBatteryThingUnitParamTypeId, 2));
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "idle"); descriptor.setParams(params);
emit autoThingsAppeared(ThingDescriptors() << descriptor);
}
} }
} });
connect(connection, &HuaweiFusionSolar::lunaBattery2PowerReadFinished, thing, [this, thing](qint32 lunaBattery2Power){
qCDebug(dcHuawei()) << "Battery 2 power changed" << lunaBattery2Power << "W";
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 2);
if (!batteryThings.isEmpty()) {
batteryThings.first()->setStateValue(huaweiBatteryCurrentPowerStateTypeId, lunaBattery2Power);
if (lunaBattery2Power < 0) {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "discharging");
} else if (lunaBattery2Power > 0) {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "charging");
} else {
batteryThings.first()->setStateValue(huaweiBatteryChargingStateStateTypeId, "idle");
}
}
});
connect(connection, &HuaweiFusionSolar::lunaBattery2SocReadFinished, thing, [this, thing](float lunaBattery2Soc){
qCDebug(dcHuawei()) << "Battery 2 SOC changed" << lunaBattery2Soc << "%";
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 2);
if (!batteryThings.isEmpty()) {
batteryThings.first()->setStateValue(huaweiBatteryBatteryLevelStateTypeId, lunaBattery2Soc);
batteryThings.first()->setStateValue(huaweiBatteryBatteryCriticalStateTypeId, lunaBattery2Soc < 10);
}
});
}); });
connect(connection, &HuaweiFusionSolar::lunaBattery2SocChanged, thing, [this, thing](float lunaBattery2Soc){
qCDebug(dcHuawei()) << "Battery 2 SOC changed" << lunaBattery2Soc << "%";
Things batteryThings = myThings().filterByParentId(thing->id()).filterByThingClassId(huaweiBatteryThingClassId).filterByParam(huaweiBatteryThingUnitParamTypeId, 2);
if (!batteryThings.isEmpty()) {
batteryThings.first()->setStateValue(huaweiBatteryBatteryLevelStateTypeId, lunaBattery2Soc);
batteryThings.first()->setStateValue(huaweiBatteryBatteryCriticalStateTypeId, lunaBattery2Soc < 10);
}
});
m_connections.insert(thing, connection);
connection->connectDevice(); connection->connectDevice();
// FIXME: make async and check if this is really a huawei
info->finish(Thing::ThingErrorNoError);
} }

2
huawei/integrationpluginhuawei.h
View File

@ -56,11 +56,11 @@ public:
private: private:
PluginTimer *m_pluginTimer = nullptr; PluginTimer *m_pluginTimer = nullptr;
QHash<Thing *, NetworkDeviceMonitor *> m_monitors; QHash<Thing *, NetworkDeviceMonitor *> m_monitors;
QHash<Thing *, HuaweiFusionSolar *> m_connections; QHash<Thing *, HuaweiFusionSolar *> m_connections;
QHash<Thing *, HuaweiModbusRtuConnection *> m_rtuConnections; QHash<Thing *, HuaweiModbusRtuConnection *> m_rtuConnections;
void setupFusionSolar(ThingSetupInfo *info); void setupFusionSolar(ThingSetupInfo *info);
}; };