Controllers

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14310 added code to not trigger the valves alarms if the HD power loss alarms are active

Merge branch 'staging' into DEN-14589-DIAL-211

DEN-14310 added code to prevent the trigger of the valves alarms in case any of the voltages alarms are active

Fixed merge conflicts.

  1. … 3 more files in changeset.
DEN-14310 merged staging

DEN-14310 merged staging

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

  1. … 5 more files in changeset.
Fixed merge conflicts with local merge from staging.

  1. … 4 more files in changeset.
Merge branch 'staging' into DEN-14589-DIAL-211

  1. … 3 more files in changeset.
Fixed merge conflicts.

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

  1. … 5 more files in changeset.
DEN-14749: Reset preload flag in standby mode instead of after retract/seek/prime operations. Increase alarm threshold for FMD vs. LC check in wet s.t. from 5% to 10%. Refactor alarm audio and 1 minute min tx time config flags. Removed test code in reservoir code.

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

DEN-14604 added code to not trigger the AC power loss if the safefy shutdown is enabled

DEN-14589: fixed syringe pump events.

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

  1. … 33 more files in changeset.
Fixed merge conflicts. Re-applied recently rolled back pre-tx state changes.

  1. … 10 more files in changeset.
DEN-14549: Fixed merge from staging merge conflicts.

  1. … 14 more files in changeset.
DEN-14556: updated alarm pressure occlusion alarm to 3s. HD now sends events when occlusion baseline is set. Alarm id 142 and 277 now send baseline occlusion value and trigger value.

DEN-14589: implemented event for syringe pump state changes.

DEN-14549: Added alarm threshold to occlusion alarm data for logging. Only check for sufficient Heparin when in pre-tx mode. Addressed code review comments.

  1. … 1 more file in changeset.
DEN-14561-_release_-preprocessor-flag-specifies-code-that-conflicts-with-sw_config_-debug into develop

Merge branch

  1. … 4 more files in changeset.
Merge branch 'DEN-14589-DEN-14011_fix' into develop

  1. … 3 more files in changeset.
DEN-14549: Update to arterial/venous pressure limit alarm logic. Update measured UF volume in all dialysis states. Remove dialysis and UF start states.

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

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

  1. … 1 more file in changeset.
DEN-14561

Code review updates

  1. … 1 more file in changeset.
DEN-14604 updated the valves

DEN-14549: Fix art/ven pressure alarm check logic - apply user set limits in dialysis state (if not saline bolus) or treatment stop state (if BP running). Require door/latch to be closed in patient connection state. Remove escalation for prime complete alarms. Handle prime complete alarms in pre-tx recirculate state. Update prime complete alarm properties.

  1. … 5 more files in changeset.
DEN-14557 addressed a code review comment