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

Update TcpCommander plugin

Browse Source
This commit is contained in:
Michael Zanetti 2019-09-19 23:03:00 +02:00
parent 0e28fd3545
commit 4a6b5ea75b
2 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tcpcommander/deviceplugintcpcommander.cpp
View File

@ -27,8 +27,10 @@ DevicePluginTcpCommander::DevicePluginTcpCommander()
} }
Device::DeviceSetupStatus DevicePluginTcpCommander::setupDevice(Device *device) void DevicePluginTcpCommander::setupDevice(DeviceSetupInfo *info)
{ {
Device *device = info->device();
if (device->deviceClassId() == tcpOutputDeviceClassId) { if (device->deviceClassId() == tcpOutputDeviceClassId) {
quint16 port = device->paramValue(tcpOutputDevicePortParamTypeId).toUInt(); quint16 port = device->paramValue(tcpOutputDevicePortParamTypeId).toUInt();
@ -36,18 +38,18 @@ Device::DeviceSetupStatus DevicePluginTcpCommander::setupDevice(Device *device)
TcpSocket *tcpSocket = new TcpSocket(address, port, this); TcpSocket *tcpSocket = new TcpSocket(address, port, this);
m_tcpSockets.insert(tcpSocket, device); m_tcpSockets.insert(tcpSocket, device);
connect(tcpSocket, &TcpSocket::connectionChanged, this, &DevicePluginTcpCommander::onTcpSocketConnectionChanged); connect(tcpSocket, &TcpSocket::connectionChanged, this, &DevicePluginTcpCommander::onTcpSocketConnectionChanged);
connect(tcpSocket, &TcpSocket::commandSent, this, &DevicePluginTcpCommander::onTcpSocketCommandSent);
connect(tcpSocket, &TcpSocket::connectionTestFinished, this, [this, device] (bool status) {
connect(tcpSocket, &TcpSocket::connectionTestFinished, info, [info] (bool status) {
if (status) { if (status) {
emit deviceSetupFinished(device, Device::DeviceSetupStatusSuccess); info->finish(Device::DeviceErrorNoError);
} else { } else {
emit deviceSetupFinished(device, Device::DeviceSetupStatusFailure); info->finish(Device::DeviceErrorSetupFailed, QT_TR_NOOP("Error connecting to remote server."));
} }
}); });
tcpSocket->connectionTest();
// Test the socket, if a socket can be established the setup process was successfull // Test the socket, if a socket can be established the setup process was successfull
return Device::DeviceSetupStatusAsync; tcpSocket->connectionTest();
return;
} }
if (device->deviceClassId() == tcpInputDeviceClassId) { if (device->deviceClassId() == tcpInputDeviceClassId) {
@ -58,30 +60,34 @@ Device::DeviceSetupStatus DevicePluginTcpCommander::setupDevice(Device *device)
m_tcpServer.insert(tcpServer, device); m_tcpServer.insert(tcpServer, device);
connect(tcpServer, &TcpServer::connectionChanged, this, &DevicePluginTcpCommander::onTcpServerConnectionChanged); connect(tcpServer, &TcpServer::connectionChanged, this, &DevicePluginTcpCommander::onTcpServerConnectionChanged);
connect(tcpServer, &TcpServer::commandReceived, this, &DevicePluginTcpCommander::onTcpServerCommandReceived); connect(tcpServer, &TcpServer::commandReceived, this, &DevicePluginTcpCommander::onTcpServerCommandReceived);
return Device::DeviceSetupStatusSuccess; return info->finish(Device::DeviceErrorNoError);
} else { } else {
tcpServer->deleteLater(); tcpServer->deleteLater();
qDebug(dcTCPCommander()) << "Could not open TCP Server"; qDebug(dcTCPCommander()) << "Could not open TCP Server";
return info->finish(Device::DeviceErrorSetupFailed, QT_TR_NOOP("Error opening TCP port."));
} }
} }
return Device::DeviceSetupStatusFailure;
} }
Device::DeviceError DevicePluginTcpCommander::executeAction(Device *device, const Action &action) void DevicePluginTcpCommander::executeAction(DeviceActionInfo *info)
{ {
if (device->deviceClassId() == tcpOutputDeviceClassId) { Device *device = info->device();
Action action = info->action();
if (action.actionTypeId() == tcpOutputTriggerActionTypeId) { Q_ASSERT_X(action.actionTypeId() == tcpOutputTriggerActionTypeId, "TcpCommander", "Invalid action type in executeAction");
TcpSocket *tcpSocket = m_tcpSockets.key(device);
QByteArray data = action.param(tcpOutputTriggerActionOutputDataAreaParamTypeId).value().toByteArray(); TcpSocket *tcpSocket = m_tcpSockets.key(device);
tcpSocket->sendCommand(data); QByteArray data = action.param(tcpOutputTriggerActionOutputDataAreaParamTypeId).value().toByteArray();
m_pendingActions.insert(action.id(), device->id()); tcpSocket->sendCommand(data);
return Device::DeviceErrorAsync;
connect(tcpSocket, &TcpSocket::commandSent, info, [info](bool success){
if (success) {
info->finish(Device::DeviceErrorNoError);
} else {
info->finish(Device::DeviceErrorHardwareNotAvailable);
} }
return Device::DeviceErrorActionTypeNotFound; });
}
return Device::DeviceErrorDeviceClassNotFound;
} }
@ -111,20 +117,6 @@ void DevicePluginTcpCommander::onTcpSocketConnectionChanged(bool connected)
} }
} }
void DevicePluginTcpCommander::onTcpSocketCommandSent(bool successfull)
{
TcpSocket *tcpSocket = static_cast<TcpSocket *>(sender());
Device *device = m_tcpSockets.value(tcpSocket);
ActionId action = m_pendingActions.key(device->id());
m_pendingActions.remove(action);
if (successfull) {
emit actionExecutionFinished(action, Device::DeviceErrorNoError);
} else {
emit actionExecutionFinished(action, Device::DeviceErrorHardwareNotAvailable);
}
}
void DevicePluginTcpCommander::onTcpServerConnectionChanged(bool connected) void DevicePluginTcpCommander::onTcpServerConnectionChanged(bool connected)
{ {

6
tcpcommander/deviceplugintcpcommander.h
View File

@ -35,20 +35,18 @@ class DevicePluginTcpCommander : public DevicePlugin
public: public:
explicit DevicePluginTcpCommander(); explicit DevicePluginTcpCommander();
Device::DeviceSetupStatus setupDevice(Device *device) override; void setupDevice(DeviceSetupInfo *info) override;
void deviceRemoved(Device *device) override; void deviceRemoved(Device *device) override;
Device::DeviceError executeAction(Device *device, const Action &action) override; void executeAction(DeviceActionInfo *info) override;
private: private:
QHash<TcpSocket *, Device *> m_tcpSockets; QHash<TcpSocket *, Device *> m_tcpSockets;
QHash<TcpServer *, Device *> m_tcpServer; QHash<TcpServer *, Device *> m_tcpServer;
QHash<ActionId, DeviceId> m_pendingActions;
private slots: private slots:
void onTcpSocketConnectionChanged(bool connected); void onTcpSocketConnectionChanged(bool connected);
void onTcpSocketCommandSent(bool successfulle);
void onTcpServerConnectionChanged(bool connected); void onTcpServerConnectionChanged(bool connected);
void onTcpServerCommandReceived(QByteArray message); void onTcpServerCommandReceived(QByteArray message);