Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-14086: fixed logging issue with LC drift alarm.

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

Fixed merge conflicts.

DEN-13946 - Correct monitor functions where multiple sensors are "or'd" into a single alarm.

DEN-14086: Increase loadcell drift allowance from +/- 60 to 80 grams - and for heat disinfect, +/- 200 grams.

DEN-14497 updated the drain pump control for the flow and updating chemical disinfect is in progress

    • -161
    • +113
    ./Modes/ModeChemicalDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

Merge branch 'staging' into DEN-14433-sw-s86-mg-publish-fixes

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

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

  1. … 84 more files in changeset.
DEN-14101 addressed the code review comment

DEN-14101 merged staging

    • -75
    • +531
    ./Services/SystemCommMessages.c
DEN-14101 addressed the code review comments

DEN-14497, DIAL-222 updated the drain pump's control to control the pump to flow in heat disinfect. Added a command to be able to override the heaters duty cycle and reset it. Made the set RO pump to an open loop with a duty cycle a punlic function

DEN-14497 updated the code to fix VectorCAST compilation issues

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

Merged DEN-14307

    • -28
    • +300
    ./Controllers/ConcentratePumps.c
    • -23
    • +40
    ./Controllers/ConductivitySensors.c
    • -65
    • +276
    ./Services/SystemCommMessages.c
DEN-14316-chemical-disinfect. Code review changes

    • -10
    • +10
    ./Modes/ModeChemicalDisinfectFlush.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

  1. … 12 more files in changeset.
Merged staging

    • -1302
    • +856
    ./Modes/ModeChemicalDisinfect.c
    • -0
    • +1073
    ./Modes/ModeChemicalDisinfectFlush.c
    • -36
    • +288
    ./Services/SystemCommMessages.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-14316 merged staging

    • -46
    • +262
    ./Services/SystemCommMessages.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-14307 addressed the code review comment

DEN-14316: Addressed code review comments.

DEN-14307 resolved the merge conflicts