application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-4867: Code Review 0 - Requested Modifications

- Removed startBLETimer and killBLETimer so we are not creating and deleting timers. Only one timer will be used

- Added toggleBLETimer

- Logging measurements when they are received instead of using qDebug

- Passing device addr and name to BLEScanner instead of just addr so only a QBluetoothDeviceInfo object is necessary, allowing removal of the macAddress QString

- Removed VBluetoothDeviceInfo static cast in VBluetooth::doSelectDevice

    • -75
    • +57
    /sources/bluetooth/BLEScanner.cpp
    • -2
    • +2
    /sources/gui/qml/pages/SettingsBluetooth.qml
DEN-4867: Addressed code review comments

DEN-4867: Preventing create treatment class from thinking a new treatment profile was saved when the bledevices.conf file is updated.

DEN-4867: Addressed code review comments

    • -20
    • +60
    /sources/bluetooth/BLEScanner.cpp
DEN-4867: Addressed code review comments

    • -4
    • +0
    /sources/gui/qml/components/ScreenItem.qml
    • -21
    • +8
    /sources/gui/qml/components/SettingsItem.qml
    • -0
    • +3
    /sources/gui/qml/globals/Variables.qml
DEN-4866, DEN-4863, DEN-4862: Added class descriptions, fixed unit test, ran static code analysis

- Fixed tst_canbus issue likely introduced in f1e100d1368

DEN-4863, DEN-4865: Code Coverage and Unit Tests

    • -0
    • +17
    /sources/gui/qml/pages/SettingsHome.qml
DEN-4863, DEN-4865: Updated unit tests and code coverage for bluetooth

    • -1
    • +3
    /sources/view/VBluetoothDeviceInfo.cpp
DEN-4865, DEN-5642: Checking BLE connection before sending UF volume, fixed unit test errors and added object names to support squishqt tests

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmStatusData.cpp
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

DEN-5833: Implementation

- added a touch expanding area for the TouchArea so regardless of its visual size it can have expanded touchable area.

- the touch expanding for the mute button set to 25 so it can have a bigger touch area that its size which is little.

    • -1
    • +1
    /sources/gui/qml/components/MuteButton.qml
    • -1
    • +4
    /sources/gui/qml/components/TouchRect.qml
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

    • -11
    • +13
    /sources/canbus/MessageInterpreter.cpp
    • -6
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

    • -1
    • +9
    /sources/canbus/MessageInterpreter.cpp
DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

    • -6
    • +6
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

Merge DEN-4860_BLE into 2020_EOY_DEMO

    • -7
    • +17
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +6
    /sources/gui/qml/globals/Variables.qml
  1. … 10 more files in changeset.
Merge master into DEN-4860_BLE

    • -0
    • +28
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +15
    /sources/canbus/MessageInterpreter.cpp
    • -11
    • +48
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +0
    /sources/gui/qml/pages/SettingsHome.qml
  1. … 9 more files in changeset.
DEN-5515, DEN-5516: Disabled verbose bluetooth debugging

DEN-5515, DEN-5516: Added bluetooth setup to run.sh

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

DEN-5754: Implementation

- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.

- added the rejection reason text to the pTx uf adj screen.

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +14
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
DEN-5515, DEN-5516: Setup in-treatment bp/hr measurement alerts

- Replaced some instances of qDebug with LOG_DEBUG

- Docstring fixes, cleanup

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

DEN-5754: Implementation

- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59

- Enabled the priming button for now since there is no FW implementation.

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -4
    • +2
    /sources/canbus/MessageInterpreter.cpp
DEN-5833: Implementation

- Moved version and sd-card icon to to not to cover others.

DEN-5754: Implementation

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

    • -1
    • +0
    /sources/model/hd/alarm/MAlarmStatusData.cpp
DEN-5516, 5514 - BLE Interface updates

- When reconnecting to the last paired device on startup, ensure we repeatedly try to connect to it by updating the BLE connection type

- Docstring additions

- Keeping some code in case it is needed for future use with other BLE devices

DEN-5754: Implementation

- Removed the semi-colon at the end of the imports.

DEN-5833: Implementation

- The message 63 has been tested

    • -1
    • +15
    /sources/view/hd/alarm/VAlarmStatus.cpp