Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-12974-miscellaneous-flush-issues_bb

# Conflicts:

# firmware/App/Controllers/TemperatureSensors.c

  1. … 8 more files in changeset.
DEN-12974 Changes per code review. MIN_RO_FLOWRATE_LPM now 0.0F

Chnaged the RO flow minimum limit

Changed the minimum RO flow from 0.3 to 0.2 L/min

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

DEN-13460 updated the definition of the RO pump

Merge branch 'DEN-13460-dg_hd_dev-hd_dg_dvt-update-part-2' into develop

  1. … 9 more files in changeset.
DEN-13460 updated the code

  1. … 14 more files in changeset.
Merge branch 'DEN-13427-sw_dev-sprint-75_mg' into develop

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

  1. … 36 more files in changeset.
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.
DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs. DEN-12882 Unique minimum ro flow rate for uv reactors.

  1. … 4 more files in changeset.
DEN-12882 Change MIN_RO_FLOWRATE_LPM to 0.3/LPM. RO Pump is unable to achieve 0.2/LPM rate. May change later as requirements are firmed up.

DEN-12931 updated the trimmer heater control

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

  1. … 53 more files in changeset.
DEN-12224 updated build switches and NV Data

  1. … 10 more files in changeset.
DEN-12224 merged staging

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

  1. … 16 more files in changeset.
DEN-11928 merged staging

  1. … 15 more files in changeset.
DEN-11928 updated the fill mode and the RO pump

  1. … 3 more files in changeset.
DEN-11928 updated the alarms and fill mode

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

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

  1. … 59 more files in changeset.
DEN-11750 updated the code

  1. … 5 more files in changeset.
DEN-11750 added fans duty cycles override

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

  1. … 94 more files in changeset.
DEN-11114, DEN-11374 updated the temperatures data publish by adding the heat disinfect temperature sensor

  1. … 13 more files in changeset.
DEN-11114 continued working on the the heaters target calculations

  1. … 13 more files in changeset.