dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-15178-heat-disinfect-drain-timeout-transition-to-cancel-water-path-instead-of-cancel

Merge branch 'staging' into DEN-14316-chemical-disinfect

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

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

Merge branch 'DEN-15034-dg_valves_states_data-payload-maps-reserved-bits-to-0b-instead-of-00' into staging

Merge branch 'staging' into DEN-15034-dg_valves_states_data-payload-maps-reserved-bits-to-0b-instead-of-00

DEN-15182 removed the rejection ratio alarm from the standby mode

DEN-15166 updated the code

    • -19
    • +9
    /firmware/App/Controllers/DrainPump.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-15182 added a pause state in standby mode for the inlet water conditions. Addressed the code review comments

    • -45
    • +57
    /firmware/App/Controllers/DrainPump.c
    • -1
    • +1
    /firmware/App/Controllers/Thermistors.c
    • -13
    • +38
    /firmware/App/Modes/ModeStandby.c
DEN-13949 updated heat disinfect valves actuator per SRSDG 504

    • -1
    • +1
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

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

DEN-15182 updated the code to handle the inlet water conditions in standby mode

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

Merged DEN-15166

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

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

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

    • -24
    • +76
    /firmware/App/Controllers/DrainPump.c
    • -1
    • +3
    /firmware/App/Controllers/Thermistors.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 develop

Merge DEN-15105 to staging.

DEN-15178 DrainR1, DrainR2 on timeout transition to Cancel Water Path

    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.c
Bamboo Commit: Updated DGCommon.h with build versions from Bamboo

Fixed merge conflicts from DEN-15105.

DEN-15105: Prevent DG faults from being cleared by HD.