firmware

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

DEN-12121: Fixed compilation error

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

Merge branch 'DEN-12121-sw_dev-sprint-65-michael-garthwaite' into develop

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65-michael-garthwaite

    • -22
    • +198
    ./App/Services/SystemCommMessages.c
    • -1
    • +16
    ./App/Services/SystemCommMessages.h
DEN-12121: Updated per peer review.

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

Merged DEN-12224 and resolved the conflicts

    • -4
    • +4
    ./App/Controllers/ConductivitySensors.c
    • -14
    • +8
    ./App/Services/SystemCommMessages.c
DEN-12224, DEN-12232 added a command to be able to set the fans RPM alarm start time offset

    • -16
    • +10
    ./App/Services/SystemCommMessages.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Enabled the concentrate pumps

DEN-12224 added F to the defines that are floating numbers

    • -4
    • +4
    ./App/Controllers/ConductivitySensors.c
    • -8
    • +8
    ./App/Controllers/TemperatureSensors.c
  1. … 10 more files in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merged DEN-12224 and resolved the conflicts

    • -3
    • +4
    ./App/Controllers/ConductivitySensors.c
    • -8
    • +11
    ./App/Services/SystemCommMessages.c
DEN-12224 added a build switch to disbale the conc pumps from running

DEN-11928 Updated code per peer reviews comments

    • -4
    • +3
    ./App/Controllers/ConductivitySensors.c
    • -4
    • +4
    ./App/Controllers/TemperatureSensors.c
DEN-11928 Updated temperature compensate conductivity equation per Systems specification

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

DEN-11928 Updated compensated conductivity equation based on temperature per Systems specification

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

DEN-11928 Reverted conductivity changes

    • -26
    • +14
    ./App/Controllers/ConductivitySensors.c
    • -2
    • +11
    ./App/Controllers/ConductivitySensors.h
    • -42
    • +16
    ./App/Controllers/TemperatureSensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

DEN-11928 Updated conductivity per peer reviews comments

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
    • -4
    • +4
    ./App/Controllers/TemperatureSensors.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

    • -2
    • +2
    ./App/Controllers/ConductivitySensors.c
    • -3
    • +3
    ./App/Controllers/ConductivitySensors.h
  1. … 45 more files in changeset.
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Merge branch 'DEN-12121-sw_dev-sprint-65-michael-garthwaite' into develop

DEN-12121: Added Compatibility Revision for DG.

DEN-11750 addressed the code review comment

DEN-11750 addressed the code review comments