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

fixed rediscovery

Browse Source
This commit is contained in:
nymea 2019-08-07 19:47:29 +02:00
parent a20c43c0e5
commit a2812c0810
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
senic/devicepluginsenic.cpp
View File

@ -140,15 +140,6 @@ void DevicePluginSenic::deviceRemoved(Device *device)
} }
} }
bool DevicePluginSenic::verifyExistingDevices(const QBluetoothDeviceInfo &deviceInfo)
{
foreach (Device *device, myDevices()) {
if (device->paramValue(nuimoDeviceMacParamTypeId).toString() == deviceInfo.address().toString())
return true;
}
return false;
}
void DevicePluginSenic::onReconnectTimeout() void DevicePluginSenic::onReconnectTimeout()
{ {
@ -159,6 +150,7 @@ void DevicePluginSenic::onReconnectTimeout()
} }
} }
void DevicePluginSenic::onBluetoothDiscoveryFinished() void DevicePluginSenic::onBluetoothDiscoveryFinished()
{ {
BluetoothDiscoveryReply *reply = static_cast<BluetoothDiscoveryReply *>(sender()); BluetoothDiscoveryReply *reply = static_cast<BluetoothDiscoveryReply *>(sender());
@ -169,19 +161,23 @@ void DevicePluginSenic::onBluetoothDiscoveryFinished()
return; return;
} }
QList<DeviceDescriptor> deviceDescriptors; QList<DeviceDescriptor> deviceDescriptors;
foreach (const QBluetoothDeviceInfo &deviceInfo, reply->discoveredDevices()) { foreach (const QBluetoothDeviceInfo &deviceInfo, reply->discoveredDevices()) {
if (deviceInfo.name().contains("Nuimo")) { if (deviceInfo.name().contains("Nuimo")) {
if (!verifyExistingDevices(deviceInfo)) {
DeviceDescriptor descriptor(nuimoDeviceClassId, "Nuimo", deviceInfo.name() + " (" + deviceInfo.address().toString() + ")"); DeviceDescriptor descriptor(nuimoDeviceClassId, "Nuimo", deviceInfo.name() + " (" + deviceInfo.address().toString() + ")");
ParamList params; ParamList params;
foreach (Device *existingDevice, myDevices()) {
if (existingDevice->paramValue(nuimoDeviceMacParamTypeId).toString() == deviceInfo.address().toString()) {
descriptor.setDeviceId(existingDevice->id());
break;
}
}
params.append(Param(nuimoDeviceMacParamTypeId, deviceInfo.address().toString())); params.append(Param(nuimoDeviceMacParamTypeId, deviceInfo.address().toString()));
descriptor.setParams(params); descriptor.setParams(params);
deviceDescriptors.append(descriptor); deviceDescriptors.append(descriptor);
} }
} }
}
reply->deleteLater(); reply->deleteLater();
emit devicesDiscovered(nuimoDeviceClassId, deviceDescriptors); emit devicesDiscovered(nuimoDeviceClassId, deviceDescriptors);
@ -210,7 +206,6 @@ void DevicePluginSenic::onSwipeDetected(const Nuimo::SwipeDirection &direction)
Nuimo *nuimo = static_cast<Nuimo *>(sender()); Nuimo *nuimo = static_cast<Nuimo *>(sender());
Device *device = m_nuimos.value(nuimo); Device *device = m_nuimos.value(nuimo);
switch (direction) { switch (direction) {
case Nuimo::SwipeDirectionLeft: case Nuimo::SwipeDirectionLeft:
emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "←"))); emitEvent(Event(nuimoPressedEventTypeId, device->id(), ParamList() << Param(nuimoPressedEventButtonNameParamTypeId, "←")));
@ -260,5 +255,4 @@ void DevicePluginSenic::onPluginConfigurationChanged(const ParamTypeId &paramTyp
qCDebug(dcSenic()) << "Auto symbol mode" << (value.toBool() ? "enabled." : "disabled."); qCDebug(dcSenic()) << "Auto symbol mode" << (value.toBool() ? "enabled." : "disabled.");
m_autoSymbolMode = value.toBool(); m_autoSymbolMode = value.toBool();
} }
} }

2
senic/devicepluginsenic.h
View File

@ -51,8 +51,6 @@ private:
PluginTimer *m_reconnectTimer = nullptr; PluginTimer *m_reconnectTimer = nullptr;
bool m_autoSymbolMode = true; bool m_autoSymbolMode = true;
bool verifyExistingDevices(const QBluetoothDeviceInfo &deviceInfo);
private slots: private slots:
void onPluginConfigurationChanged(const ParamTypeId &paramTypeId, const QVariant &value); void onPluginConfigurationChanged(const ParamTypeId &paramTypeId, const QVariant &value);
void onReconnectTimeout(); void onReconnectTimeout();