Clone
 

michael garthwaite <mgarthwaite@diality.com> in dgfirmware

Merge branch 'DEN-16475-please-add-average-tdi-tro-delta' into staging

DEN-16475: code review comments

Merge branch 'DEN-16475-please-add-average-tdi-tro-delta' into develop

DEN-16475: added temperature event for drift during chem disinfect

Merge branch 'DIAL-285-event-log-15-missing-fill-prime-concentrate-state' into staging

Merge branch 'DIAL-285-event-log-15-missing-fill-prime-concentrate-state' into develop

Merge branch 'staging' into DIAL-285-event-log-15-missing-fill-prime-concentrate-state

DIAL-285: fix to ensure we see transitions of submode.

Merge branch 'staging' into DIAL-285-event-log-15-missing-fill-prime-concentrate-state

Merge branch 'DIAL-283-no-moving-average-commands-conductivity' into staging

Merge branch 'staging' into DIAL-283-no-moving-average-commands-conductivity

DIAL-283: compiler fixes.

DIAL-283: message handling for moving average override.

    • -10
    • +7
    /firmware/App/Modes/ModeChemicalDisinfect.c
DIAL-283: chem disinfect moving average override

    • -6
    • +62
    /firmware/App/Modes/ModeChemicalDisinfect.c
Merge branch 'DEN-14706-can-messge-not-acked-fix' into staging

DEN-14706: fixed compiler errors

Merge branch 'staging' into DEN-14706-can-messge-not-acked-fix

DEN-14706: code review comments.

DEN-14706: wip of code review comments.

Merge branch 'staging' into DEN-14706-can-messge-not-acked-fix

DEN-14706: Fixed DG pending ack override.

    • -5
    • +18
    /firmware/App/Services/SystemComm.c
Merge branch 'DIAL-281-requesting-heat-disinfect-timer-overrides' into staging

DIAL-281: Code review comments.

    • -3
    • +3
    /firmware/App/Modes/ModeHeatDisinfect.c
Merge branch 'DIAL-281-requesting-heat-disinfect-timer-overrides' into develop

DIAL-278: implementation of heat disinfection state timer overrides.

    • -4
    • +105
    /firmware/App/Modes/ModeHeatDisinfect.c
    • -0
    • +4
    /firmware/App/Modes/ModeHeatDisinfect.h
Merge branch 'DIAL-276-dg-event-event-id-15-prints-duplicate-events-with-different-state-time' into staging

Merge branch 'staging' into DIAL-276-dg-event-event-id-15-prints-duplicate-events-with-different-state-time

DIAL-276: fixed op status event duplicating on op mode change only.

Merge branch 'DIAL-280-reservoir-broadcast-override' into staging

Merge branch 'staging' into DIAL-280-reservoir-broadcast-override

    • -1
    • +50
    /firmware/App/Services/SystemComm.c