dgfirmware

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' into DEN-14237-remove-heat-disinfect-rinse-states

# Conflicts:

# firmware/App/Modes/ModeHeatDisinfect.c

    • -4
    • +12
    /firmware/App/Modes/ModeHeatDisinfect.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.

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-14175-dg_hd_dev-hd_dg_dvt-update-part-5' into develop

    • -11
    • +35
    /firmware/App/Controllers/Heaters.c
DEN-14175 added trimmer heater use last duty cycle to the broadcast data

RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

DEN-14237 Correct multipe changes to return status based upon whether or not there is a pending alarm.

    • -65
    • +82
    /firmware/App/Modes/ModeHeatDisinfect.c
RESOLVED in CODE WALKTHROUGH.

RESOLVED in CODE WALKTHROUGH.

Removed

Removed

Removed

Removed

This else has been removed

This else has been removed

Removed

Removed

Removed

Removed

Removed

Removed

Removed

Removed

Removed

Removed

Removed. Intended to remove all along.

Removed. Intended to remove all along.

DEN-14237 Removed conditional code and references to isThisLastDrain.

    • -302
    • +24
    /firmware/App/Modes/ModeHeatDisinfect.c
Remove references to this flag.

Remove references to this flag.

This function will still override if there any alarms. Are we going to change the order of status report?

This function will still override if there any alarms. Are we going to change the order of status report?

Remove the TRUE case. Just need the else now.

Remove the TRUE case. Just need the else now.

Remove TRUE case. Just need the else now.

Remove TRUE case. Just need the else now.

Remove this flag.

Remove this flag.