ModeFlush.c

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-12974, DEN-13425 Correct bool to BOOL

  1. … 1 more file in changeset.
DEN-12974, DEN-13425 Do not reset state timer in FlushR2DrainR1

DEN-12974, DEN-13078 correct setting of VPo when entering handleFlushModeDrainR2State.

DEN-12974, DEN-13078 Set VPo to VALVE_STATE_NOFILL_C_TO_NO in DrainR2State.

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/Controllers/ConductivitySensors.c

# firmware/App/Controllers/ROPump.c

  1. … 2 more files in changeset.
DEN-12974, DEN-13078 correct setting of VPo when entering Drain_R1 and Drain_R2

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

  1. … 5 more files in changeset.
Revert "DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs."

This reverts commit 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f.

  1. … 4 more files in changeset.
Merged DEN-12931

  1. … 11 more files in changeset.
Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

  1. … 1 more file in changeset.
DEN-12931 DVT updates and SRS changes

  1. … 9 more files in changeset.
DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs. DEN-12882 Unique minimum ro flow rate for uv reactors.

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

DEN-12549 Correct state of valves before entering DRAIN_R1 from FLUSH_R2AND_DRAIN_R1.

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/DGCommon.h

  1. … 12 more files in changeset.
DEN-12974 - Miscellaneous Flush Issues DEN-12959 - Flush dialysate wait time changed to 60 seconds DEN-12960 - Flush concentrate straws tim changed to 3 minutes

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

  1. … 53 more files in changeset.
Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

  1. … 5 more files in changeset.
DEN-12224 working in progress. Activated and debugged heaters flow check

  1. … 12 more files in changeset.
Merged DEN-12224

  1. … 8 more files in changeset.
DEN-12224 updated the flush drain RPM

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

  1. … 1 more file in changeset.
DEN-12224 updated the disinfect modes to check for the switches

  1. … 4 more files in changeset.
Merged DEN-12224 and resolved the conflicts

  1. … 9 more files in changeset.
DEN-12224 added F to the defines that are floating numbers

  1. … 24 more files in changeset.
Merged DEN-12224 and resolved the conflicts

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

  1. … 59 more files in changeset.
Merge branch 'DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up' into develop

  1. … 1 more file in changeset.
DEN-11750 updated the comments

Merge branch 'DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up' into develop

  1. … 1 more file in changeset.