Index: denali.pro.user =================================================================== diff -u -rbe1b2d8f110b741f3d630df438da07d411110543 -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- denali.pro.user (.../denali.pro.user) (revision be1b2d8f110b741f3d630df438da07d411110543) +++ denali.pro.user (.../denali.pro.user) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 1 0 0 Index: sources/gui/GuiGlobals.h =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -96,7 +96,7 @@ ID_CreateTreatmentRsp = 0x3600, // 54 ID_StartTreatmentReq = 0x3800, // 56 ID_StartTreatmentRsp = 0x3900, // 57 - ID_ConfirmTreatmentReq = 0x3A00, // 58 + ID_ConfirmTreatmentReq = 0x3B00, // 59 ID_EndTreatmentReq = 0x3C00, // 60 ID_EndTreatmentRsp = 0x3D00, // 61 Index: sources/gui/qml/pages/SettingsBluetooth.qml =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/gui/qml/pages/SettingsBluetooth.qml (.../SettingsBluetooth.qml) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -44,7 +44,7 @@ width: Variables.settingsBLEButtonWidth text.text: "Scan for devices" animated: true - onClicked: vBluetooth.onScanForDevices() + onClicked: vBluetooth.doScanForDevices() } Rectangle { @@ -102,7 +102,7 @@ } onClicked: { - vBluetooth.onSelectedDevice(modelData.address) + vBluetooth.doSelectDevice(modelData.address) } } } Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -359,9 +359,9 @@ * \brief The MConfirmTreatmentReq class * \details The model to tell HD treatment parameters have been confirmed * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 56 | 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:-----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 0x3B00| 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | * * | Payload || * | || Index: sources/storage/FileHandler.cpp =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -108,7 +108,7 @@ } /*! - * \brief FileHandler::readCSV + * \brief FileHandler::readJSON * \details reads the provided filename's JSON content into the vContent variable. * \param vFileName - Source file name * \param vContent - The content of the file which will be written to when done. Index: sources/view/VBluetooth.cpp =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -19,7 +19,7 @@ this, SLOT(onDeviceDiscovered(const QBluetoothDeviceInfo))); connect(this, SIGNAL(selectedDevice(const QString)), - &_BLEScanner, SLOT(onSelectedDevice(const QString))); + &_BLEScanner, SLOT(doSelectDevice(const QString))); } /*! @@ -28,7 +28,7 @@ * Updates the status and emits a signal to the BLEScanner to * begin a new scan. */ -void VBluetooth::onScanForDevices() +void VBluetooth::doScanForDevices() { bleDevices.clear(); emit devicesChanged(); @@ -85,7 +85,7 @@ * Gets the BLE modelData for QML * \return QVariant - the modelData */ -QVariant VBluetooth::getDevices() +QVariant VBluetooth::doGetDevices() { return QVariant::fromValue(bleDevices); } @@ -95,7 +95,7 @@ * Emits a signal that the device was selected * \param addr - the selected BLE mac address */ -void VBluetooth::onSelectedDevice(const QString &addr) +void VBluetooth::doSelectDevice(const QString &addr) { emit selectedDevice(addr); } Index: sources/view/VBluetooth.h =================================================================== diff -u -rbe1b2d8f110b741f3d630df438da07d411110543 -r1d006f4e732fa2c5335d5adff425d0f39a99d37c --- sources/view/VBluetooth.h (.../VBluetooth.h) (revision be1b2d8f110b741f3d630df438da07d411110543) +++ sources/view/VBluetooth.h (.../VBluetooth.h) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) @@ -11,7 +11,7 @@ using namespace Gui; -// forward diclations +// forward declarations class tst_views; namespace View { @@ -22,13 +22,13 @@ explicit VBluetooth(QObject *parent = nullptr); protected: - Q_PROPERTY(QVariant devices READ getDevices NOTIFY devicesChanged) + Q_PROPERTY(QVariant devices READ doGetDevices NOTIFY devicesChanged) Q_PROPERTY(QVariant status READ getStatus NOTIFY statusChanged) public slots: - void onScanForDevices(); - QVariant getDevices(); - void onSelectedDevice(const QString &addr); + void doScanForDevices(); + QVariant doGetDevices(); + void doSelectDevice(const QString &addr); signals: void devicesChanged();