From 799a831081539205753ab4306fc30fe525a137b8 Mon Sep 17 00:00:00 2001
From: Boernsman <you@example.com>
Date: Wed, 21 Apr 2021 20:30:37 +0200
Subject: [PATCH] fixed thing setup

---
 energymeters/integrationpluginenergymeters.cpp | 7 ++++---
 energymeters/integrationpluginenergymeters.h   | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/energymeters/integrationpluginenergymeters.cpp b/energymeters/integrationpluginenergymeters.cpp
index 8059280..94fea54 100644
--- a/energymeters/integrationpluginenergymeters.cpp
+++ b/energymeters/integrationpluginenergymeters.cpp
@@ -71,8 +71,8 @@ IntegrationPluginEnergyMeters::IntegrationPluginEnergyMeters()
     m_registerMaps.insert(pro380ThingClassId, pro380RegisterMap);
     m_registerMaps.insert(sdm630ThingClassId, sdm630RegisterMap);
 
-    // Modbus RTU hardware resource
-    connect(hardwareManager()->modbusRtuResource(), &ModbusRtuHardwareResource::modbusRtuMasterRemoved, this, [=](const QUuid &modbusUuid){
+    // FIXME leads to crash, probably an issue in the modbus rtu resource
+    /*connect(hardwareManager()->modbusRtuResource(), &ModbusRtuHardwareResource::modbusRtuMasterRemoved, this, [=] (const QUuid &modbusUuid){
         qCDebug(dcEnergyMeters()) << "Modbus RTU master has been removed" << modbusUuid.toString();
 
         // Check if there is any device using this resource
@@ -86,7 +86,7 @@ IntegrationPluginEnergyMeters::IntegrationPluginEnergyMeters()
                 thing->setStateValue(m_connectionStateTypeIds[thing->thingClassId()], false);
             }
         }
-    });
+    }); */
 }
 
 void IntegrationPluginEnergyMeters::discoverThings(ThingDiscoveryInfo *info)
@@ -164,6 +164,7 @@ void IntegrationPluginEnergyMeters::setupThing(ThingSetupInfo *info)
             m_energyMeters.insert(info->thing(), meter);
             info->finish(Thing::ThingErrorNoError);
         });
+        meter->getEnergyConsumed();
         return;
     } else {
         Q_ASSERT_X(false, "setupThing", QString("Unhandled thingClassId: %1").arg(thing->thingClassId().toString()).toUtf8());
diff --git a/energymeters/integrationpluginenergymeters.h b/energymeters/integrationpluginenergymeters.h
index 16e2f95..ce56b47 100644
--- a/energymeters/integrationpluginenergymeters.h
+++ b/energymeters/integrationpluginenergymeters.h
@@ -73,7 +73,6 @@ private:
     QHash<ThingClassId, QHash<ModbusRegisterType, ModbusRegisterDescriptor>> m_registerMaps;
 
     QHash<Thing *, EnergyMeter *> m_energyMeters;
-    PluginTimer *m_pluginTimer = nullptr;
 
 private slots:
     void onConnectionStateChanged(bool status);