application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

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
Resolved merge issue

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

    • -4
    • +6
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-5830_AlarmDesign' into demo_test

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

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

    • -0
    • +75
    /sources/AlarmGenerator.cpp
    • -0
    • +55
    /sources/AlarmGenerator.h
    • -8
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
DEN-5833: Implementation

- Cleaned up the unit tests

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
DEN-5754: Implementation

- cherry picked a fix from DEN-5830_AlarmDesign@51accb for the Treatment End message which has no payload.

- Also made the interpretMessage() for received messages to be more identical to the DEN-5830_AlarmDesign to hopefully help merging easier.

    • -7
    • +20
    /sources/canbus/MessageInterpreter.cpp
DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

    • -4
    • +6
    /sources/gui/qml/globals/Variables.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
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

DEN-5754: Implementation

- Fixed a bug caused by a typo

DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +3
    /sources/canbus/MessageInterpreter.cpp
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