Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14344: compiler fixes

DEN-14344: fixed merge conflict missing lines.

Merge branch 'staging' into DEN-14344-sw-s85-mg-air-pump

  1. … 6 more files in changeset.
Merge branch 'DEN-14344-sw-s85-mg-air-pump' into develop

  1. … 7 more files in changeset.
DEN-14344: created air pump monitor function for alarm id 316. Created a timer for venous pressure to handle adjusted treatment values for a time while the air pump is operating. Allow HD to start filling after consumable testing in pretreatment instead of waiting after dry self tests. formatted ifndef release code blocks to look neater.

  1. … 3 more files in changeset.
DEN-14344: implmented venous pressure limits to increase when air pump is on. Reworked Air trap logic to turn off after air in the upper sensor for 2 seconds. Changed air pump timeout to be 5s.

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

  1. … 7 more files in changeset.
DEN-14458 updated the air trap's broadcast interval

DEN-14344: fixed sw config checks. Updated dry self test thresholds to handle air pump performance.

  1. … 1 more file in changeset.
DEN-14344: Air pump integration into air trap and dry self tests.

  1. … 2 more files in changeset.
DEN-14344: Air Pump integration into air trap control

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

  1. … 4 more files in changeset.
DEN-13903: Addressing code review comments

DEN-13903: Reworked upper level persistence. Added todo for dialyizer timeout. code review changes.

  1. … 1 more file in changeset.
DEN-13903: Changed no air detection from 20 seconds to 40 seconds. Changed upper level air trap alarm to use the correct alarm.

  1. … 1 more file in changeset.
DEN-13903: fixed alarm persistence to use correct define

DEN-13903: Alarm is triggered when the air trap gets to the upper level in treatment for 2s persistence.

DEN-13903: Changed Air Trap control to use the lower level sensor for opening and closing instead of the upper.

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

  1. … 59 more files in changeset.
DEN-12224 addressed the code review comments

  1. … 5 more files in changeset.
DEN-12224 merged staging and added the switches monitor softwar configuration

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

  1. … 43 more files in changeset.
DEN_12224 merged CodeClinic's changes and resolved the merge conflicts

DEN-12215 Merged Staging branch. Updated DG_FILL_ defs, WET_SELF_TESTS_ defs.

  1. … 51 more files in changeset.
DEN-12224 added F and the end of the defines the are floating numbers

  1. … 24 more files in changeset.
DEN-12224 added _RELEASE_ to the software configurtions

  1. … 8 more files in changeset.
Latest update hd project

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

  1. … 46 more files in changeset.
DEN-11750 resolved a merge conflict

DEN-11750 merged cc-vectorcast2 and resolved the conflcits