Index: denali.pro.user =================================================================== diff -u -r666594860f4ea32da9a2bd362d40325b881b11f9 -r3a238930f8d939800512c9a786e96f15b35a2001 --- denali.pro.user (.../denali.pro.user) (revision 666594860f4ea32da9a2bd362d40325b881b11f9) +++ denali.pro.user (.../denali.pro.user) (revision 3a238930f8d939800512c9a786e96f15b35a2001) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/bluetooth/BLEScanner.cpp =================================================================== diff -u -r666594860f4ea32da9a2bd362d40325b881b11f9 -r3a238930f8d939800512c9a786e96f15b35a2001 --- sources/bluetooth/BLEScanner.cpp (.../BLEScanner.cpp) (revision 666594860f4ea32da9a2bd362d40325b881b11f9) +++ sources/bluetooth/BLEScanner.cpp (.../BLEScanner.cpp) (revision 3a238930f8d939800512c9a786e96f15b35a2001) @@ -146,6 +146,7 @@ */ void BLEScanner::doScanForDevices() { + timer->stop(); discoveryAgent->start(); } @@ -194,6 +195,9 @@ */ void BLEScanner::onRequestDeviceSerialNumber() { + if (omronDeviceInformationService == nullptr) + return; + // read device serial number const QLowEnergyCharacteristic c = omronDeviceInformationService->characteristic( QBluetoothUuid(QBluetoothUuid::SerialNumberString) @@ -439,7 +443,7 @@ /*! * \brief BLEScanner::updateBLECuffCheckinType * Toggles the type of check we do with the BLE cuff. - * If already connected, just query it repeatedly ever 1Hz. + * If already connected, just query it repeatedly every 1Hz. * Otherwise, start trying to reconnect to it. * \param retryConnection - if true, retry connection, normal checkin otherwise. */ Index: sources/bluetooth/BLEScanner.h =================================================================== diff -u -r666594860f4ea32da9a2bd362d40325b881b11f9 -r3a238930f8d939800512c9a786e96f15b35a2001 --- sources/bluetooth/BLEScanner.h (.../BLEScanner.h) (revision 666594860f4ea32da9a2bd362d40325b881b11f9) +++ sources/bluetooth/BLEScanner.h (.../BLEScanner.h) (revision 3a238930f8d939800512c9a786e96f15b35a2001) @@ -33,19 +33,19 @@ // 19 total bytes struct BLEMeasurementData { - uint8_t flags; // 1 byte - uint16_t systolic; // 2 bytes - uint16_t diastolic; // 2 bytes - uint16_t mean_arterial_pressure_value; // 2 bytes - uint16_t year; // 2 bytes - uint8_t month; // 1 byte - uint8_t day; // 1 byte - uint8_t hour; // 1 byte - uint8_t minute; // 1 byte - uint8_t second; // 1 byte - uint16_t pulse_rate; // 2 bytes - uint8_t user_id; // 1 byte - uint16_t measurement_status; // 2 bytes + uint8_t flags; // 1 byte + uint16_t systolic; // 2 bytes + uint16_t diastolic; // 2 bytes + uint16_t mean_arterial_pressure_value; // 2 bytes + uint16_t year; // 2 bytes + uint8_t month; // 1 byte + uint8_t day; // 1 byte + uint8_t hour; // 1 byte + uint8_t minute; // 1 byte + uint8_t second; // 1 byte + uint16_t pulse_rate; // 2 bytes + uint8_t user_id; // 1 byte + uint16_t measurement_status; // 2 bytes }; @@ -73,7 +73,7 @@ const QString omronUnknownServiceName = QString("{ecbe3980-c9a2-11e1-b1bd-0002a5d5c51b}"); const QString omronBloodPressureServiceName = QString("{00001810-0000-1000-8000-00805f9b34fb}"); const QString omronDeviceInformationServiceName = QString("{0000180a-0000-1000-8000-00805f9b34fb}"); - const QStringList omronDeviceNamesPrefixes = {"BP7000", "BLEsmart"}; + const QStringList omronDeviceNamesPrefixes = {"BP7000", "BLEsmart", "Blood Pressure"}; QStringList characteristicsToAcquireNotify; Index: sources/view/VBluetooth.cpp =================================================================== diff -u -r3e2866b98a67e772686d5190eacfd4ee437bcd0f -r3a238930f8d939800512c9a786e96f15b35a2001 --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 3e2866b98a67e772686d5190eacfd4ee437bcd0f) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 3a238930f8d939800512c9a786e96f15b35a2001) @@ -89,7 +89,7 @@ VBluetoothDeviceInfo *info = new VBluetoothDeviceInfo(device); if (!isDeviceAlreadyPaired(device)) bleDevices.insert(0, info); - qDebug() << "VBluetooth: Discovered " << device.address(); + qDebug() << "VBluetooth: Discovered " << device.name(); emit didDevicesChanged(); } Index: sources/view/VTreatmentBegin.cpp =================================================================== diff -u -r666594860f4ea32da9a2bd362d40325b881b11f9 -r3a238930f8d939800512c9a786e96f15b35a2001 --- sources/view/VTreatmentBegin.cpp (.../VTreatmentBegin.cpp) (revision 666594860f4ea32da9a2bd362d40325b881b11f9) +++ sources/view/VTreatmentBegin.cpp (.../VTreatmentBegin.cpp) (revision 3a238930f8d939800512c9a786e96f15b35a2001) @@ -43,7 +43,7 @@ /** * \brief VCreateTreatment::start * Called when user is ready to begin a new treatment. - * Implements SRSUI 253, 695 + * Implements SRSUI 253, 695, PRS 50 */ void VTreatmentBegin::doStartTreatment() { qDebug() << "Requesting to start a treatment...";