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

made device setup async

Browse Source
This commit is contained in:
nymea 2019-08-08 17:51:15 +02:00
parent 82a8f9effb
commit e49607aa13
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
senic/devicepluginsenic.cpp
View File

@ -74,6 +74,7 @@ Device::DeviceSetupStatus DevicePluginSenic::setupDevice(Device *device)
Nuimo *nuimo = new Nuimo(bluetoothDevice, this); Nuimo *nuimo = new Nuimo(bluetoothDevice, this);
nuimo->setLongPressTime(configValue(senicPluginLongPressTimeParamTypeId).toInt()); nuimo->setLongPressTime(configValue(senicPluginLongPressTimeParamTypeId).toInt());
connect(nuimo, &Nuimo::deviceInitializationFinished, this, &DevicePluginSenic::onDeviceInitializationFinished);
connect(nuimo, &Nuimo::buttonPressed, this, &DevicePluginSenic::onButtonPressed); connect(nuimo, &Nuimo::buttonPressed, this, &DevicePluginSenic::onButtonPressed);
connect(nuimo, &Nuimo::buttonLongPressed, this, &DevicePluginSenic::onButtonLongPressed); connect(nuimo, &Nuimo::buttonLongPressed, this, &DevicePluginSenic::onButtonLongPressed);
connect(nuimo, &Nuimo::swipeDetected, this, &DevicePluginSenic::onSwipeDetected); connect(nuimo, &Nuimo::swipeDetected, this, &DevicePluginSenic::onSwipeDetected);
@ -85,7 +86,7 @@ Device::DeviceSetupStatus DevicePluginSenic::setupDevice(Device *device)
m_nuimos.insert(nuimo, device); m_nuimos.insert(nuimo, device);
nuimo->bluetoothDevice()->connectDevice(); nuimo->bluetoothDevice()->connectDevice();
return Device::DeviceSetupStatusSuccess; return Device::DeviceSetupStatusAsync;
} }
@ -194,6 +195,16 @@ void DevicePluginSenic::onBluetoothDiscoveryFinished()
emit devicesDiscovered(nuimoDeviceClassId, deviceDescriptors); emit devicesDiscovered(nuimoDeviceClassId, deviceDescriptors);
} }
void DevicePluginSenic::onDeviceInitializationFinished()
{
Nuimo *nuimo = static_cast<Nuimo *>(sender());
Device *device = m_nuimos.value(nuimo);
if (!device->setupComplete()) {
emit deviceSetupFinished(device, Device::DeviceSetupStatusSuccess);
}
}
void DevicePluginSenic::onConnectedChanged(bool connected) void DevicePluginSenic::onConnectedChanged(bool connected)
{ {
Nuimo *nuimo = static_cast<Nuimo *>(sender()); Nuimo *nuimo = static_cast<Nuimo *>(sender());

1
senic/devicepluginsenic.h
View File

@ -56,6 +56,7 @@ private slots:
void onReconnectTimeout(); void onReconnectTimeout();
void onBluetoothDiscoveryFinished(); void onBluetoothDiscoveryFinished();
void onDeviceInitializationFinished();
void onConnectedChanged(bool connected); void onConnectedChanged(bool connected);
void onBatteryValueChanged(const uint &percentage); void onBatteryValueChanged(const uint &percentage);
void onButtonPressed(); void onButtonPressed();

2
senic/nuimo.cpp
View File

@ -402,7 +402,7 @@ void Nuimo::onServiceDiscoveryFinished()
m_ledMatrixService->discoverDetails(); m_ledMatrixService->discoverDetails();
} }
} }
emit deviceInitializationFinished();
} }
void Nuimo::onDeviceInfoServiceStateChanged(const QLowEnergyService::ServiceState &state) void Nuimo::onDeviceInfoServiceStateChanged(const QLowEnergyService::ServiceState &state)

1
senic/nuimo.h
View File

@ -95,6 +95,7 @@ signals:
void swipeDetected(const SwipeDirection &direction); void swipeDetected(const SwipeDirection &direction);
void rotationValueChanged(const uint &value); void rotationValueChanged(const uint &value);
void deviceInformationChanged(const QString &firmwareRevision, const QString &hardwareRevision, const QString &softwareRevision); void deviceInformationChanged(const QString &firmwareRevision, const QString &hardwareRevision, const QString &softwareRevision);
void deviceInitializationFinished();
private slots: private slots:
void onConnectedChanged(const bool &connected); void onConnectedChanged(const bool &connected);