Update leynew plugin

master
Michael Zanetti 2019-09-18 11:56:17 +02:00
parent 69a3a1835f
commit d26f3e4815
2 changed files with 15 additions and 16 deletions

View File

@ -31,22 +31,21 @@ DevicePluginLeynew::DevicePluginLeynew()
{ {
} }
Device::DeviceSetupStatus DevicePluginLeynew::setupDevice(Device *device) void DevicePluginLeynew::setupDevice(DeviceSetupInfo *info)
{ {
Q_UNUSED(device); if (!hardwareManager()->radio433()->available()) {
return info->finish(Device::DeviceErrorHardwareNotAvailable, QT_TR_NOOP("No 433 MHz radio available on this system."));
return Device::DeviceSetupStatusSuccess; }
} }
Device::DeviceError DevicePluginLeynew::executeAction(Device *device, const Action &action) void DevicePluginLeynew::executeAction(DeviceActionInfo *info)
{ {
if (!hardwareManager()->radio433()->available()) { if (!hardwareManager()->radio433()->available()) {
return Device::DeviceErrorHardwareNotAvailable; return info->finish(Device::DeviceErrorHardwareNotAvailable, QT_TR_NOOP("No 433 MHz radio available on this system."));
} }
if (device->deviceClassId() != rfControllerDeviceClassId) { Device *device = info->device();
return Device::DeviceErrorDeviceClassNotFound; Action action = info->action();
}
QList<int> rawData; QList<int> rawData;
QByteArray binCode; QByteArray binCode;
@ -63,7 +62,7 @@ Device::DeviceError DevicePluginLeynew::executeAction(Device *device, const Acti
binCode.append("111101010101"); binCode.append("111101010101");
} else { } else {
qCWarning(dcLeynew) << "Could not get id of device: invalid parameter" << device->paramValue(rfControllerDeviceIdParamTypeId); qCWarning(dcLeynew) << "Could not get id of device: invalid parameter" << device->paramValue(rfControllerDeviceIdParamTypeId);
return Device::DeviceErrorInvalidParameter; return info->finish(Device::DeviceErrorInvalidParameter);
} }
int repetitions = 12; int repetitions = 12;
@ -114,7 +113,7 @@ Device::DeviceError DevicePluginLeynew::executeAction(Device *device, const Acti
} else if (action.actionTypeId() == rfControllerFade7ActionTypeId) { } else if (action.actionTypeId() == rfControllerFade7ActionTypeId) {
binCode.append("001100000000"); binCode.append("001100000000");
} else { } else {
return Device::DeviceErrorActionTypeNotFound; return info->finish(Device::DeviceErrorActionTypeNotFound);
} }
// ======================================= // =======================================
@ -146,7 +145,8 @@ Device::DeviceError DevicePluginLeynew::executeAction(Device *device, const Acti
qCDebug(dcLeynew) << "Transmitted" << pluginName() << device->name() << action.id(); qCDebug(dcLeynew) << "Transmitted" << pluginName() << device->name() << action.id();
}else{ }else{
qCWarning(dcLeynew) << "Could not transmitt" << pluginName() << device->name() << action.id(); qCWarning(dcLeynew) << "Could not transmitt" << pluginName() << device->name() << action.id();
return Device::DeviceErrorHardwareNotAvailable; return info->finish(Device::DeviceErrorHardwareFailure, QT_TR_NOOP("Error sending data."));
} }
return Device::DeviceErrorNoError;
info->finish(Device::DeviceErrorNoError);
} }

View File

@ -35,10 +35,9 @@ class DevicePluginLeynew : public DevicePlugin
public: public:
explicit DevicePluginLeynew(); explicit DevicePluginLeynew();
Device::DeviceSetupStatus setupDevice(Device *device) override; void setupDevice(DeviceSetupInfo *info) override;
public slots: void executeAction(DeviceActionInfo *info) override;
Device::DeviceError executeAction(Device *device, const Action &action) override;
}; };