dgfirmware

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merged staging

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

    • -4
    • +4
    /firmware/App/Modes/ModeHeatDisinfect.c
Corrected.

Corrected.

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

Merge branch 'DEN-15178-heat-disinfect-drain-timeout-transition-to-cancel-water-path-instead-of-cancel' into develop

# Conflicts:

# firmware/App/DGCommon.h

    • -2
    • +2
    /firmware/App/Modes/ModeHeatDisinfect.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
    /firmware/App/Modes/ModeHeatDisinfect.c
Merge branch 'DEN-15178-heat-disinfect-drain-timeout-transition-to-cancel-water-path-instead-of-cancel' into staging

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

Align "="

Align "="

RESOLVED IN CODE WALKTHROUGH.

RESOLVED IN CODE WALKTHROUGH.

DEN-15166 updated the code

    • -19
    • +9
    /firmware/App/Controllers/DrainPump.c
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

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