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

added producer interface and more debug output

pull/20/head
Boernsman 2021-05-07 11:01:28 +02:00 committed by Michael Zanetti
parent c393bbcf19
commit 278e7febcd
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
energymeters/integrationpluginenergymeters.cpp
View File

@ -173,8 +173,8 @@ void IntegrationPluginEnergyMeters::setupThing(ThingSetupInfo *info)
EnergyMeter *meter = new EnergyMeter(hardwareManager()->modbusRtuResource()->getModbusRtuMaster(uuid), address, m_registerMaps.value(thing->thingClassId()), this);
connect(info, &ThingSetupInfo::aborted, meter, &EnergyMeter::deleteLater);
connect(meter, &EnergyMeter::consumedEnergyReceived, info, [this, info, meter] {
qCDebug(dcEnergyMeters()) << "Reply received, setup finished";
connect(meter, &EnergyMeter::consumedEnergyReceived, info, [this, info, meter] (double energy) {
qCDebug(dcEnergyMeters()) << "Consumed energy receieved" << energy << "Setup finished";
connect(meter, &EnergyMeter::connectedChanged, this, &IntegrationPluginEnergyMeters::onConnectionStateChanged);
connect(meter, &EnergyMeter::voltageL1Received, this, &IntegrationPluginEnergyMeters::onVoltageL1Received);
connect(meter, &EnergyMeter::voltageL2Received, this, &IntegrationPluginEnergyMeters::onVoltageL2Received);
@ -203,6 +203,8 @@ void IntegrationPluginEnergyMeters::postSetupThing(Thing *thing)
if (m_energyMeters.contains(thing)) {
startUpdateCycle(m_energyMeters.value(thing));
} else {
qCWarning(dcEnergyMeters()) << "Thing has no energy meter connection and will not work properly";
}
}
@ -272,6 +274,7 @@ void IntegrationPluginEnergyMeters::onConnectionStateChanged(bool status)
if (!status) {
updateCycleFinished(meter);
}
qCDebug(dcEnergyMeters()) << "Connection status changed" << thing->name() << status;
thing->setStateValue(m_connectionStateTypeIds.value(thing->thingClassId()), status);
}

4
energymeters/integrationpluginenergymeters.json
View File

@ -24,7 +24,7 @@
"displayName": "PRO380-Mod",
"id": "d7c6440b-54f9-4cc0-a96b-9bb7304b3e77",
"createMethods": ["discovery"],
"interfaces": ["extendedsmartmeterconsumer"],
"interfaces": ["extendedsmartmeterconsumer", "extendedsmartmeterproducer"],
"discoveryParamTypes": [
{
"id": "a29f37f6-b344-4628-8ab4-8f4c18fada4a",
@ -173,7 +173,7 @@
"displayName": "SDM630Modbus",
"id": "f37597bb-35fe-48f2-9617-343dd54c0903",
"createMethods": ["discovery"],
"interfaces": ["extendedsmartmeterconsumer"],
"interfaces": ["extendedsmartmeterconsumer", "extendedsmartmeterproducer"],
"discoveryParamTypes": [
{
"id": "6ab43559-53ec-47ba-b8a0-8d3b7f8d90c2",