Index: main.cpp =================================================================== diff -u -rbe1b2d8f110b741f3d630df438da07d411110543 -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- main.cpp (.../main.cpp) (revision be1b2d8f110b741f3d630df438da07d411110543) +++ main.cpp (.../main.cpp) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -318,7 +318,7 @@ } //! - Initializing BLE Interface - _BLEScanner.init(); + _BLEScanner.doInit(); //! - Initializing Application Controller _ApplicationController.init(Threads::_Application_Thread); Index: sources/bluetooth/BLEScanner.cpp =================================================================== diff -u -rbe1b2d8f110b741f3d630df438da07d411110543 -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/bluetooth/BLEScanner.cpp (.../BLEScanner.cpp) (revision be1b2d8f110b741f3d630df438da07d411110543) +++ sources/bluetooth/BLEScanner.cpp (.../BLEScanner.cpp) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -15,11 +15,11 @@ macAddress = "EC:21:E5:F4:BC:C9"; // for testing only } -void BLEScanner::initConnections() +void BLEScanner::onInitConnections() { // discovery agent - connect(discoveryAgent, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo&)), + connect(discoveryAgent, SIGNAL(deviceDiscovered(QBluetoothDeviceInfo)), this, SLOT(onDeviceDiscovered(const QBluetoothDeviceInfo&))); connect(discoveryAgent, SIGNAL(error(QBluetoothDeviceDiscoveryAgent::Error)), this, SLOT(onDiscoveryAgentError(QBluetoothDeviceDiscoveryAgent::Error))); @@ -32,14 +32,14 @@ * \details Initializes the class by setting the connections * \return true on first initialization, false if it has already been initialized */ -bool BLEScanner::init() +bool BLEScanner::doInit() { if (_init) return false; _init = true; - initConnections(); + onInitConnections(); LOG_EVENT("UI," + tr("%1 Initialized").arg(metaObject()->className())); @@ -51,10 +51,9 @@ * \brief BLEScanner::quit * Called when the application is exiting. */ -void BLEScanner::quit() +void BLEScanner::onQuit() { - quitThread(); // verified - + onQuitThread(); // verified } @@ -63,7 +62,7 @@ * \details Moves this object to main thread to be handled by QApplicaiton * It will also be destroyed there. */ -void BLEScanner::quitThread() +void BLEScanner::onQuitThread() { if (!_thread ) return; @@ -77,21 +76,21 @@ * Sets the BLE mac address to pair with * \param mac - (QString) The mac address to pair to (e.g. "EC:21:E5:F4:BC:C9") */ -void BLEScanner::setMacAddress(const QString &mac) +void BLEScanner::onSetMacAddress(const QString &mac) { macAddress = mac; } /*! - * \brief BLEScanner::onSelectedDevice + * \brief BLEScanner::doSelectDevice * \param addr - The mac address of the device to connect to */ -void BLEScanner::onSelectedDevice(const QString &addr) +void BLEScanner::doSelectDevice(const QString &addr) { - setMacAddress(addr); + onSetMacAddress(addr); for (const QBluetoothDeviceInfo &deviceInfo : devices) { if (deviceInfo.address().toString() == addr) { - connectToDevice(deviceInfo); + onConnectToDevice(deviceInfo); return; } } @@ -106,7 +105,7 @@ { qDebug() << __FUNCTION__ << deviceInfo.address(); devices.append(deviceInfo); - emit deviceDiscovered(deviceInfo); + emit didDiscoverDevice(deviceInfo); } /*! @@ -117,7 +116,7 @@ void BLEScanner::onDiscoveryAgentError(QBluetoothDeviceDiscoveryAgent::Error error) { qDebug() << __FUNCTION__ << error; - emit scanForDevicesError(error); + emit didReceiveScanForDevicesError(error); } /*! @@ -126,14 +125,14 @@ */ void BLEScanner::onScanFinished() { - emit scanFinished(); + emit didFinishScan(); } /*! * \brief BLEScanner::scanForDevices * Tells the discovery agent to start scanning for devices */ -void BLEScanner::scanForDevices() +void BLEScanner::doScanForDevices() { discoveryAgent->start(); } @@ -184,7 +183,7 @@ * The BLE device must be in the correct mode and it * must support indicate / notify for the blood pressure measurement characteristic (0x2A35). */ -void BLEScanner::requestBPMeasurement() +void BLEScanner::doRequestBPMeasurement() { if (omronBloodPressureService == nullptr) { @@ -219,14 +218,14 @@ * Requests blood pressure measurement data * \param serviceState - the new state of the service */ -void BLEScanner::serviceStateChanged(const QLowEnergyService::ServiceState &serviceState) +void BLEScanner::onServiceStateChanged(const QLowEnergyService::ServiceState &serviceState) { switch (serviceState) { case QLowEnergyService::ServiceDiscovered: { - requestBPMeasurement(); + doRequestBPMeasurement(); break; } case QLowEnergyService::InvalidService: @@ -278,7 +277,7 @@ return; } - parseMeasurement(byteArray); + doParseMeasurement(byteArray); } @@ -287,7 +286,7 @@ * Parses the BP and Pulse Rate measurement data * \param byteArray - the data to be parsed */ -void BLEScanner::parseMeasurement(const QByteArray &byteArray) +void BLEScanner::doParseMeasurement(const QByteArray &byteArray) { bp_measurement_t measurement; @@ -328,7 +327,7 @@ qDebug() << "user_id: " << measurement.user_id; qDebug() << "measurement_status: " << measurement.measurement_status; - emit receivedBPMeasurement(measurement); + emit didReceiveBPMeasurement(measurement); } @@ -338,7 +337,7 @@ * \param desc - the descriptor that was written to * \param byteArray - data confirming a descriptor disconnect or connection */ -void BLEScanner::confirmedDescriptorWrite(const QLowEnergyDescriptor &desc, const QByteArray &byteArray) +void BLEScanner::onConfirmedDescriptorWrite(const QLowEnergyDescriptor &desc, const QByteArray &byteArray) { qDebug() << "Confirmed descriptor write: " << byteArray; if (desc.isValid() && desc == desc && byteArray == QByteArray::fromHex("0000")) { @@ -357,7 +356,7 @@ * \param c - the BLE characteristic that was read * \param byteArray - the data read from the BLE characteristic */ -void BLEScanner::serviceCharacteristicsRead(const QLowEnergyCharacteristic &c,const QByteArray &byteArray) +void BLEScanner::onServiceCharacteristicsRead(const QLowEnergyCharacteristic &c,const QByteArray &byteArray) { qDebug() << __FUNCTION__ << c.name() << " data: " << byteArray; @@ -379,16 +378,16 @@ foreach (QLowEnergyService* service, services) { connect(service, SIGNAL(stateChanged(QLowEnergyService::ServiceState)), - this, SLOT(serviceStateChanged(QLowEnergyService::ServiceState))); + this, SLOT(onServiceStateChanged(QLowEnergyService::ServiceState))); connect(service, SIGNAL(characteristicChanged(QLowEnergyCharacteristic, QByteArray)), this, SLOT(onCharacteristicChanged(QLowEnergyCharacteristic,QByteArray))); connect(service, SIGNAL(characteristicRead(QLowEnergyCharacteristic,QByteArray)), - this, SLOT(serviceCharacteristicsRead(QLowEnergyCharacteristic,QByteArray))); + this, SLOT(onServiceCharacteristicsRead(QLowEnergyCharacteristic,QByteArray))); connect(service, SIGNAL(descriptorWritten(QLowEnergyDescriptor, QByteArray)), - this, SLOT(confirmedDescriptorWrite(QLowEnergyDescriptor, QByteArray))); + this, SLOT(onConfirmedDescriptorWrite(QLowEnergyDescriptor, QByteArray))); } } @@ -401,7 +400,6 @@ void BLEScanner::onControllerError(const QLowEnergyController::Error &error) { qDebug() << __FUNCTION__ << "LE controller error: " << error; - } /*! @@ -414,7 +412,6 @@ qDebug() << __FUNCTION__; lowEnergyController->discoverServices(); - } /*! @@ -424,7 +421,6 @@ void BLEScanner::onDeviceDisconnected() { qDebug() << __FUNCTION__; - } /*! @@ -434,7 +430,7 @@ * Connects to the desired device * \param deviceInfo - The QBluetoothDeviceInfo object to connect to */ -void BLEScanner::connectToDevice(const QBluetoothDeviceInfo& deviceInfo) +void BLEScanner::onConnectToDevice(const QBluetoothDeviceInfo& deviceInfo) { lowEnergyController = QLowEnergyController::createCentral(deviceInfo); Index: sources/bluetooth/BLEScanner.h =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/bluetooth/BLEScanner.h (.../BLEScanner.h) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/bluetooth/BLEScanner.h (.../BLEScanner.h) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -50,9 +50,8 @@ }; typedef bp_measurement bp_measurement_t; - void scanForDevices(); - void parseMeasurement(const QByteArray &byteArray); - void requestBPMeasurement(); + void doParseMeasurement(const QByteArray &byteArray); + void doRequestBPMeasurement(); private: @@ -76,20 +75,21 @@ QStringList characteristicsToAcquireNotify; - void initConnections(); - void quitThread(); - void connectToDevice(const QBluetoothDeviceInfo& deviceInfo); - void setMacAddress(const QString &mac); + void onInitConnections(); + void onQuitThread(); + void onConnectToDevice(const QBluetoothDeviceInfo& deviceInfo); + void onSetMacAddress(const QString &mac); signals: - void receivedBPMeasurement(bp_measurement_t); - void connectedToBloodPressureService(); - void scanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error error); - void scanFinished(); - void deviceDiscovered(const QBluetoothDeviceInfo &device); + void didReceiveBPMeasurement(bp_measurement_t); + void didReceiveScanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error error); + void didFinishScan(); + void didDiscoverDevice(const QBluetoothDeviceInfo &device); public slots: - bool init(); + bool doInit(); + void doSelectDevice(const QString &addr); + void doScanForDevices(); private slots: @@ -106,13 +106,12 @@ void onDeviceDisconnected(); // service slots - void serviceStateChanged(const QLowEnergyService::ServiceState &serviceState); + void onServiceStateChanged(const QLowEnergyService::ServiceState &serviceState); void onCharacteristicChanged(const QLowEnergyCharacteristic &c, const QByteArray &byteArray); - void confirmedDescriptorWrite(const QLowEnergyDescriptor &desc, const QByteArray &byteArray); - void serviceCharacteristicsRead(const QLowEnergyCharacteristic &c,const QByteArray &byteArray); + void onConfirmedDescriptorWrite(const QLowEnergyDescriptor &desc, const QByteArray &byteArray); + void onServiceCharacteristicsRead(const QLowEnergyCharacteristic &c,const QByteArray &byteArray); - void quit(); - void onSelectedDevice(const QString &addr); + void onQuit(); }; #endif // BLESCANNER_H Index: sources/gui/qml/pages/SettingsBluetooth.qml =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -108,7 +108,7 @@ } Connections { target: vBluetooth - onScanFinished: { + onDidScanFinished: { console.debug("Scan Finished."); } } Index: sources/view/VBluetooth.cpp =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -9,17 +9,20 @@ VBluetooth::VBluetooth(QObject *parent) : QObject(parent) { - connect(&_BLEScanner, SIGNAL(scanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error)), + connect(&_BLEScanner, SIGNAL(didReceiveScanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error)), this, SLOT(onScanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error))); - connect(&_BLEScanner, SIGNAL(scanFinished()), + connect(&_BLEScanner, SIGNAL(didFinishScan()), this, SLOT(onScanForDevicesFinished())); - connect(&_BLEScanner, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo)), + connect(&_BLEScanner, SIGNAL(didDiscoverDevice(QBluetoothDeviceInfo)), this, SLOT(onDeviceDiscovered(const QBluetoothDeviceInfo))); - connect(this, SIGNAL(selectedDevice(const QString)), + connect(this, SIGNAL(didSelectDevice(const QString)), &_BLEScanner, SLOT(doSelectDevice(const QString))); + + connect(this, SIGNAL(didRequestScanForDevices()), + &_BLEScanner, SLOT(doScanForDevices())); } /*! @@ -31,10 +34,10 @@ void VBluetooth::doScanForDevices() { bleDevices.clear(); - emit devicesChanged(); - _BLEScanner.scanForDevices(); + emit didDevicesChanged(); + emit didRequestScanForDevices(); status = "Scanning..."; - emit statusChanged(); + emit didStatusChanged(); } /*! @@ -53,7 +56,7 @@ status = tr("Error: Scan for devices error."); break; } - emit statusChanged(); + emit didStatusChanged(); } /*! @@ -66,7 +69,7 @@ VBluetoothDeviceInfo *info = new VBluetoothDeviceInfo(device); bleDevices.append(info); qDebug() << "VBluetooth: Discovered " << device.address(); - emit devicesChanged(); + emit didDevicesChanged(); } /*! @@ -75,9 +78,9 @@ */ void VBluetooth::onScanForDevicesFinished() { - emit scanFinished(); + emit didScanFinished(); status = "Scan Finished."; - emit statusChanged(); + emit didStatusChanged(); } /*! @@ -97,6 +100,6 @@ */ void VBluetooth::doSelectDevice(const QString &addr) { - emit selectedDevice(addr); + emit didSelectDevice(addr); } Index: sources/view/VBluetooth.h =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/view/VBluetooth.h (.../VBluetooth.h) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ sources/view/VBluetooth.h (.../VBluetooth.h) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -22,19 +22,20 @@ explicit VBluetooth(QObject *parent = nullptr); protected: - Q_PROPERTY(QVariant devices READ doGetDevices NOTIFY devicesChanged) - Q_PROPERTY(QVariant status READ getStatus NOTIFY statusChanged) + Q_PROPERTY(QVariant devices READ doGetDevices NOTIFY didDevicesChanged) + Q_PROPERTY(QVariant status READ getStatus NOTIFY didStatusChanged) public slots: void doScanForDevices(); QVariant doGetDevices(); void doSelectDevice(const QString &addr); signals: - void devicesChanged(); - void selectedDevice(const QString &addr); - void scanFinished(); - void statusChanged(); + void didDevicesChanged(); + void didSelectDevice(const QString &addr); + void didScanFinished(); + void didStatusChanged(); + void didRequestScanForDevices(); private: QList bleDevices;