canbus

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into staging

  1. … 35 more files in changeset.
DEN-6638: ptTx-RB: Code Review 0

- Added an ability for now to ask for versions.

  1. … 2 more files in changeset.
DEN-6869: Added Version Dialin API and a Simulator plugin

- After adding the simulator plugin find out a bug in the code and fixed.

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

  1. … 39 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).

  1. … 14 more files in changeset.
DEN-6865: ptTx-RB: Implementation [Messaging] (2/2)

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

  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.

-

  1. … 40 more files in changeset.
DEN-6862, DEN-6865 Blood Prime Screen

- Added Blood Prime Screen/Message

- Cleaned up the code a little.

  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. … 18 more files in changeset.
DEN-6864: Implementation [Messaging] (1/2)

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

  1. … 10 more files in changeset.
DEN-6612 UI_DVT: Pre-Treatment Ultrafiltration

- This story wasn't part of the current sprint S37 but while I worked on it to be able to push it to master ASAP, so put the story as the commit comment.

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

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

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

- 99.979% (4826/4827)

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

- commented as manually tested the AlarmClearedCondition.

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

- 99.110% (4790/4833)

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

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

DEN-4964: Addressed code review comments.

DEN-4964: Addressed code review comments.

Resolved merge issue

Merge branch 'DEN-5830_AlarmDesign' into demo_test

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

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

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

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

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

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

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

  1. … 21 more files in changeset.
Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

  1. … 6 more files in changeset.