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

Update keba plugin

Browse Source
This commit is contained in:
Michael Zanetti 2019-09-18 00:49:12 +02:00
parent 877cce7d8d
commit 5e73b33b87
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
keba/devicepluginkeba.cpp
View File

@ -44,8 +44,10 @@ void DevicePluginKeba::init()
connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginKeba::updateData); connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginKeba::updateData);
} }
Device::DeviceSetupStatus DevicePluginKeba::setupDevice(Device *device) void DevicePluginKeba::setupDevice(DeviceSetupInfo *info)
{ {
Device *device = info->device();
qCDebug(dcKebaKeContact()) << "Setting up a new device:" << device->name() << device->params(); qCDebug(dcKebaKeContact()) << "Setting up a new device:" << device->name() << device->params();
if(m_kebaDevices.isEmpty()) { if(m_kebaDevices.isEmpty()) {
@ -53,7 +55,8 @@ Device::DeviceSetupStatus DevicePluginKeba::setupDevice(Device *device)
if (!m_kebaSocket->bind(QHostAddress::AnyIPv4, 7090)) { if (!m_kebaSocket->bind(QHostAddress::AnyIPv4, 7090)) {
qCWarning(dcKebaKeContact()) << "Cannot bind to port" << 7090; qCWarning(dcKebaKeContact()) << "Cannot bind to port" << 7090;
delete m_kebaSocket; delete m_kebaSocket;
return Device::DeviceSetupStatusFailure; //: Error setting up device
return info->finish(Device::DeviceErrorHardwareNotAvailable, QT_TR_NOOP("Error opening network port."));
} }
connect(m_kebaSocket, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams())); connect(m_kebaSocket, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams()));
qCDebug(dcKebaKeContact()) << "Create keba socket"; qCDebug(dcKebaKeContact()) << "Create keba socket";
@ -64,16 +67,18 @@ Device::DeviceSetupStatus DevicePluginKeba::setupDevice(Device *device)
//Check if the IP is empty //Check if the IP is empty
if (address.isNull()) { if (address.isNull()) {
delete m_kebaSocket; delete m_kebaSocket;
return Device::DeviceSetupStatusFailure; //: Error setting up device
return info->finish(Device::DeviceErrorInvalidParameter, QT_TR_NOOP("The provided IP adress is not valid."));
} }
// check if IP is already added to another keba device // check if IP is already added to another keba device
if(m_kebaDevices.keys().contains(address)){ if(m_kebaDevices.keys().contains(address)){
return Device::DeviceSetupStatusFailure; //: Error setting up device
return info->finish(Device::DeviceErrorInvalidParameter, QT_TR_NOOP("Device with IP adress %1 is already added in the system."));
} }
m_kebaDevices.insert(address, device); m_kebaDevices.insert(address, device);
return Device::DeviceSetupStatusSuccess; info->finish(Device::DeviceErrorNoError);
} }
void DevicePluginKeba::postSetupDevice(Device *device) void DevicePluginKeba::postSetupDevice(Device *device)
@ -109,8 +114,11 @@ void DevicePluginKeba::updateData()
} }
} }
Device::DeviceError DevicePluginKeba::executeAction(Device *device, const Action &action) void DevicePluginKeba::executeAction(DeviceActionInfo *info)
{ {
Device *device = info->device();
Action action = info->action();
qCDebug(dcKebaKeContact()) << "Execute action" << device->name() << action.actionTypeId().toString(); qCDebug(dcKebaKeContact()) << "Execute action" << device->name() << action.actionTypeId().toString();
if (device->deviceClassId() == wallboxDeviceClassId) { if (device->deviceClassId() == wallboxDeviceClassId) {
@ -140,10 +148,10 @@ Device::DeviceError DevicePluginKeba::executeAction(Device *device, const Action
m_kebaSocket->writeDatagram(datagram.data(),datagram.size(), QHostAddress(device->paramValue(wallboxDeviceIpParamTypeId).toString()) , 7090); m_kebaSocket->writeDatagram(datagram.data(),datagram.size(), QHostAddress(device->paramValue(wallboxDeviceIpParamTypeId).toString()) , 7090);
} }
return Device::DeviceErrorNoError; return info->finish(Device::DeviceErrorNoError);
} }
return Device::DeviceErrorDeviceClassNotFound; info->finish(Device::DeviceErrorDeviceClassNotFound);
} }
void DevicePluginKeba::readPendingDatagrams() void DevicePluginKeba::readPendingDatagrams()

4
keba/devicepluginkeba.h
View File

@ -41,12 +41,12 @@ public:
~DevicePluginKeba(); ~DevicePluginKeba();
void init() override; void init() override;
Device::DeviceSetupStatus setupDevice(Device *device) override; void setupDevice(DeviceSetupInfo *info) override;
void postSetupDevice(Device* device) override; void postSetupDevice(Device* device) 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;
void updateData(); void updateData();
private: private: