From 675782997c557826ddc1879ec2bf4716244c1aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 19 May 2021 08:36:05 +0200 Subject: [PATCH] Move modbus RTU classes into hardware source code section --- .../modbusrtuhardwareresourceimplementation.cpp | 2 +- .../modbus/modbusrtuhardwareresourceimplementation.h | 2 +- .../{ => hardware}/modbus/modbusrtumanager.cpp | 0 .../{ => hardware}/modbus/modbusrtumanager.h | 0 .../{ => hardware}/modbus/modbusrtumasterimpl.cpp | 0 .../{ => hardware}/modbus/modbusrtumasterimpl.h | 0 .../{ => hardware}/modbus/modbusrtureplyimpl.cpp | 1 - .../{ => hardware}/modbus/modbusrtureplyimpl.h | 0 libnymea-core/hardwaremanagerimplementation.cpp | 2 +- libnymea-core/jsonrpc/modbusrtuhandler.cpp | 2 +- libnymea-core/libnymea-core.pro | 12 ++++++------ libnymea-core/nymeacore.cpp | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) rename libnymea-core/{ => hardware}/modbus/modbusrtumanager.cpp (100%) rename libnymea-core/{ => hardware}/modbus/modbusrtumanager.h (100%) rename libnymea-core/{ => hardware}/modbus/modbusrtumasterimpl.cpp (100%) rename libnymea-core/{ => hardware}/modbus/modbusrtumasterimpl.h (100%) rename libnymea-core/{ => hardware}/modbus/modbusrtureplyimpl.cpp (99%) rename libnymea-core/{ => hardware}/modbus/modbusrtureplyimpl.h (100%) diff --git a/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.cpp b/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.cpp index b2ac270a..501691bb 100644 --- a/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.cpp +++ b/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") diff --git a/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.h b/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.h index a26be359..73e480dc 100644 --- a/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.h +++ b/libnymea-core/hardware/modbus/modbusrtuhardwareresourceimplementation.h @@ -33,7 +33,7 @@ #include -#include "modbus/modbusrtumanager.h" +#include "hardware/modbus/modbusrtumanager.h" #include "hardware/modbus/modbusrtumaster.h" #include "hardware/modbus/modbusrtuhardwareresource.h" diff --git a/libnymea-core/modbus/modbusrtumanager.cpp b/libnymea-core/hardware/modbus/modbusrtumanager.cpp similarity index 100% rename from libnymea-core/modbus/modbusrtumanager.cpp rename to libnymea-core/hardware/modbus/modbusrtumanager.cpp diff --git a/libnymea-core/modbus/modbusrtumanager.h b/libnymea-core/hardware/modbus/modbusrtumanager.h similarity index 100% rename from libnymea-core/modbus/modbusrtumanager.h rename to libnymea-core/hardware/modbus/modbusrtumanager.h diff --git a/libnymea-core/modbus/modbusrtumasterimpl.cpp b/libnymea-core/hardware/modbus/modbusrtumasterimpl.cpp similarity index 100% rename from libnymea-core/modbus/modbusrtumasterimpl.cpp rename to libnymea-core/hardware/modbus/modbusrtumasterimpl.cpp diff --git a/libnymea-core/modbus/modbusrtumasterimpl.h b/libnymea-core/hardware/modbus/modbusrtumasterimpl.h similarity index 100% rename from libnymea-core/modbus/modbusrtumasterimpl.h rename to libnymea-core/hardware/modbus/modbusrtumasterimpl.h diff --git a/libnymea-core/modbus/modbusrtureplyimpl.cpp b/libnymea-core/hardware/modbus/modbusrtureplyimpl.cpp similarity index 99% rename from libnymea-core/modbus/modbusrtureplyimpl.cpp rename to libnymea-core/hardware/modbus/modbusrtureplyimpl.cpp index 0c66d2ac..dc00ac94 100644 --- a/libnymea-core/modbus/modbusrtureplyimpl.cpp +++ b/libnymea-core/hardware/modbus/modbusrtureplyimpl.cpp @@ -30,7 +30,6 @@ #include "modbusrtureplyimpl.h" - namespace nymeaserver { ModbusRtuReplyImpl::ModbusRtuReplyImpl(int slaveAddress, int registerAddress, QObject *parent) : diff --git a/libnymea-core/modbus/modbusrtureplyimpl.h b/libnymea-core/hardware/modbus/modbusrtureplyimpl.h similarity index 100% rename from libnymea-core/modbus/modbusrtureplyimpl.h rename to libnymea-core/hardware/modbus/modbusrtureplyimpl.h diff --git a/libnymea-core/hardwaremanagerimplementation.cpp b/libnymea-core/hardwaremanagerimplementation.cpp index aece0d95..e873b839 100644 --- a/libnymea-core/hardwaremanagerimplementation.cpp +++ b/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 { diff --git a/libnymea-core/jsonrpc/modbusrtuhandler.cpp b/libnymea-core/jsonrpc/modbusrtuhandler.cpp index 19d43772..89b169c4 100644 --- a/libnymea-core/jsonrpc/modbusrtuhandler.cpp +++ b/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 { diff --git a/libnymea-core/libnymea-core.pro b/libnymea-core/libnymea-core.pro index eb17feef..2ae5d350 100644 --- a/libnymea-core/libnymea-core.pro +++ b/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 \ diff --git a/libnymea-core/nymeacore.cpp b/libnymea-core/nymeacore.cpp index ca7cda79..7e6f7d3d 100644 --- a/libnymea-core/nymeacore.cpp +++ b/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