Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14999-alarm-table-updates

DEN-14999 added a blank line

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN14646 - Valves variable renamed.

Merge branch 'staging' into DEN-14646-fpga-alarm-properties-and-timing-3

    • -7
    • +15
    ./Controllers/ConductivitySensors.c
DEN-15014 addressed the code review comment

DEN-15014 addressed the code review comment

DEN-15014 updated the fill mode by removing the enable RO only mode variable from the init function to not be set to FALSE every time

DEN-15014 addressed the code review comments

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged staging

DEN-15027 changed the heat disinfect transfer flow rate

DEN-15014 added code to support RO only mode

    • -3
    • +25
    ./Controllers/ConductivitySensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-14646 Updates per code review.

DEN-14817: fixed persistence holder to consider overriden park bit values

DEN-14817: added persistence holding for beta hw

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

  1. … 3 more files in changeset.
Merge branch 'staging' into DEN-14763-dg_hd_dev-hd_dg_dvt-update-part-10

DEN-14763 updated the code per the requirements

    • -6
    • +34
    ./Modes/ModeHeatDisinfectActiveCool.c
DEN-14817: updated concentrate pump parking to not consider pump speed alarm until we have received a park bit

Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-14763 changed the duration of the mix drain timeout to 4 minutes per the requirements

DEN-14763 addressed the code review comments