From 43d1c1c41357c29f475b8f5b535fc4e34867ccce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Fri, 6 May 2022 11:51:06 +0200
Subject: [PATCH] Update modbuscommander plugin to libnyma-modbus

---
 modbuscommander/integrationpluginmodbuscommander.cpp | 10 ++++------
 modbuscommander/integrationpluginmodbuscommander.h   | 12 ++++++------
 modbuscommander/modbuscommander.pro                  | 12 +++---------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/modbuscommander/integrationpluginmodbuscommander.cpp b/modbuscommander/integrationpluginmodbuscommander.cpp
index 5889534..ec597f6 100644
--- a/modbuscommander/integrationpluginmodbuscommander.cpp
+++ b/modbuscommander/integrationpluginmodbuscommander.cpp
@@ -31,12 +31,10 @@
 #include "integrationpluginmodbuscommander.h"
 #include "plugininfo.h"
 
-#include "hardwaremanager.h"
-#include "network/networkdevicediscovery.h"
-#include "hardware/modbus/modbusrtumaster.h"
-#include "hardware/modbus/modbusrtuhardwareresource.h"
-
-#include <QSerialPort>
+#include <hardwaremanager.h>
+#include <network/networkdevicediscovery.h>
+#include <hardware/modbus/modbusrtumaster.h>
+#include <hardware/modbus/modbusrtuhardwareresource.h>
 
 IntegrationPluginModbusCommander::IntegrationPluginModbusCommander()
 {
diff --git a/modbuscommander/integrationpluginmodbuscommander.h b/modbuscommander/integrationpluginmodbuscommander.h
index 54f6906..5736bdf 100644
--- a/modbuscommander/integrationpluginmodbuscommander.h
+++ b/modbuscommander/integrationpluginmodbuscommander.h
@@ -31,14 +31,15 @@
 #ifndef INTEGRATIONPLUGINMODBUSCOMMANDER_H
 #define INTEGRATIONPLUGINMODBUSCOMMANDER_H
 
-#include "plugintimer.h"
-#include "integrations/integrationplugin.h"
-#include "hardware/modbus/modbusrtumaster.h"
+#include <plugintimer.h>
+#include <integrations/integrationplugin.h>
+#include <hardware/modbus/modbusrtumaster.h>
 
-#include "../modbus/modbustcpmaster.h"
+#include <modbustcpmaster.h>
 
-#include <QSerialPortInfo>
 #include <QUuid>
+#include <QSerialPort>
+#include <QSerialPortInfo>
 
 class IntegrationPluginModbusCommander: public IntegrationPlugin
 {
@@ -60,7 +61,6 @@ public:
 private:
     PluginTimer *m_refreshTimer = nullptr;
 
-    //QHash<Thing*, ModbusRTUMaster*> m_modbusRTUMasters;
     QHash<Thing*, ModbusTCPMaster*> m_modbusTCPMasters;
     QHash<Thing *, ModbusRtuMaster *> m_modbusRtuMasters;
     QHash<QUuid, ThingActionInfo*> m_asyncActions;
diff --git a/modbuscommander/modbuscommander.pro b/modbuscommander/modbuscommander.pro
index ab4dfc1..5b2bc31 100644
--- a/modbuscommander/modbuscommander.pro
+++ b/modbuscommander/modbuscommander.pro
@@ -1,15 +1,9 @@
 include(../plugins.pri)
-
-QT += \
-    serialport \
-    network \
-    serialbus \
+include(../modbus.pri)
 
 SOURCES += \
-    integrationpluginmodbuscommander.cpp \
-    ../modbus/modbustcpmaster.cpp
+    integrationpluginmodbuscommander.cpp
 
 HEADERS += \
-    integrationpluginmodbuscommander.h \
-    ../modbus/modbustcpmaster.h
+    integrationpluginmodbuscommander.h