Modes

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged staging

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

  1. … 3 more files in changeset.
Merge branch 'DEN-15702-alarm-150-inlet-water-conductivity-high-does-not-disappear-on-standby-screen-when' into develop

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

  1. … 3 more files in changeset.
Changed the heat disinfect transfer rate from 800 mL/min to 500 mL/min

Merge branch 'staging' into DEN-15660-test_configuration_treatment_recovery

  1. … 2 more files in changeset.
Merge branch 'DEN-15660-test_configuration_treatment_recovery' into develop

DEN-15660 addressed the code review comments

  1. … 1 more file in changeset.
DEN-15660 addressed the code review comments

  1. … 1 more file in changeset.
DEN-15702 Check VPI Open for Inlet Conductivity, Pressure, temperature. If VPI Closed, clear alarms.

  1. … 3 more files in changeset.
Merge branch 'DEN-15660-test_configuration_treatment_recovery' into develop

DEN-15809 added code to clear the dialysate generation alarm 147

DEN-15809 updated the code to trigger another alarm if the empty bottle alarms have been triggered.:

Merge branch 'DEN-15660-test_configuration_treatment_recovery' into develop

DEN-15660, DEN-15781, added code to not check the dialysate temperature sensorswhen the dialysate flow is zero. DEN-15808, Added code to process the empty jug alarm

  1. … 1 more file in changeset.
Merge branch 'DEN-15660-test_configuration_treatment_recovery' into develop

  1. … 1 more file in changeset.
DEN-15660, DEN-15767, DEN-15781 cleaned up the SystemCommMessages.c for messages list script. Added moving average for TDi and TRo sensors for dialysate temperature drift check

  1. … 2 more files in changeset.
Merge branch 'DEN-15802-no-dg-flow-rate-out-of-range-alarms-191-192-for-heat-disinfect-active-cool' into develop

# Conflicts:

# firmware/App/DGCommon.h

Merge branch 'DEN-15660-test_configuration_treatment_recovery' into develop

DEN-15715 added a command to close VRD1 prior to transitioning to chemical disinfect cancel water path

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

Merge branch 'DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it' into develop

Timeout increased from 5 to 10 seconds

DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it

Corrected comment alignment

DEN-15691-heat-disinfect-reservoir-leak-alarm-triggers-after-5s-when-srsdg-512-and-521-say-it

Undated 5second timeout to 10 seconds

DEN-15697 changed the code to correctly set the drain timeout in active cool mode

DEN-15619 removed the variable to not trigger a temperature not reached to target alarm in chemical disinfect

DEN-15660, DEN-15523, DEN-15528 changed the acid deprime state in chemical disinfect. Updated the chemical disinfect prime state

DEN-15660, DEN-15727 removed the chemical disinfect flush complete date set from its complete state since it should only be updated if the sample passed

DEN-15660, DEN-15528, DEN-15523 updated the chemical disinfect's moving average. Added a new state to deprime the acid line in chemical disinfect and then park the acid pumpf for the rest of the chemical disinfect

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

  1. … 1 more file in changeset.