dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-15077-fmp-flow-vs-load-cell-comparison-to-use-load-cells-as-actual-value' into staging

Merge branch 'staging' into DEN-15166-add-drain-pump-maxon-board-rpm

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

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

DEN-15164 changed the inlet water conditions persistenet alarm to 30 seconds

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

    • -19
    • +17
    /firmware/App/Controllers/DrainPump.c
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

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

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

    • -2
    • +2
    /firmware/App/Controllers/FlowSensors.h
Merged DEN-14999

DEN-14999 added PiSquare VectorCAST

DEN-14999 merged staging

    • -11
    • +11
    /firmware/App/Controllers/ROPump.c
Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://devapps.diality.us:7999/dg/dgfirmware into DEN-14999-alarm-table-updates-part-2

Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://dvm-linux02:7999/dg/dgfirmware into DEN-14999-alarm-table-updates-part-2

DEN-14999-2: Removed unused #define.

    • -1
    • +1
    /firmware/App/Controllers/FlowSensors.h
Merge branch 'staging' into DEN-14999-alarm-table-updates-part-2

Merge branch 'DEN-14999-alarm-table-updates-part-2' of ssh://devapps.diality.us:7999/dg/dgfirmware into DEN-14999-alarm-table-updates-part-2

DEN-14999 updated the code based on the alarms table

    • -11
    • +11
    /firmware/App/Controllers/ROPump.c
DEN-14999-2: Addressed code review comments.

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

Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

DEN-14999-2: Exempt fpga comm errors for 1st second after power up.

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

Merge branch 'DEN-14999-alarm-table-updates-part-2' into develop

DEN-14999, DEN-15088 added persistent alarm to the DG fluid leak