sources

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

  1. … 1 more file in changeset.
DEN-4863, DEN-4865: Updated unit tests and code coverage for bluetooth

  1. … 2 more files in changeset.
DEN-4865, DEN-5642: Checking BLE connection before sending UF volume, fixed unit test errors and added object names to support squishqt tests

    • -0
    • +4
    ./gui/qml/dialogs/NotificationDialog.qml
    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -0
    • +4
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +7
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 6 more files in changeset.
Resolved merge issue

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

Merge branch 'DEN-5830_AlarmDesign' into demo_test

  1. … 1 more file in changeset.
DEN-5833: Implementation

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

    • -0
    • +75
    ./AlarmGenerator.cpp
  1. … 1 more file in changeset.
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.

    • -0
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.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.

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.

    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -6
    • +2
    ./view/hd/data/VTreatmentUltrafiltration.h
Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

DEN-5833: Implementation

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

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.

DEN-5754: Implementation

- Fixed a bug caused by a typo

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -5
    • +2
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

  1. … 2 more files in changeset.
Merge DEN-4860_BLE into 2020_EOY_DEMO

    • -1
    • +2
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -0
    • +1
    ./gui/qml/pages/treatment/TreatmentConfirm.qml
    • -2
    • +5
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
  1. … 10 more files in changeset.
Merge master into DEN-4860_BLE

    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +0
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -1
    • +57
    ./gui/qml/pages/treatment/TreatmentStack.qml
  1. … 9 more files in changeset.
DEN-5515, DEN-5516: Disabled verbose bluetooth debugging

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
    ./gui/qml/components/NotificationBar.qml
    • -10
    • +14
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +17
    ./gui/qml/pages/treatment/TreatmentStack.qml
DEN-5515, DEN-5516: Setup in-treatment bp/hr measurement alerts

- Replaced some instances of qDebug with LOG_DEBUG

- Docstring fixes, cleanup

    • -0
    • +2
    ./gui/qml/pages/treatment/TreatmentCreate.qml
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.

    • -1
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

  1. … 2 more files in changeset.
DEN-4964: Added HD Blood/DialIn signal strengths to Manager page.

    • -1
    • +6
    ./model/hd/data/MTreatmentFlowsData.cpp
  1. … 2 more files in changeset.
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

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. … 1 more file in changeset.