Clone
 

bill bracken <bbracken@diality.com> in dgfirmware

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

Merge remote-tracking branch 'origin/develop' into develop

Correct Flash programming configuration to NOT erase the configuration information.

DEN-13047 Implement unique haveDrainParamsBeenInit for both reservoirs. DEN-12882 Unique minimum ro flow rate for uv reactors.

    • -2
    • +2
    /firmware/App/Controllers/UVReactors.c
    • -28
    • +29
    /firmware/App/Modes/ModeChemicalDisinfect.c
    • -33
    • +34
    /firmware/App/Modes/ModeHeatDisinfect.c
Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

DEN-12549 Correct state of valves before entering DRAIN_R1 from FLUSH_R2AND_DRAIN_R1.

DEN-12882 Change MIN_RO_FLOWRATE_LPM to 0.3/LPM. RO Pump is unable to achieve 0.2/LPM rate. May change later as requirements are firmed up.

Merge remote-tracking branch 'origin/DEN-12974-miscellaneous-flush-issues_bb' into develop

# Conflicts:

# firmware/App/DGCommon.h

    • -63
    • +18
    /firmware/App/Controllers/Heaters.c
    • -238
    • +247
    /firmware/App/Services/SystemCommMessages.c
DEN-12549 changed UV reactor no flow timeout to 2 seconds.

    • -1
    • +1
    /firmware/App/Controllers/UVReactors.c
DEN-12974 - Miscellaneous Flush Issues DEN-12959 - Flush dialysate wait time changed to 60 seconds DEN-12960 - Flush concentrate straws tim changed to 3 minutes