Modes

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-12931 updated the heaters driver and DVT

  1. … 13 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. … 3 more files in changeset.
Revert "DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs."

This reverts commit 81872acd6f2ce222c6b9a9b93f65b7cd3665f28f.

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

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

  1. … 1 more file in changeset.
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

Done.

DEN-12931 DVT updates and SRS changes

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

  1. … 2 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. … 10 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

DEN-12931 updated the trimmer heater control

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

  1. … 43 more files in changeset.
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.