Raghu Kallala

Something like this ( QUADRATIC_COEFFICIENT * ( pressureP13 * pressureP13 ) ) - ( LINEAR_COEFFICIENT * ( pressureP13 ) ) + CONSTANT_TERM;

Something like this
( QUADRATIC_COEFFICIENT * ( pressureP13 * pressureP13 ) ) - ( LINEAR_COEFFICIENT * ( pressureP13 ) ) + CONSTANT_TERM;

resolved merge conflicts

Resolved merge conflicts

Resolved merge conflicts

Merge branch 'develop' of bitbucket.org:diality-cloud/leahi-common into develop

Resolved merge conflict

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
Merged latest staging into develop

    • -21
    • +67
    /firmware/App/Controllers/PermeateTank.c
    • -28
    • +59
    /firmware/App/Controllers/ROPump.c
    • -4
    • +5
    /firmware/App/Modes/FPModes/FPModeFault.c
    • -14
    • +30
    /firmware/App/Modes/FPModes/FPOperationModes.c
    • -24
    • +36
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -21
    • +19
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -12
    • +39
    /firmware/App/Modes/FPModes/FlushPermeate.c
    • -54
    • +177
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
  1. … 19 more files in changeset.
Merged latest staging into develop

Merged latest staging into develop

Merge branch 'LDT-2185-io-fp-water-treatment-and-degas' of bitbucket.org:diality-cloud/dd-firmware into LDT-2185-io-fp-water-treatment-and-degas

    • -0
    • +2
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2185 moved tank full and fill timeout to Gen Permeate

    • -66
    • +3
    /firmware/App/Controllers/PermeateTank.c
    • -0
    • +66
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
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