Michael Garthwaite

Merge branch 'LDT-3218-update-iofp-permeate-target-flow' into develop

LDT-3218: added valve recovery config method

Merge branch 'LDT-3218-update-iofp-permeate-target-flow-CLEAN' into develop

LDT-3218: updated equation for medium recovery

Merge branch 'LDT-3218-update-iofp-permeate-target-flow-CLEAN' into develop

    • -23
    • +42
    /firmware/App/Controllers/ROPump.c
LDT-3218: slopes and intercepts per recovery config. removed recirculation for no recovery.

    • -5
    • +6
    /firmware/App/Controllers/PermeateTank.c
    • -15
    • +32
    /firmware/App/Controllers/ROPump.c
Merge branch 'LDT-3218-update-iofp-permeate-target-flow-CLEAN' into develop

LDT-3218: updated msg id's in relation to develop

Merge branch 'LDT-3218-update-iofp-permeate-target-flow-CLEAN' into develop

LDT-3218: fixes for previous err overshooting first control loop

LDT-3218: integration fixes.

LDT-3218: integration fixes.

    • -1
    • +1
    /firmware/App/Controllers/PermeateTank.c
LDT-3218: fixed messaging misalignment.

LDT-3218: set valve config override and supporting functions. P6 no longer opens for no recovery valve config. Implemented PID controls for RO pump.

    • -1
    • +10
    /firmware/App/Controllers/PermeateTank.c
    • -12
    • +17
    /firmware/App/Controllers/ROPump.c
LDT-3218: Added PID controller temporary to mitigate RO flow control reaction to new behavior of D3 opening and closing.

    • -0
    • +398
    /PIDControllers.c
LDT-3218: created MSG_ID for setting valve recovery config.

Merge branch 'LDT-3777-sprint-25-fixes' into develop

LDT-3777: updates to conductivity publishing to show raw vlaues for d17 and d27.

Merge branch 'LDT-3777-sprint-25-fixes' into develop

WIP on develop

LDT-3777: fixed conductivity filter initialization variables.

LDT-3218: control coefficients for beta 2.0

Merge branch 'LDT-3777-sprint-25-fixes' into develop

    • -41
    • +60
    /firmware/App/Monitors/Conductivity.c
LDT-3777: fixed timer

LDT-3777: updated filtering to have longer filter but more fresh data. 35 seconds of history instead of 500ms.

    • -48
    • +59
    /firmware/App/Monitors/Conductivity.c
Merge branch 'LDT-3777-sprint-25-fixes' into develop

WIP on develop

LDT-3777: updated d50 avg temp to not be calculated twice per interval.

Merge branch 'LDT-2004-v2-conductivity-sensors' into develop

LDT-2004: reverted init fpga to 1.9 config on default