ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update modbuscommander plugin to libnyma-modbus

master
Simon Stürz 2022-05-06 11:51:06 +02:00
parent c947b51023
commit 43d1c1c413
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modbuscommander/integrationpluginmodbuscommander.cpp
View File

@ -31,12 +31,10 @@
#include "integrationpluginmodbuscommander.h" #include "integrationpluginmodbuscommander.h"
#include "plugininfo.h" #include "plugininfo.h"
#include "hardwaremanager.h" #include <hardwaremanager.h>
#include "network/networkdevicediscovery.h" #include <network/networkdevicediscovery.h>
#include "hardware/modbus/modbusrtumaster.h" #include <hardware/modbus/modbusrtumaster.h>
#include "hardware/modbus/modbusrtuhardwareresource.h" #include <hardware/modbus/modbusrtuhardwareresource.h>
#include <QSerialPort>
IntegrationPluginModbusCommander::IntegrationPluginModbusCommander() IntegrationPluginModbusCommander::IntegrationPluginModbusCommander()
{ {

12
modbuscommander/integrationpluginmodbuscommander.h
View File

@ -31,14 +31,15 @@
#ifndef INTEGRATIONPLUGINMODBUSCOMMANDER_H #ifndef INTEGRATIONPLUGINMODBUSCOMMANDER_H
#define INTEGRATIONPLUGINMODBUSCOMMANDER_H #define INTEGRATIONPLUGINMODBUSCOMMANDER_H
#include "plugintimer.h" #include <plugintimer.h>
#include "integrations/integrationplugin.h" #include <integrations/integrationplugin.h>
#include "hardware/modbus/modbusrtumaster.h" #include <hardware/modbus/modbusrtumaster.h>
#include "../modbus/modbustcpmaster.h" #include <modbustcpmaster.h>
#include <QSerialPortInfo>
#include <QUuid> #include <QUuid>
#include <QSerialPort>
#include <QSerialPortInfo>
class IntegrationPluginModbusCommander: public IntegrationPlugin class IntegrationPluginModbusCommander: public IntegrationPlugin
{ {
@ -60,7 +61,6 @@ public:
private: private:
PluginTimer *m_refreshTimer = nullptr; PluginTimer *m_refreshTimer = nullptr;
//QHash<Thing*, ModbusRTUMaster*> m_modbusRTUMasters;
QHash<Thing*, ModbusTCPMaster*> m_modbusTCPMasters; QHash<Thing*, ModbusTCPMaster*> m_modbusTCPMasters;
QHash<Thing *, ModbusRtuMaster *> m_modbusRtuMasters; QHash<Thing *, ModbusRtuMaster *> m_modbusRtuMasters;
QHash<QUuid, ThingActionInfo*> m_asyncActions; QHash<QUuid, ThingActionInfo*> m_asyncActions;

12
modbuscommander/modbuscommander.pro
View File

@ -1,15 +1,9 @@
include(../plugins.pri) include(../plugins.pri)
include(../modbus.pri)
QT += \
serialport \
network \
serialbus \
SOURCES += \ SOURCES += \
integrationpluginmodbuscommander.cpp \ integrationpluginmodbuscommander.cpp
../modbus/modbustcpmaster.cpp
HEADERS += \ HEADERS += \
integrationpluginmodbuscommander.h \ integrationpluginmodbuscommander.h
../modbus/modbustcpmaster.h