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

  1. … 3 more files in changeset.
DEN-8064: Addressed code review comments

    • -0
    • +45
    ./hd/adjustment/MAdjustHDAlarmVolumeResponse.cpp
    • -0
    • +82
    ./hd/adjustment/MAdjustHDAlarmVolumeResponse.h
    • -4
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 14 more files in changeset.
Merge DEN-7752_Device_Information into DEN-8058_Alarm_Volume_Brightness

    • -0
    • +30
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 5 more files in changeset.
DEN-8083: Added HD and DG last and next service dates

    • -0
    • +31
    ./dg/adjustment/MAdjustDGServiceResponse.cpp
    • -0
    • +68
    ./dg/adjustment/MAdjustDGServiceResponse.h
    • -0
    • +31
    ./hd/adjustment/MAdjustHDServiceResponse.cpp
    • -0
    • +68
    ./hd/adjustment/MAdjustHDServiceResponse.h
    • -0
    • +30
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 12 more files in changeset.
DEN-8062, DEN-8081: Alarm volume improvements

    • -4
    • +4
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 6 more files in changeset.
DEN-D8062, DEN-8081, DEN-8082: Added alarm volume and brightness

    • -0
    • +32
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +39
    ./hd/data/MAlarmVolumeData.cpp
    • -0
    • +74
    ./hd/data/MAlarmVolumeData.h
  1. … 22 more files in changeset.
DEN-7752: Added hd dg serial number to device info page.

    • -0
    • +22
    ./MDGSerialNumberResponse.cpp
    • -0
    • +64
    ./MDGSerialNumberResponse.h
    • -0
    • +21
    ./MHDSerialNumberResponse.cpp
    • -0
    • +64
    ./MHDSerialNumberResponse.h
  1. … 6 more files in changeset.
Merge DEN-7035_Date_Time_Set into DEN-7524_Service-Mode

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

  1. … 3 more files in changeset.
DEN-7054: Added Network.h to Model namespace, refactoring

  1. … 10 more files in changeset.
DEN-7320: Addressed code review comments

    • -6
    • +6
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 7 more files in changeset.
DEN-7316: Added capability to enqueue alerts to be displayed and acknowledged

  1. … 2 more files in changeset.
DEN-7316: Added HD and DG messaging, and an alert notification when save is successful or fails.

    • -0
    • +31
    ./dg/adjustment/MAdjustDGDateTimeResponse.cpp
    • -0
    • +68
    ./dg/adjustment/MAdjustDGDateTimeResponse.h
    • -0
    • +45
    ./hd/adjustment/MAdjustHDDateTimeResponse.cpp
    • -0
    • +82
    ./hd/adjustment/MAdjustHDDateTimeResponse.h
    • -0
    • +55
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 16 more files in changeset.
DEN-7041: Fixed compilation issues with latest common master.

  1. … 2 more files in changeset.
Merge branch 'staging' of ssh://dvm-linux02:7999/ui/application into staging

    • -1
    • +13
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 3 more files in changeset.
DEN-7175: Implementation

- Figured this message is the only message which is sending message over on the sync 0x200 channel and if not send over sync channel then DG will not respond back with version.

    • -1
    • +13
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 4 more files in changeset.
Merge master into staging

    • -10
    • +9
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 36 more files in changeset.
DEN-6870: AV-Range: Implementation

- Updated the ranges

    • -2
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 2 more files in changeset.
DEN-6635: Update Design Documents

- Code has been updated while the SDDUI was written.

- DEN-6638: Code Review 0

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

    • -0
    • +64
    ./dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp
    • -0
    • +101
    ./dg/adjustment/MTreatmentAdjustDGVersionsResponse.h
    • -0
    • +68
    ./dg/data/MDGAccelerometerData.cpp
    • -0
    • +106
    ./dg/data/MDGAccelerometerData.h
    • -0
    • +64
    ./hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp
    • -0
    • +101
    ./hd/adjustment/MTreatmentAdjustHDVersionsResponse.h
    • -1
    • +26
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +68
    ./hd/data/MHDAccelerometerData.cpp
    • -0
    • +107
    ./hd/data/MHDAccelerometerData.h
  1. … 28 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
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 13 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
    ./hd/adjustment/MTreatmentAdjustEndResponse.cpp
    • -0
    • +84
    ./hd/adjustment/MTreatmentAdjustEndResponse.h
    • -1
    • +31
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 13 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
    ./hd/data/MTreatmentRecirculateData.cpp
    • -0
    • +85
    ./hd/data/MTreatmentRecirculateData.h
    • -9
    • +17
    ./hd/data/MTreatmentRinsebackData.cpp
    • -9
    • +15
    ./hd/data/MTreatmentRinsebackData.h
    • -18
    • +30
    ./hd/data/MTreatmentStatesData.cpp
    • -18
    • +30
    ./hd/data/MTreatmentStatesData.h
  1. … 35 more files in changeset.
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.