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

fixed issues reported by reviewer

Browse Source
This commit is contained in:
nymea 2019-09-11 19:09:04 +02:00
parent e4903e00ac
commit dbe06d76c5
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
onewire/devicepluginonewire.cpp
View File

@ -64,12 +64,6 @@ Device::DeviceError DevicePluginOneWire::discoverDevices(const DeviceClassId &de
Device::DeviceSetupStatus DevicePluginOneWire::setupDevice(Device *device) Device::DeviceSetupStatus DevicePluginOneWire::setupDevice(Device *device)
{ {
if(!m_pluginTimer) {
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(10);
connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginOneWire::onPluginTimer);
}
if (device->deviceClassId() == oneWireInterfaceDeviceClassId) { if (device->deviceClassId() == oneWireInterfaceDeviceClassId) {
qCDebug(dcOneWire) << "Setup one wire interface"; qCDebug(dcOneWire) << "Setup one wire interface";
@ -136,9 +130,18 @@ Device::DeviceSetupStatus DevicePluginOneWire::setupDevice(Device *device)
return Device::DeviceSetupStatusFailure; return Device::DeviceSetupStatusFailure;
} }
void DevicePluginOneWire::postSetupDevice(Device *device)
{
Q_UNUSED(device);
if(!m_pluginTimer) {
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(10);
connect(m_pluginTimer, &PluginTimer::timeout, this, &DevicePluginOneWire::onPluginTimer);
}
}
Device::DeviceError DevicePluginOneWire::executeAction(Device *device, const Action &action) Device::DeviceError DevicePluginOneWire::executeAction(Device *device, const Action &action)
{ {
Q_UNUSED(action)
if (device->deviceClassId() == oneWireInterfaceDeviceClassId) { if (device->deviceClassId() == oneWireInterfaceDeviceClassId) {
if (action.actionTypeId() == oneWireInterfaceAutoAddActionTypeId){ if (action.actionTypeId() == oneWireInterfaceAutoAddActionTypeId){
device->setStateValue(oneWireInterfaceAutoAddStateTypeId, action.param(oneWireInterfaceAutoAddActionAutoAddParamTypeId).value()); device->setStateValue(oneWireInterfaceAutoAddStateTypeId, action.param(oneWireInterfaceAutoAddActionAutoAddParamTypeId).value());

1
onewire/devicepluginonewire.h
View File

@ -40,6 +40,7 @@ public:
Device::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) override; Device::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) override;
Device::DeviceSetupStatus setupDevice(Device *device) override; Device::DeviceSetupStatus setupDevice(Device *device) override;
void postSetupDevice(Device *device) override;
Device::DeviceError executeAction(Device *device, const Action &action) override; Device::DeviceError executeAction(Device *device, const Action &action) override;
void deviceRemoved(Device *device) override; void deviceRemoved(Device *device) override;

18
onewire/devicepluginonewire.json
View File

@ -104,15 +104,15 @@
], ],
"stateTypes": [ "stateTypes": [
{ {
"id": "ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40", "id": "ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40",
"name": "digitalOutput", "name": "digitalOutput",
"displayName": "Digital output", "displayName": "Digital output",
"displayNameEvent": "Digital output changed", "displayNameEvent": "Digital output changed",
"displayNameAction": "Set digital output", "displayNameAction": "Set digital output",
"type": "bool", "type": "bool",
"defaultValue": false, "defaultValue": false,
"writable": true "writable": true
} }
] ]
}, },
{ {