From 82c6da394b483f7c3e3824b38592dd3504c22486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Fri, 6 May 2022 12:01:53 +0200
Subject: [PATCH] Update webasto plugin to libnyma-modbus

---
 webasto/integrationpluginwebasto.cpp | 6 +++---
 webasto/integrationpluginwebasto.h   | 5 ++---
 webasto/webasto.h                    | 2 +-
 webasto/webasto.pro                  | 9 +++------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/webasto/integrationpluginwebasto.cpp b/webasto/integrationpluginwebasto.cpp
index dcf25be..7afc211 100644
--- a/webasto/integrationpluginwebasto.cpp
+++ b/webasto/integrationpluginwebasto.cpp
@@ -28,12 +28,12 @@
 *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "network/networkdevicediscovery.h"
+#include <network/networkdevicediscovery.h>
+#include <types/param.h>
+
 #include "integrationpluginwebasto.h"
 #include "plugininfo.h"
 
-#include "types/param.h"
-
 #include <QDebug>
 #include <QStringList>
 #include <QJsonDocument>
diff --git a/webasto/integrationpluginwebasto.h b/webasto/integrationpluginwebasto.h
index 7822101..6d833aa 100644
--- a/webasto/integrationpluginwebasto.h
+++ b/webasto/integrationpluginwebasto.h
@@ -31,10 +31,9 @@
 #ifndef INTEGRATIONPLUGINWEBASTO_H
 #define INTEGRATIONPLUGINWEBASTO_H
 
-#include "integrations/integrationplugin.h"
-#include "plugintimer.h"
+#include <integrations/integrationplugin.h>
+#include <plugintimer.h>
 #include "webasto.h"
-#include "../modbus/modbustcpmaster.h"
 
 #include <QObject>
 #include <QHostAddress>
diff --git a/webasto/webasto.h b/webasto/webasto.h
index 49a093f..0beb557 100644
--- a/webasto/webasto.h
+++ b/webasto/webasto.h
@@ -36,7 +36,7 @@
 #include <QTimer>
 #include <QUuid>
 
-#include "../modbus/modbustcpmaster.h"
+#include <modbustcpmaster.h>
 
 class Webasto : public QObject
 {
diff --git a/webasto/webasto.pro b/webasto/webasto.pro
index c39fc78..45b6235 100644
--- a/webasto/webasto.pro
+++ b/webasto/webasto.pro
@@ -1,13 +1,10 @@
 include(../plugins.pri)
-
-QT += serialbus network
+include(../modbus.pri)
 
 SOURCES += \
     integrationpluginwebasto.cpp \
-    webasto.cpp \
-    ../modbus/modbustcpmaster.cpp
+    webasto.cpp
 
 HEADERS += \
     integrationpluginwebasto.h \
-    webasto.h \
-    ../modbus/modbustcpmaster.h
+    webasto.h