Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-6635: Update Design Documents

- Code has been updated while the SDDUI was written.

- DEN-6638: Code Review 0

  1. … 11 more files in changeset.
DEN-6877: Merging the Versions/Acceleration

    • -0
    • +64
    ./adjustment/MTreatmentAdjustHDVersionsResponse.cpp
    • -0
    • +101
    ./adjustment/MTreatmentAdjustHDVersionsResponse.h
    • -1
    • +26
    ./adjustment/MTreatmentAdjustRequests.h
    • -0
    • +68
    ./data/MHDAccelerometerData.cpp
    • -0
    • +107
    ./data/MHDAccelerometerData.h
  1. … 35 more files in changeset.
DEN-6876: Cleaned up the code to start the versions cherry pick

- Messages 60,61 which was Treatment End has been removed (FW is not using it anymore).

    • -28
    • +0
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 16 more files in changeset.
DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

- Added Model/View for the messages "Treatment End" Req/Res (87/88)

    • -0
    • +45
    ./adjustment/MTreatmentAdjustEndResponse.cpp
    • -0
    • +84
    ./adjustment/MTreatmentAdjustEndResponse.h
    • -1
    • +31
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 14 more files in changeset.
DEN-6863 , DEN-6865 , DEN-6866 : psTx

- Added Recirculate timeout Model/View.

- Added Rinseback timeout to the Model/View.

- Added three more parameter to the Treatment State Message 15 for the "Blood Prime", "Treatment End", "Treatment Stop"

- Renamed the StackItem method "back" to "page".

- Renamed the "End" button label to "End Treatment"

- Renamed the "TreatmentComplete" Screen to "TreatmentEnd" to be more consistent with the states.

- Added the "TreatmentEndPause" screen for "Treatment End Pause" state

- Added the recirculate timeout to the screens.

- Added the rinseback timeout to the screens.

- Refactored the "txDialysisRunning" to "txDialysis" to match the state with the same name.

-

    • -0
    • +45
    ./data/MTreatmentRecirculateData.cpp
    • -0
    • +85
    ./data/MTreatmentRecirculateData.h
  1. … 36 more files in changeset.
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

    • -0
    • +45
    ./data/MTreatmentBloodPrimeData.cpp
    • -0
    • +83
    ./data/MTreatmentBloodPrimeData.h
  1. … 16 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
    ./adjustment/MTreatmentAdjustRecirculateResponse.cpp
    • -0
    • +84
    ./adjustment/MTreatmentAdjustRecirculateResponse.h
    • -5
    • +76
    ./adjustment/MTreatmentAdjustRequests.h
    • -0
    • +45
    ./adjustment/MTreatmentAdjustRinsebackResponse.cpp
    • -0
    • +84
    ./adjustment/MTreatmentAdjustRinsebackResponse.h
    • -0
    • +45
    ./data/MTreatmentRinsebackData.cpp
    • -0
    • +85
    ./data/MTreatmentRinsebackData.h
  1. … 20 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
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 11 more files in changeset.
Merge branch 'master' into DEN-5751_Pre-TreatmentUltrafiltration

    • -14
    • +44
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 12 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
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 12 more files in changeset.
DEN-5838: Code Review 0

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

- commented as manually tested the AlarmClearedCondition.

    • -2
    • +3
    ./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.

    • -8
    • +8
    ./adjustment/MTreatmentAdjustHDVersionsResponse.h
  1. … 8 more files in changeset.
DEN-5836: Alarm:Code Coverage

- updated the alarm message table

- fixed the -q parameter

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

    • -3
    • +3
    ./adjustment/MTreatmentAdjustHDVersionsResponse.h
DEN-4964: Addressed code review comments.

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

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

    • -1
    • +0
    ./adjustment/MTreatmentAdjustHDVersionsResponse.cpp
    • -0
    • +30
    ./adjustment/MTreatmentAdjustHDVersionsResponse.h
  1. … 5 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
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 9 more files in changeset.
Merge DEN-4860_BLE into 2020_EOY_DEMO

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

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

    • -0
    • +28
    ./adjustment/MTreatmentAdjustRequests.h
  1. … 9 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