Move modbus RTU classes into hardware source code section

libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.cpp

@@ -31,7 +31,7 @@
 #include "modbusrtuhardwareresourceimplementation.h"
 #include "loggingcategories.h"
 #include "nymeasettings.h"
-#include "modbus/modbusrtumanager.h"
+#include "hardware/modbus/modbusrtumanager.h"
 
 NYMEA_LOGGING_CATEGORY(dcModbusRtuResource, "ModbusRtuResource")
 

libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.h

@@ -33,7 +33,7 @@
 
 #include <QObject>
 
-#include "modbus/modbusrtumanager.h"
+#include "hardware/modbus/modbusrtumanager.h"
 #include "hardware/modbus/modbusrtumaster.h"
 #include "hardware/modbus/modbusrtuhardwareresource.h"
 

libnymea-core/hardware/modbus/modbusrtureplyimpl.cpp

@@ -30,7 +30,6 @@
 
 #include "modbusrtureplyimpl.h"
 
-
 namespace nymeaserver {
 
 ModbusRtuReplyImpl::ModbusRtuReplyImpl(int slaveAddress, int registerAddress, QObject *parent) :

libnymea-core/hardwaremanagerimplementation.cpp

@@ -44,7 +44,7 @@
 #include "hardware/i2c/i2cmanagerimplementation.h"
 #include "hardware/zigbee/zigbeehardwareresourceimplementation.h"
 
-#include "modbus/modbusrtumanager.h"
+#include "hardware/modbus/modbusrtumanager.h"
 #include "hardware/modbus/modbusrtuhardwareresourceimplementation.h"
 
 namespace nymeaserver {

libnymea-core/jsonrpc/modbusrtuhandler.cpp

@@ -29,7 +29,7 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "modbusrtuhandler.h"
-#include "modbus/modbusrtumanager.h"
+#include "hardware/modbus/modbusrtumanager.h"
 #include "hardware/serialport/serialportmonitor.h"
 
 namespace nymeaserver {

libnymea-core/libnymea-core.pro

@@ -79,9 +79,6 @@ HEADERS += nymeacore.h \
     experiences/experiencemanager.h \
     jsonrpc/modbusrtuhandler.h \
     jsonrpc/zigbeehandler.h \
-    modbus/modbusrtumanager.h \
-    modbus/modbusrtumasterimpl.h \
-    modbus/modbusrtureplyimpl.h \
     ruleengine/ruleengine.h \
     ruleengine/rule.h \
     ruleengine/stateevaluator.h \
@@ -145,6 +142,9 @@ HEADERS += nymeacore.h \
     hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.h \
     hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.h \
     hardware/modbus/modbusrtuhardwareresourceimplementation.h \
+    hardware/modbus/modbusrtumanager.h \
+    hardware/modbus/modbusrtumasterimpl.h \
+    hardware/modbus/modbusrtureplyimpl.h \
     hardware/network/networkaccessmanagerimpl.h \
     hardware/network/upnp/upnpdiscoveryimplementation.h \
     hardware/network/upnp/upnpdiscoveryrequest.h \
@@ -173,9 +173,6 @@ SOURCES += nymeacore.cpp \
     experiences/experiencemanager.cpp \
     jsonrpc/modbusrtuhandler.cpp \
     jsonrpc/zigbeehandler.cpp \
-    modbus/modbusrtumanager.cpp \
-    modbus/modbusrtumasterimpl.cpp \
-    modbus/modbusrtureplyimpl.cpp \
     ruleengine/ruleengine.cpp \
     ruleengine/rule.cpp \
     ruleengine/stateevaluator.cpp \
@@ -238,6 +235,9 @@ SOURCES += nymeacore.cpp \
     hardware/bluetoothlowenergy/bluetoothlowenergydeviceimplementation.cpp \
     hardware/bluetoothlowenergy/bluetoothdiscoveryreplyimplementation.cpp \
     hardware/modbus/modbusrtuhardwareresourceimplementation.cpp \
+    hardware/modbus/modbusrtumanager.cpp \
+    hardware/modbus/modbusrtumasterimpl.cpp \
+    hardware/modbus/modbusrtureplyimpl.cpp \
     hardware/network/networkaccessmanagerimpl.cpp \
     hardware/network/upnp/upnpdiscoveryimplementation.cpp \
     hardware/network/upnp/upnpdiscoveryrequest.cpp \

libnymea-core/nymeacore.cpp

@@ -53,7 +53,7 @@
 
 #include "zigbee/zigbeemanager.h"
 
-#include "modbus/modbusrtumanager.h"
+#include "hardware/modbus/modbusrtumanager.h"
 #include "hardware/serialport/serialportmonitor.h"
 
 #include <networkmanager.h>