firmware

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

    • -37
    • +5
    ./App/Services/SystemCommMessages.c
DEN-15166, DEN-15182 updated the voltages code and fixed the filter flush code to be able to resume after an inlet condition alarm

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

DEN-15166 uncommented the voltages alarm

DEN-15166 added the Maxon drain pump RPM and the new non-isolated voltage

    • -37
    • +5
    ./App/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-15178 DrainR1, DrainR2 on timeout transition to Cancel Water Path

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

Fixed merge conflicts from DEN-15105.

    • -5
    • +4
    ./App/Controllers/ConductivitySensors.c
DEN-15105: Prevent DG faults from being cleared by HD.

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

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
DEN-15164 changed the inlet water conditions persistenet alarm to 30 seconds

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

Merge branch 'DEN-15164-inlet-water-temp-alarm-closes-vpi' into develop

DEN-15164 removed the code to close VPi in filter flush mode when the inlet water condition is out of range

DEN-15166 work in progress added the Maxon board RPM

DEN-15077-fmp-flow-vs-load-cell-comparison-to-use-load-cells-as-actual-value

converted error relative to integrated flow, to error relative to load cell, as the load cell mass is a more accurate measurement.

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

Merged staging and resolved the conflicts

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

    • -1
    • +1
    ./App/Controllers/ConductivitySensors.c
    • -1
    • +1
    ./App/Controllers/TemperatureSensors.c
DEN-14999 merged staging

    • -9
    • +9
    ./App/Controllers/ConductivitySensors.c
    • -6
    • +6
    ./App/Controllers/TemperatureSensors.c
DEN-14999-2: Removed unused #define.

DEN-14999 updated the code based on the alarms table

    • -9
    • +9
    ./App/Controllers/ConductivitySensors.c
    • -6
    • +6
    ./App/Controllers/TemperatureSensors.c
DEN-14999-2: Addressed code review comments.

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