Modes

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14999: Do not alarm after rinseback completed due to 15 min t/o.

Merge DEN-14860

  1. … 2 more files in changeset.
Fixed merge conflicts from DEN-14999.

  1. … 6 more files in changeset.
Reverted previous change to re-enable re-prime feature and allow zero UF rate.

  1. … 1 more file in changeset.
Re-Prime feature re-enabled for this build. Minimum UF rate set back to zero for this build.

  1. … 1 more file in changeset.
Fixed merge conflicts.

  1. … 7 more files in changeset.
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

  1. … 11 more files in changeset.
DEN-14906: fixed merge conflicts from staging.

  1. … 8 more files in changeset.
Merge branch 'staging' into DEN-14999-alarm-table-updates

DEN-14999: Fixed issue with repeated trimmer heater commands being sent to DG.

  1. … 2 more files in changeset.
Merge branch 'DEN-14906-dialyzer-de-prime' into develop

  1. … 1 more file in changeset.
RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

DEN-14906: Fixed isues that arose when disabling re-prime feature.

  1. … 1 more file in changeset.
RESOLVED IN CODE WALKTHROUGH

RESOLVED IN CODE WALKTHROUGH

Fixed.

Fixed.

Merge DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off

Cherry picked merge, due to staging/develop conflicts

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

Changing from U32 to S32. It is a relative ms timer (so wouldn't be negative), but I needed to initialize this to something less than zero so that alarm ranking logic will be forced to rank a brand...

Changing from U32 to S32. It is a relative ms timer (so wouldn't be negative), but I needed to initialize this to something less than zero so that alarm ranking logic will be forced to rank a brand new alarm (triggered 0 ms ago).

What's the significance of changing to U32? Is this being used as a timer?

What's the significance of changing to U32? Is this being used as a timer?

HD-DEN-14457_Reservoir Drains Before Treatment With Pre Treatment Build Flags Off

Integrated current changes in other branches to address apparent conflicts.

Should venPres < venLowLimit be done outside if statement?

Should venPres < venLowLimit be done outside if statement?

DEN-14906: Increased HD pump max current persistence from 2 to 5 seconds. Added 1 minute delay following start/resume of dialysis where venous pressure limits are set to max selectable to allow pumps to stabilize.

  1. … 5 more files in changeset.
Auto stash before merge of "DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off" and "staging"

Merge branch 'staging' into DEN-14457-reservoir-drains-before-treatment-with-pre-treatment-build-flags-off