Michael Garthwaite

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

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

LDT-3218: fixed fpga post test by adding L15 fpgaID header

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

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

LDT-3218: control coefficients for beta 2.0

LDT-3218: updated step limit for ro pump

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

    • -15
    • +47
    /firmware/App/Modes/ModeGenDialysate.c
    • -17
    • +10
    /firmware/App/Services/Messaging.c
Merge branch 'LDT-2004-v2-conductivity-sensors' into develop

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

LDT-2004: msg id naming

LDT-2004: reverted fpga init to be reflective in staging. setting raw resistance values to 1 when we see 0 to prevent nan's being injected into rolling average.

LDT-2004: fixed build errors from merging staging into working branch.

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

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

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

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

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

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

    • -11
    • +119
    /firmware/App/Modes/ModeGenDialysate.c
yeah its obsolete. This is an old branch that recently got synced with latest staging. It looks like the CR doesn't recognize the correct changes from staging. There should only be 1 file change ( ...

yeah its obsolete. This is an old branch that recently got synced with latest staging. It looks like the CR doesn't recognize the correct changes from staging. There should only be 1 file change ( conductivity sensors ).

Merge branch 'staging' into LDT-2655-fix_conductivity_override