Raghu Kallala

Add a 1 second persistence on this alarm

Add a 1 second persistence on this alarm

Handle transition here after changing the flush logic transitionToGenPermeateDefeaturedMode(); requestGenWaterDefStart();

Handle transition here after changing the flush logic

transitionToGenPermeateDefeaturedMode();
requestGenWaterDefStart();

Need to remove this handler

Need to remove this handler

Add blank line before return statement

Add blank line before return statement

Remove handlePreGenPDefInletWaterState

Remove handlePreGenPDefInletWaterState

Update FP_Pre_GenP_Def_Mode_States enum in FPDefs.h

Update FP_Pre_GenP_Def_Mode_States enum in FPDefs.h

Call this in both Pre Gen: Verify Water and Gen Permeate

Call this in both Pre Gen: Verify Water and Gen Permeate

Greater than or equal to for low limit pressureP13 >= MAX_INLET_RO_PUMP_PRESSURE_WARNING_LOW_PSIG Also give space before and after parentheses.

Greater than or equal to for low limit
pressureP13 >= MAX_INLET_RO_PUMP_PRESSURE_WARNING_LOW_PSIG

Also give space before and after parentheses.

Put quadratic and linear terms in parentheses.

Put quadratic and linear terms in parentheses.

Fixed indentation

    • -1
    • +0
    /firmware/App/Modes/FPModes/FlushConcentrate.c
Resolved merge conflicts

    • -19
    • +65
    /firmware/App/Controllers/PermeateTank.c
    • -26
    • +57
    /firmware/App/Controllers/ROPump.c
    • -2
    • +3
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -4
    • +4
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -23
    • +35
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -19
    • +17
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -10
    • +37
    /firmware/App/Modes/FPModes/FlushPermeate.c
    • -53
    • +176
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
    • -2
    • +202
    /firmware/App/Monitors/Conductivity.c
  1. … 5 more files in changeset.
LDT-2936 merge into staging

LDT-2936 merge into staging

LDT-2936 fixed macro naming

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
LDT-2936 fixed macro naming

    • -3
    • +3
    /firmware/App/Controllers/PermeateTank.c
Resolved

Resolved

LDT-2936 fixed the macro comments

Fixed the ordering

Fixed the ordering

LDT-2936 fixed alarm order and removed waitForTankFill from concentrate flush states

Merge branch 'LDT-2936-iofp---update-m12-and-boost-pum' of bitbucket.org:diality-cloud/dd-firmware into LDT-2936-iofp---update-m12-and-boost-pum

LDT-2936 fixed permeate overfill issue and added tank controls to verify state

    • -2
    • +2
    /firmware/App/Controllers/PermeateTank.c
    • -50
    • +23
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -0
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.c
LDT-2936 Updated tank full/fill timeout alarms logic

    • -17
    • +63
    /firmware/App/Controllers/PermeateTank.c
LDT-2936 address review comments to add spacing in if statements

    • -2
    • +0
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
Handled in FPOperationModes and respective states of PreGen have it.

Handled in FPOperationModes and respective states of PreGen have it.

Checked with Eliza if they need it for alarm persistence time. Not needed at this time, we can add them in future

Checked with Eliza if they need it for alarm persistence time. Not needed at this time, we can add them in future

Fixed. Thanks

Fixed. Thanks

Fixed.

Fixed.

Fixed.

Fixed.

Fixed. thanks

Fixed. thanks