Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

    • -0
    • +45
    ./hd/data/MTreatmentBloodPrimeData.cpp
    • -0
    • +83
    ./hd/data/MTreatmentBloodPrimeData.h
  1. … 15 more files in changeset.
DEN-6862: ptTx-RB: Implementation [Screens] Rinseback Complete

- DEN-6864: ptTx-RB: Implementation [Messaging] (1/2)

- DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added ImageText Componenet for the rinseback in progress screen

- Added Flow rate as well to the message ID_Rinseback as 3rd parameter.

- Connected Recirculate message to the Recirculate screen in progress.

- Connected Rinseback (Adj/Data) messages to the Rinseback screen in progress.

- Updated TreatmentStack Screen navigation for the Rinseback, Recirculate, TreatmentComplete and so on.

  1. … 17 more files in changeset.
DEN-6864: Implementation [Messaging] (1/2)

    • -0
    • +45
    ./hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp
    • -0
    • +84
    ./hd/adjustment/MTreatmentAdjustRecirculateResponse.h
    • -5
    • +76
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +45
    ./hd/adjustment/MTreatmentAdjustRinsebackResponse.cpp
    • -0
    • +84
    ./hd/adjustment/MTreatmentAdjustRinsebackResponse.h
    • -0
    • +45
    ./hd/data/MTreatmentRinsebackData.cpp
    • -0
    • +85
    ./hd/data/MTreatmentRinsebackData.h
    • -17
    • +25
    ./hd/data/MTreatmentStatesData.cpp
    • -15
    • +24
    ./hd/data/MTreatmentStatesData.h
  1. … 19 more files in changeset.
- Added PostTreatmentComplete.qml screen - Added PostTreatmentRinsebackComplete.qml - Removed '_' from Dialisate state property name - fixed the Alarm enum name change on AlarmDefs

  1. … 11 more files in changeset.
Merge master into DEN-6349_bp_hr_manual_entry

    • -2
    • +3
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 10 more files in changeset.
Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

    • -14
    • +44
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 11 more files in changeset.
Build failed on server because the fw common branch master was changed.

- commented out the removed enum from application.

  1. … 1 more file in changeset.
Merge master into DEN-4860_BLE

    • -2
    • +3
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 11 more files in changeset.
DEN-5838: Code Review 0

  1. … 1 more file in changeset.
DEN-5836: Code Coverage

- 99.979% (4826/4827)

  1. … 4 more files in changeset.
DEN-5836: Code Coverage

- commented as manually tested the AlarmClearedCondition.

    • -2
    • +3
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 7 more files in changeset.
DEN-4964: Addressed code review comments.

  1. … 7 more files in changeset.
DEN-5836: Alarm:Code Coverage

- 99.110% (4790/4833)

  1. … 4 more files in changeset.
DEN-4964: Addressed code review comments.

  1. … 8 more files in changeset.
DEN-4964: Addressed code review comments.

DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

    • -59
    • +111
    ./hd/alarm/MAlarmStatusData.cpp
  1. … 2 more files in changeset.
DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

  1. … 1 more file in changeset.
DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

    • -0
    • +13
    ./hd/adjustment/MTreatmentAdjustRequests.h
DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

  1. … 3 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

  1. … 13 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

    • -0
    • +28
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 8 more files in changeset.
Merge DEN-4860_BLE into 2020_EOY_DEMO

    • -13
    • +12
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 22 more files in changeset.
Merge master into DEN-4860_BLE

    • -28
    • +99
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 21 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

    • -0
    • +28
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 8 more files in changeset.
DEN-4964: Added HD Blood/DialIn signal strengths to Manager page.

  1. … 5 more files in changeset.
DEN-5754: Implementation

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

DEN-5833: Implementation

- Added the message 63 (req/rsp)

    • -7
    • +8
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +41
    ./hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    ./hd/alarm/MAlarmClearedCondition.h
  1. … 10 more files in changeset.