ModeHeatDisinfect.c

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14175 addressed the code review comments

  1. … 1 more file in changeset.
Merge branch 'staging' into DEN-14237-remove-heat-disinfect-rinse-states

# Conflicts:

# firmware/App/Modes/ModeHeatDisinfect.c

DEN-14237 Correct multipe changes to return status based upon whether or not there is a pending alarm.

DEN-14237 Removed conditional code and references to isThisLastDrain.

DEN-14237 changes to getHeatDisinfectStatus.

DEN-14237 Correct getHeatDisinfectStatus logic.

DEN-14237 DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2 now transitions to DG_HEAT_DISINFECT_STATE_COMPLETE.

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

DEN-14232 updated the VPo status to prevent filling the reservoirs at the end of heat disinfect

DEN-14232 Turn off trimmer heater before switching to FILL_R2_WITH_HOT_WATER and then back on when switching to HEAT_DISINFECT_R2_TO_R1.

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

  1. … 5 more files in changeset.
Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

  1. … 1 more file in changeset.
Merge branch 'DEN-14101-sw-s82-mg-DIAL-179-DIAL-184' into develop

  1. … 5 more files in changeset.
DEN-13786 Correct VPo

DEN-13786 Correct heater PWM and proper position of VPo for Drain_R2

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

  1. … 11 more files in changeset.
DEN-13786 Code review changes

  1. … 1 more file in changeset.
DEN-13786 Code review changes

  1. … 4 more files in changeset.
DEN-14166 updated the heat disinfect temperature gradient out of range

Merge branch 'staging' into DEN-13786-hd_dg_dev-s78_bb

# Conflicts:

# firmware/App/Controllers/DialysateFlow.c

# firmware/App/Controllers/Heaters.c

# firmware/App/Controllers/ROPump.c

# firmware/App/Controllers/UVReactors.c

# firmware/App/Modes/ModeHeatDisinfect.c

  1. … 2 more files in changeset.
DEN-13768 Remove EMC build from ROPump. Don not set cancellationMode when exiting DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER.

  1. … 1 more file in changeset.
Merged DEN-14166

  1. … 3 more files in changeset.
DEN-14166 fixed the drain pump's direction alarm check and updated the heat disinfect caps check

  1. … 1 more file in changeset.
DEN-13768 Update branch

DEN-13768 Update branch

DEN-13768 Update branch.

Merged DEN-14166

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

  1. … 39 more files in changeset.
DEN-13768 Apply stash changes

  1. … 1 more file in changeset.
DEN-13768 Apply develop changes