Clone
 

“rkallala” <“rkallala@diality.com”> in dd-firmware

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
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 fixed macro naming

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

    • -3
    • +3
    /firmware/App/Controllers/PermeateTank.c
LDT-2936 fixed the macro comments

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
LDT-2936 added permeate flush exit criteria. Resolved compile errors

    • -2
    • +1
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -2
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -1
    • +17
    /firmware/App/Modes/FPModes/FlushPermeate.c
    • -1
    • +0
    /firmware/App/Modes/FPModes/ModeGenPermeate.h
LDT-2936 added struct packing into conductivity

LDT-2936 removed duplicate code and reused existing permeate high flow check

    • -0
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -72
    • +50
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2936 addressed review comment to set array values to zero

    • -3
    • +2
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2936 addressed review comment to update sample size and local scope declaration.

    • -2
    • +4
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2936 resolved commit issues

    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushFilter.c
LDT-2936 addressed review comments. Added permeate high flow alarm logic

    • -14
    • +21
    /firmware/App/Controllers/ROPump.c
    • -10
    • +10
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -4
    • +12
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -14
    • +43
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
    • -22
    • +33
    /firmware/App/Monitors/Conductivity.c
LDT-2936 removed filter pressure check in FlushFiletr per LDT-1228

    • -14
    • +2
    /firmware/App/Modes/FPModes/FlushFilter.c
LDT-2936 fixed get function call for FP operation mode in ROPump

LDT-2936 removed recirculation behavior in Permeate Flush state

    • -13
    • +0
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -2
    • +2
    /firmware/App/Modes/FPModes/FlushFilter.c
    • -2
    • +13
    /firmware/App/Modes/FPModes/FlushPermeate.c
    • -0
    • +2
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2936 addressed review comments and fixed minor issues.

    • -4
    • +4
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2936 updated ROPump and FluidPump

    • -1
    • +12
    /firmware/App/Modes/FPModes/FlushConcentrate.c
LDT-2936 pushing latest changes for IOFP from alpha

    • -1
    • +106
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
    • -0
    • +190
    /firmware/App/Monitors/Conductivity.c
    • -0
    • +18
    /firmware/App/Monitors/Conductivity.h
LDT-2936 WIP pulling latest code from alpha to beta

    • -2
    • +2
    /firmware/App/Controllers/PermeateTank.c
    • -13
    • +55
    /firmware/App/Modes/FPModes/FlushConcentrate.c
    • -1
    • +2
    /firmware/App/Modes/FPModes/ModeGenPermeate.c
LDT-2936 updated M12 valve position in defeatured states

    • -2
    • +3
    /firmware/App/Modes/FPModes/FPModeFault.c
LDT-2662 changed the P37 valve config per LDT 2183 ticket.

    • -1
    • +1
    /firmware/App/Modes/FPModes/FlushConcentrate.c
LDT-2662 removed extra blank lines per review comments.

LDT-2662 removed M1 and added P46 pressure sensor.

    • -8
    • +8
    /firmware/App/Drivers/PressureSensor.c
    • -4
    • +4
    /firmware/App/Drivers/PressureSensor.h
Merging DD/Drivers branch into staging branch