Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged DEN-12224

    • -37
    • +52
    ./Controllers/ConductivitySensors.c
DEN-12224 removed the build switches

    • -37
    • +52
    ./Controllers/ConductivitySensors.c
    • -26
    • +40
    ./Controllers/TemperatureSensors.c
  1. … 3 more files in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged DEN-12224

DEN-12224, DEN-12543 addressed the rinse concentrate lines bug

DEN-12224 updated the code for the SRSs

DEN-12224 updated the code with the alarms for the SRSs

    • -12
    • +3
    ./Controllers/ConductivitySensors.c
DEN-12224 tested the fill mode

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

Merged DEN-12224

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop

DEN-12224 updated the fill mode and added a build switch

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

Disabled the UV reactors

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

Merged DEN-12224

    • -23
    • +30
    ./Controllers/ConductivitySensors.c
  1. … 1 more file in changeset.
Pulled remote

Merged DEN-11928

    • -5
    • +23
    ./Controllers/ConductivitySensors.c
    • -10
    • +2
    ./Controllers/ConductivitySensors.h
DEN-12224 updated the fill mode and the drain mode and added build switches

DEN-12224 updated the concentrate pumps, temperature sensors, mode drain and fill

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

Disabled build switches

DEN-12224 merged staging

    • -19
    • +45
    ./Controllers/ConductivitySensors.c
    • -12
    • +4
    ./Controllers/ConductivitySensors.h
DEN-12224 updated the flush drain RPM

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

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

DEN-11928 merged staging

    • -53
    • +29
    ./Controllers/ConductivitySensors.c
    • -4
    • +26
    ./Controllers/ConductivitySensors.h
    • -18
    • +27
    ./Controllers/TemperatureSensors.c
    • -23
    • +231
    ./Services/SystemCommMessages.c
DEN-12224 addressed the code review comments

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

Merge branch 'DEN-12224-dg_hd_dev-switches-monitor' into develop