Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged staging and resolved teh conflicts

Merged staging

    • -11
    • +25
    ./Controllers/ConductivitySensors.c
DEN-16682 added changes from staging

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

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

DEN-16682 updated the comments

  1. … 1 more file in changeset.
DEN-16682 changed the fill mode to get the target conductivity values from the bicarb values of the fill conductivities in the non-volaitle memory. Updated the VectorCAST test cases

DEN-16682 removed CD1 check in the fill mode

DENBUG-213 added a comment

DEN-16682 upaded the drivers to get the calibration values once the signal is emitted. DENBUG-199 updated the drain pump driver

DEN-16682 added the alarm for the fill acid/bicarb target conductivities in the DG calibration record

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

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

DEN-16682 changed the acid pumps speed in mode fill

DEN-16674 updated the code from staging

    • -10
    • +21
    ./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

DEN-16674 addressed the code reivew comment

DEN-16674 addressed the code review comments

DEN-16674 updated the code for mode fill calibration check command

DEN-16683 updated the conductivity sensor temperature compensation calibration enum names

DEN-16683 added code to get and apply the conductivity sensors' temperature compensation calibration record

    • -10
    • +21
    ./Controllers/ConductivitySensors.c
DEN-16682 changed the speed of the acid concentrate pump. CD2 will be used for acid check in the Mode Fill

DEN-16681 addressed the code review comment

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

DEN-16681 changed the tolerances of acid and bicarb check in Mdoe Fill

DENBUG-213 added code to only check the drain pump's direction alarm if the feedback RPM is greater than 0

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

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