Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -672,7 +672,11 @@ void BluetoothInterface::onServiceCharacteristicChanged (const QLowEnergyCharacteristic &vCharacteristic, const QByteArray &vValue) { QLowEnergyService *service = reinterpret_cast(sender()); NOTIFY_DETAILS_CHANGE +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement)) +#else + if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)) +#endif { interpretBloodPressure(vValue); } @@ -731,7 +735,11 @@ void BluetoothInterface::onServiceDescriptorWritten (const QLowEnergyDescriptor &vDescriptor , const QByteArray &vValue) { QLowEnergyService *service = reinterpret_cast(sender()); NOTIFY_CONFIG_WRITE +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ( vDescriptor.uuid() == QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration && vValue == _bloodPressureNotifyValue ) { +#else + if ( vDescriptor.uuid() == QBluetoothUuid(QBluetoothUuid::ClientCharacteristicConfiguration) && vValue == _bloodPressureNotifyValue ) { +#endif _reconnectionActive = true; } } @@ -756,20 +764,44 @@ if ( ! sender() ) return; QLowEnergyService *service = reinterpret_cast(sender()); switch (vState) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QLowEnergyService::RemoteServiceDiscovered : { +#else + case QLowEnergyService::ServiceDiscovered : { +#endif NOTIFY_SERVICE_DETAILS_DONE +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) switch(QBluetoothUuid::ServiceClassUuid(service->serviceUuid().toUInt32())) { +#else + switch( service->serviceUuid().toUInt32() ) { +#endif +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QBluetoothUuid::ServiceClassUuid::BloodPressure: +#else + case QBluetoothUuid::BloodPressure: +#endif enableNotify(); break; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QBluetoothUuid::ServiceClassUuid::DeviceInformation: +#else + case QBluetoothUuid::DeviceInformation: +#endif interpretInformation(); break; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QBluetoothUuid::ServiceClassUuid::BatteryService : { +#else + case QBluetoothUuid::BatteryService : { +#endif int index = 0; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QByteArray data = service->characteristic(QBluetoothUuid::CharacteristicType::BatteryLevel).value(); +#else + QByteArray data = service->characteristic(QBluetoothUuid::BatteryLevel).value(); +#endif Types::U08 batteryLevel; if (GetValue(data, index, batteryLevel)) { _tempBatt = batteryLevel.value; @@ -1082,22 +1114,38 @@ */ void BluetoothInterface::makeServices(const QBluetoothUuid &vService) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::DeviceInformation )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::DeviceInformation )) { +#endif _serviceDeviceInformation = _device->createServiceObject(vService, this); initConnectionsService (_serviceDeviceInformation ); return; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::CurrentTimeService )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::CurrentTimeService )) { +#endif _serviceCurrentTime = _device->createServiceObject(vService, this); initConnectionsService (_serviceCurrentTime ); return; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::BloodPressure )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::BloodPressure )) { +#endif _serviceBloodPressure = _device->createServiceObject(vService, this); initConnectionsService (_serviceBloodPressure ); return; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::BatteryService )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::BatteryService )) { +#endif _serviceBattery = _device->createServiceObject(vService, this); initConnectionsService (_serviceBattery ); return; @@ -1174,8 +1222,13 @@ } // blood pressure measurements +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement); QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); +#else + const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)); + QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::ClientCharacteristicConfiguration); +#endif if (configBPMeas.isValid()) _serviceBloodPressure->writeDescriptor(configBPMeas, _bloodPressureNotifyValue); } @@ -1253,7 +1306,11 @@ return; } // blood pressure feature +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BloodPressureFeature); +#else + const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureFeature)); +#endif if (!detailBPFeat.isValid()) { qDebug() << "Blood pressure feature not found."; return; @@ -1285,7 +1342,11 @@ return; } // battery level percent +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BatteryLevel); +#else + const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BatteryLevel)); +#endif if (!detail.isValid()) { qDebug() << "Battery level not found."; return;